X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=8aa4571ea642dc15409f00f235ad8b16900e92c2;hp=b1e89b3594624bc2373f3fbd561ecf06afb1a8ad;hb=4983ee551a743e55bb2f2ec12ceab0ddba13eb2d;hpb=83d72cf224956eb08453051744649df89b217203 diff --git a/src/odhcpd.c b/src/odhcpd.c index b1e89b3..8aa4571 100644 --- a/src/odhcpd.c +++ b/src/odhcpd.c @@ -24,13 +24,14 @@ #include #include #include +#include +#include #include #include #include #include #include -#include #include #include @@ -45,43 +46,42 @@ static int ioctl_sock; -static int rtnl_socket = -1; -static int rtnl_seq = 0; static int urandom_fd = -1; - 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 + " -h, --help Print this help\n" + " -l level Specify log level 0..7 (default %d)\n", + app, config.log_level ); } + int main(int argc, char **argv) { openlog("odhcpd", LOG_PERROR | LOG_PID, LOG_DAEMON); 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); + config.log_level = (atoi(optarg) & LOG_PRIMASK); + fprintf(stderr, "Log level set to %d\n", config.log_level); break; } } - setlogmask(LOG_UPTO(log_level)); + setlogmask(LOG_UPTO(config.log_level)); uloop_init(); if (getuid() != 0) { @@ -91,11 +91,6 @@ int main(int argc, char **argv) ioctl_sock = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if ((rtnl_socket = odhcpd_open_rtnl()) < 0) { - syslog(LOG_ERR, "Unable to open socket: %s", strerror(errno)); - return 2; - } - if ((urandom_fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC)) < 0) return 4; @@ -103,37 +98,27 @@ int main(int argc, char **argv) signal(SIGINT, sighandler); signal(SIGTERM, sighandler); - if (init_router()) + if (netlink_init()) + return 4; + + if (router_init()) return 4; - if (init_dhcpv6()) + if (dhcpv6_init()) return 4; - if (init_ndp()) + if (ndp_init()) return 4; - if (init_dhcpv4()) +#ifdef DHCPV4_SUPPORT + if (dhcpv4_init()) return 4; +#endif odhcpd_run(); return 0; } -int odhcpd_open_rtnl(void) -{ - int sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE); - - // Connect to the kernel netlink interface - struct sockaddr_nl nl = {.nl_family = AF_NETLINK}; - if (connect(sock, (struct sockaddr*)&nl, sizeof(nl))) { - syslog(LOG_ERR, "Failed to connect to kernel rtnetlink: %s", - strerror(errno)); - return -1; - } - - return sock; -} - // Read IPv6 MTU for interface int odhcpd_get_interface_config(const char *ifname, const char *what) @@ -158,10 +143,12 @@ int odhcpd_get_interface_config(const char *ifname, const char *what) int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6]) { struct ifreq ifr; + memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name) - 1); if (ioctl(ioctl_sock, SIOCGIFHWADDR, &ifr) < 0) return -1; + memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); return 0; } @@ -202,8 +189,8 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest, ssize_t sent = sendmsg(socket, &msg, MSG_DONTWAIT); if (sent < 0) - syslog(LOG_NOTICE, "Failed to send to %s%%%s (%s)", - ipbuf, iface->ifname, strerror(errno)); + syslog(LOG_NOTICE, "Failed to send to %s%%%s (%m)", + ipbuf, iface->ifname); else syslog(LOG_DEBUG, "Sent %li bytes to %s%%%s", (long)sent, ipbuf, iface->ifname); @@ -211,86 +198,7 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest, } -// Detect an IPV6-address currently assigned to the given interface -ssize_t odhcpd_get_interface_addresses(int ifindex, - struct odhcpd_ipaddr *addrs, size_t cnt) -{ - struct { - struct nlmsghdr nhm; - 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)) { - syslog(LOG_WARNING, "Request failed to dump IPv6 addresses (%s)", strerror(errno)); - return 0; - } - - uint8_t buf[8192]; - ssize_t len = 0, ret = 0; - - for (struct nlmsghdr *nhm = NULL; ; nhm = NLMSG_NEXT(nhm, len)) { - while (len < 0 || !NLMSG_OK(nhm, (size_t)len)) { - len = recv(rtnl_socket, buf, sizeof(buf), 0); - nhm = (struct nlmsghdr*)buf; - if (len < 0 || !NLMSG_OK(nhm, (size_t)len)) { - if (errno == EINTR) - continue; - - syslog(LOG_WARNING, "Failed to receive IPv6 address rtnetlink message (%s)", strerror(errno)); - ret = -1; - goto out; - } - } - - 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 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); - } - - 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; - } - - } -out: - return ret; -} - -int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr) +static 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}; @@ -308,54 +216,49 @@ int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr) return status; } -void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen, - const struct interface *iface, const struct in6_addr *gw, - int metric, bool add) +/* + * DNS address selection criteria order : + * - use IPv6 address with valid lifetime if none is yet selected + * - use IPv6 address with a preferred lifetime if the already selected IPv6 address is deprecated + * - use an IPv6 ULA address if the already selected IPv6 address is not an ULA address + * - use the IPv6 address with the longest preferred lifetime + */ +int odhcpd_get_interface_dns_addr(const struct interface *iface, struct in6_addr *addr) { - 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, - }; + time_t now = odhcpd_time(); + ssize_t m = -1; + + for (size_t i = 0; i < iface->addr6_len; ++i) { + if (iface->addr6[i].valid <= (uint32_t)now) + continue; - 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; + if (m < 0) { + m = i; + continue; + } + + if (iface->addr6[m].preferred >= (uint32_t)now && + iface->addr6[i].preferred < (uint32_t)now) + continue; + + if (IN6_IS_ADDR_ULA(&iface->addr6[i].addr.in6)) { + if (!IN6_IS_ADDR_ULA(&iface->addr6[m].addr.in6)) { + m = i; + continue; + } + } else if (IN6_IS_ADDR_ULA(&iface->addr6[m].addr.in6)) + continue; + + if (iface->addr6[i].preferred > iface->addr6[m].preferred) + m = i; + } + + if (m >= 0) { + *addr = iface->addr6[m].addr.in6; + return 0; } - req.nh.nlmsg_len = (gw) ? sizeof(req) : offsetof(struct req, rta_gw); - send(rtnl_socket, &req, req.nh.nlmsg_len, MSG_DONTWAIT); + return odhcpd_get_linklocal_interface_address(iface->ifindex, addr); } struct interface* odhcpd_get_interface_by_index(int ifindex) @@ -396,7 +299,7 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even { struct odhcpd_event *e = container_of(u, struct odhcpd_event, uloop); - uint8_t data_buf[RELAYD_BUFFER_SIZE], cmsg_buf[128]; + uint8_t data_buf[8192], cmsg_buf[128]; union { struct sockaddr_in6 in6; struct sockaddr_in in; @@ -410,7 +313,12 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even getsockopt(u->fd, SOL_SOCKET, SO_ERROR, &ret, &ret_len); u->error = false; if (e->handle_error) - e->handle_error(ret); + e->handle_error(e, ret); + } + + if (e->recv_msgs) { + e->recv_msgs(e); + return; } while (true) { @@ -465,12 +373,6 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even if (addr.ll.sll_family == AF_PACKET) destiface = addr.ll.sll_ifindex; - struct interface *iface = - odhcpd_get_interface_by_index(destiface); - - if (!iface && addr.nl.nl_family != AF_NETLINK) - continue; - char ipbuf[INET6_ADDRSTRLEN] = "kernel"; if (addr.ll.sll_family == AF_PACKET && len >= (ssize_t)sizeof(struct ip6_hdr)) @@ -480,10 +382,26 @@ 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, "Received %li Bytes from %s%%%s", (long)len, - ipbuf, (iface) ? iface->ifname : "netlink"); + // From netlink + if (addr.nl.nl_family == AF_NETLINK) { + syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len, + ipbuf, "netlink"); + e->handle_dgram(&addr, data_buf, len, NULL, dest); + return; + } else if (destiface != 0) { + struct interface *iface; + list_for_each_entry(iface, &interfaces, head) { + if (iface->ifindex != destiface) + continue; + + syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len, + ipbuf, iface->ifname); + + e->handle_dgram(&addr, data_buf, len, iface, dest); + } + } + - e->handle_dgram(&addr, data_buf, len, iface, dest); } } @@ -495,6 +413,12 @@ int odhcpd_register(struct odhcpd_event *event) ((event->handle_error) ? ULOOP_ERROR_CB : 0)); } +int odhcpd_deregister(struct odhcpd_event *event) +{ + event->uloop.cb = NULL; + return uloop_fd_delete(&event->uloop); +} + void odhcpd_process(struct odhcpd_event *event) { odhcpd_receive_packets(&event->uloop, 0); @@ -554,6 +478,16 @@ void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len) *dst = 0; } +const char *odhcpd_print_mac(const uint8_t *mac, const size_t len) +{ + static char buf[32]; + + snprintf(buf, sizeof(buf), "%02x", mac[0]); + for (size_t i = 1, j = 2; i < len && j < sizeof(buf); i++, j += 3) + snprintf(buf + j, sizeof(buf) - j, ":%02x", mac[i]); + + return buf; +} int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits) { @@ -583,3 +517,54 @@ void odhcpd_bmemcpy(void *av, const void *bv, size_t bits) a[bytes] = (a[bytes] & mask) | ((~mask) & b[bytes]); } } + + +int odhcpd_netmask2bitlen(bool inet6, void *mask) +{ + int bits; + struct in_addr *v4; + struct in6_addr *v6; + + if (inet6) + for (bits = 0, v6 = mask; + bits < 128 && (v6->s6_addr[bits / 8] << (bits % 8)) & 128; + bits++); + else + for (bits = 0, v4 = mask; + bits < 32 && (ntohl(v4->s_addr) << bits) & 0x80000000; + bits++); + + return bits; +} + +bool odhcpd_bitlen2netmask(bool inet6, unsigned int bits, void *mask) +{ + uint8_t b; + struct in_addr *v4; + struct in6_addr *v6; + + if (inet6) + { + if (bits > 128) + return false; + + v6 = mask; + + for (unsigned int i = 0; i < sizeof(v6->s6_addr); i++) + { + b = (bits > 8) ? 8 : bits; + v6->s6_addr[i] = (uint8_t)(0xFF << (8 - b)); + bits -= b; + } + } + else + { + if (bits > 32) + return false; + + v4 = mask; + v4->s_addr = bits ? htonl(~((1 << (32 - bits)) - 1)) : 0; + } + + return true; +}