X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=b1e89b3594624bc2373f3fbd561ecf06afb1a8ad;hp=52bca13c4db7019a2ccbaee44c6ed88fa30ae022;hb=83d72cf224956eb08453051744649df89b217203;hpb=73a7133b6e42edc218da5b8011c580ed48c7731a diff --git a/src/odhcpd.c b/src/odhcpd.c index 52bca13..b1e89b3 100644 --- a/src/odhcpd.c +++ b/src/odhcpd.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -54,11 +55,33 @@ static void sighandler(_unused int signal) uloop_end(); } +static void print_usage(const char *app) +{ + printf( + "== %s Usage ==\n\n" + " -h, --help Print this help\n" + " -l level Specify log level 0..7 (default %d)\n", + app, LOG_WARNING + ); +} -int main() +int main(int argc, char **argv) { openlog("odhcpd", LOG_PERROR | LOG_PID, LOG_DAEMON); - setlogmask(LOG_UPTO(LOG_WARNING)); + int opt; + int log_level = LOG_INFO; + while ((opt = getopt(argc, argv, "hl:")) != -1) { + switch (opt) { + case 'h': + print_usage(argv[0]); + return 0; + case 'l': + log_level = atoi(optarg); + fprintf(stderr, "Log level set to %d\n", log_level); + break; + } + } + setlogmask(LOG_UPTO(log_level)); uloop_init(); if (getuid() != 0) { @@ -113,11 +136,11 @@ int odhcpd_open_rtnl(void) // Read IPv6 MTU for interface -int odhcpd_get_interface_mtu(const char *ifname) +int odhcpd_get_interface_config(const char *ifname, const char *what) { char buf[64]; - const char *sysctl_pattern = "/proc/sys/net/ipv6/conf/%s/mtu"; - snprintf(buf, sizeof(buf), sysctl_pattern, ifname); + const char *sysctl_pattern = "/proc/sys/net/ipv6/conf/%s/%s"; + snprintf(buf, sizeof(buf), sysctl_pattern, ifname, what); int fd = open(buf, O_RDONLY); ssize_t len = read(fd, buf, sizeof(buf) - 1); @@ -126,10 +149,8 @@ int odhcpd_get_interface_mtu(const char *ifname) if (len < 0) return -1; - buf[len] = 0; return atoi(buf); - } @@ -176,12 +197,6 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest, || IN6_IS_ADDR_MC_LINKLOCAL(&dest->sin6_addr)) dest->sin6_scope_id = iface->ifindex; - // IPV6_PKTINFO doesn't really work for IPv6-raw sockets (bug?) - if (dest->sin6_port == 0) { - msg.msg_control = NULL; - msg.msg_controllen = 0; - } - char ipbuf[INET6_ADDRSTRLEN]; inet_ntop(AF_INET6, &dest->sin6_addr, ipbuf, sizeof(ipbuf)); @@ -205,8 +220,10 @@ ssize_t odhcpd_get_interface_addresses(int ifindex, struct ifaddrmsg ifa; } req = {{sizeof(req), RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP, ++rtnl_seq, 0}, {AF_INET6, 0, 0, 0, ifindex}}; - if (send(rtnl_socket, &req, sizeof(req), 0) < (ssize_t)sizeof(req)) + if (send(rtnl_socket, &req, sizeof(req), 0) < (ssize_t)sizeof(req)) { + syslog(LOG_WARNING, "Request failed to dump IPv6 addresses (%s)", strerror(errno)); return 0; + } uint8_t buf[8192]; ssize_t len = 0, ret = 0; @@ -218,68 +235,127 @@ ssize_t odhcpd_get_interface_addresses(int ifindex, if (len < 0 || !NLMSG_OK(nhm, (size_t)len)) { if (errno == EINTR) continue; - else - return ret; + + syslog(LOG_WARNING, "Failed to receive IPv6 address rtnetlink message (%s)", strerror(errno)); + ret = -1; + goto out; } } - if (nhm->nlmsg_type != RTM_NEWADDR) - break; - - // Skip address but keep clearing socket buffer - if (ret >= (ssize_t)cnt) - continue; + switch (nhm->nlmsg_type) { + case RTM_NEWADDR: { + // Skip address but keep clearing socket buffer + if (ret >= (ssize_t)cnt) + continue; - struct ifaddrmsg *ifa = NLMSG_DATA(nhm); - if (ifa->ifa_scope != RT_SCOPE_UNIVERSE || - (ifindex && ifa->ifa_index != (unsigned)ifindex)) - continue; + struct ifaddrmsg *ifa = NLMSG_DATA(nhm); + if (ifa->ifa_scope != RT_SCOPE_UNIVERSE || + (ifindex && ifa->ifa_index != (unsigned)ifindex)) + continue; - struct rtattr *rta = (struct rtattr*)&ifa[1]; - size_t alen = NLMSG_PAYLOAD(nhm, sizeof(*ifa)); - memset(&addrs[ret], 0, sizeof(addrs[ret])); - addrs[ret].prefix = ifa->ifa_prefixlen; - - while (RTA_OK(rta, alen)) { - if (rta->rta_type == IFA_ADDRESS) { - memcpy(&addrs[ret].addr, RTA_DATA(rta), - sizeof(struct in6_addr)); - } else if (rta->rta_type == IFA_CACHEINFO) { - struct ifa_cacheinfo *ifc = RTA_DATA(rta); - addrs[ret].preferred = ifc->ifa_prefered; - addrs[ret].valid = ifc->ifa_valid; + struct rtattr *rta = (struct rtattr*)&ifa[1]; + size_t alen = NLMSG_PAYLOAD(nhm, sizeof(*ifa)); + memset(&addrs[ret], 0, sizeof(addrs[ret])); + addrs[ret].prefix = ifa->ifa_prefixlen; + + while (RTA_OK(rta, alen)) { + if (rta->rta_type == IFA_ADDRESS) { + memcpy(&addrs[ret].addr, RTA_DATA(rta), + sizeof(struct in6_addr)); + } else if (rta->rta_type == IFA_CACHEINFO) { + struct ifa_cacheinfo *ifc = RTA_DATA(rta); + addrs[ret].preferred = ifc->ifa_prefered; + addrs[ret].valid = ifc->ifa_valid; + } + + rta = RTA_NEXT(rta, alen); } - rta = RTA_NEXT(rta, alen); + if (ifa->ifa_flags & IFA_F_DEPRECATED) + addrs[ret].preferred = 0; + + ++ret; + break; + } + case NLMSG_DONE: + goto out; + default: + syslog(LOG_WARNING, "Unexpected rtnetlink message (%d) in response to IPv6 address dump", nhm->nlmsg_type); + ret = -1; + goto out; } - if (ifa->ifa_flags & IFA_F_DEPRECATED) - addrs[ret].preferred = 0; + } +out: + return ret; +} - ++ret; +int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr) +{ + int status = -1; + struct sockaddr_in6 addr = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, ifindex}; + socklen_t alen = sizeof(addr); + int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); + + if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) && + !getsockname(sock, (struct sockaddr*)&addr, &alen)) { + *lladdr = addr.sin6_addr; + status = 0; } - return ret; + close(sock); + + return status; } -int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr) +void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen, + const struct interface *iface, const struct in6_addr *gw, + int metric, bool add) { - struct odhcpd_ipaddr ipaddrs[8]; - ssize_t ip_cnt = odhcpd_get_interface_addresses(ifindex, ipaddrs, ARRAY_SIZE(ipaddrs)); - uint32_t preferred = 0; - int ret = 0; - - for (ssize_t i = 0; i < ip_cnt; i++) { - struct odhcpd_ipaddr *ipaddr = &ipaddrs[i]; - - if (ipaddr->preferred > preferred || !preferred) { - preferred = ipaddr->preferred; - *addr = ipaddr->addr; - ret = 1; - } + struct req { + struct nlmsghdr nh; + struct rtmsg rtm; + struct rtattr rta_dst; + struct in6_addr dst_addr; + struct rtattr rta_oif; + uint32_t ifindex; + struct rtattr rta_table; + uint32_t table; + struct rtattr rta_prio; + uint32_t prio; + struct rtattr rta_gw; + struct in6_addr gw; + } req = { + {sizeof(req), 0, NLM_F_REQUEST, ++rtnl_seq, 0}, + {AF_INET6, prefixlen, 0, 0, 0, 0, 0, 0, 0}, + {sizeof(struct rtattr) + sizeof(struct in6_addr), RTA_DST}, + *addr, + {sizeof(struct rtattr) + sizeof(uint32_t), RTA_OIF}, + iface->ifindex, + {sizeof(struct rtattr) + sizeof(uint32_t), RTA_TABLE}, + RT_TABLE_MAIN, + {sizeof(struct rtattr) + sizeof(uint32_t), RTA_PRIORITY}, + metric, + {sizeof(struct rtattr) + sizeof(struct in6_addr), RTA_GATEWAY}, + IN6ADDR_ANY_INIT, + }; + + if (gw) + req.gw = *gw; + + if (add) { + req.nh.nlmsg_type = RTM_NEWROUTE; + req.nh.nlmsg_flags |= (NLM_F_CREATE | NLM_F_REPLACE); + req.rtm.rtm_protocol = RTPROT_STATIC; + req.rtm.rtm_scope = (gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK; + req.rtm.rtm_type = RTN_UNICAST; + } else { + req.nh.nlmsg_type = RTM_DELROUTE; + req.rtm.rtm_scope = RT_SCOPE_NOWHERE; } - return ret; + req.nh.nlmsg_len = (gw) ? sizeof(req) : offsetof(struct req, rta_gw); + send(rtnl_socket, &req, req.nh.nlmsg_len, MSG_DONTWAIT); } struct interface* odhcpd_get_interface_by_index(int ifindex) @@ -328,6 +404,15 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even struct sockaddr_nl nl; } addr; + if (u->error) { + int ret = -1; + socklen_t ret_len = sizeof(ret); + getsockopt(u->fd, SOL_SOCKET, SO_ERROR, &ret, &ret_len); + u->error = false; + if (e->handle_error) + e->handle_error(ret); + } + while (true) { struct iovec iov = {data_buf, sizeof(data_buf)}; struct msghdr msg = { @@ -395,7 +480,6 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even else if (addr.in.sin_family == AF_INET) inet_ntop(AF_INET, &addr.in.sin_addr, ipbuf, sizeof(ipbuf)); - syslog(LOG_DEBUG, "--"); syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len, ipbuf, (iface) ? iface->ifname : "netlink"); @@ -407,7 +491,8 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even int odhcpd_register(struct odhcpd_event *event) { event->uloop.cb = odhcpd_receive_packets; - return uloop_fd_add(&event->uloop, ULOOP_READ); + return uloop_fd_add(&event->uloop, ULOOP_READ | + ((event->handle_error) ? ULOOP_ERROR_CB : 0)); } void odhcpd_process(struct odhcpd_event *event)