From: Steven Barth Date: Fri, 30 Aug 2013 15:41:55 +0000 (+0200) Subject: Remove DAD for now due to kernel issues X-Git-Tag: debian/1.1+git20160131-1~135 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dfc86766bf0b3d28f55adf5deb340b1d40176808;p=odhcp6c.git Remove DAD for now due to kernel issues --- diff --git a/src/odhcp6c.c b/src/odhcp6c.c index f732d9e..38b8e82 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -375,10 +375,9 @@ bool odhcp6c_signal_process(void) { if (do_signal == SIGIO) { do_signal = 0; - bool ra_rtnled = ra_rtnl_process(); bool ra_updated = ra_process(); - if (ra_rtnled || (ra_updated && (bound || allow_slaac_only == 0))) + if (ra_updated && (bound || allow_slaac_only == 0)) script_call("ra-updated"); // Immediate process urgent events else if (ra_updated && !bound && allow_slaac_only > 0) script_delay_call("ra-updated", allow_slaac_only); diff --git a/src/ra.c b/src/ra.c index 4690d41..4c1302c 100644 --- a/src/ra.c +++ b/src/ra.c @@ -34,7 +34,7 @@ #include "ra.h" -static int sock = -1, rtnl_sock = -1; +static int sock = -1; static unsigned if_index = 0; static char if_name[IF_NAMESIZE] = {0}; static volatile int rs_attempt = 0; @@ -90,18 +90,6 @@ int ra_init(const char *ifname, const struct in6_addr *ifid) } } - // Open rtnetlink socket - rtnl_sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE); - struct sockaddr_nl rtnl_kernel = { .nl_family = AF_NETLINK }; - if (connect(rtnl_sock, (struct sockaddr*)&rtnl_kernel, sizeof(rtnl_kernel))) - return -1; - uint32_t group = RTNLGRP_IPV6_IFADDR; - setsockopt(rtnl_sock, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &group, sizeof(group)); - - // Add async-mode - fcntl(rtnl_sock, F_SETOWN, ourpid); - fcntl(rtnl_sock, F_SETFL, fcntl(rtnl_sock, F_GETFL) | O_ASYNC); - // Send RS signal(SIGALRM, ra_send_rs); ra_send_rs(SIGALRM); @@ -140,63 +128,6 @@ static void update_proc(const char *sect, const char *opt, uint32_t value) } -static bool ra_deduplicate(const struct in6_addr *any, uint8_t length) -{ - struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0}; - struct odhcp6c_entry *x = odhcp6c_find_entry(STATE_RA_PREFIX, &entry); - if (x && IN6_ARE_ADDR_EQUAL(&x->target, any)) { - odhcp6c_random(&x->target.s6_addr32[2], 2 * sizeof(uint32_t)); - } else if (odhcp6c_find_entry(STATE_IA_NA, &entry)) { - dhcpv6_request(DHCPV6_MSG_DECLINE); - raise(SIGUSR2); - } - - return !!x; -} - - -bool ra_rtnl_process(void) -{ - bool found = false; - uint32_t elapsed = odhcp6c_elapsed(); - uint8_t buf[8192]; - while (true) { - ssize_t len = recv(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT); - if (len < 0) - break; - - if (elapsed > 10) - continue; - - for (struct nlmsghdr *nh = (struct nlmsghdr*)buf; NLMSG_OK(nh, (size_t)len); - nh = NLMSG_NEXT(nh, len)) { - struct ifaddrmsg *ifa = NLMSG_DATA(nh); - struct in6_addr *addr = NULL; - if (NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) || ifa->ifa_index != if_index || - (nh->nlmsg_type == RTM_NEWADDR && !(ifa->ifa_flags & IFA_F_DADFAILED)) || - (nh->nlmsg_type == RTM_DELADDR && !(ifa->ifa_flags & IFA_F_TENTATIVE)) || - (nh->nlmsg_type != RTM_NEWADDR && nh->nlmsg_type != RTM_DELADDR)) - continue; - - ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ifa)); - for (struct rtattr *rta = (struct rtattr*)&ifa[1]; RTA_OK(rta, alen); - rta = RTA_NEXT(rta, alen)) - if (rta->rta_type == IFA_ADDRESS && RTA_PAYLOAD(rta) >= sizeof(*addr)) - addr = RTA_DATA(rta); - - if (addr) { - char ipbuf[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf)); - syslog(LOG_WARNING, "duplicate address detected: %s (code: %u:%x)", - ipbuf, (unsigned)nh->nlmsg_type, (unsigned)ifa->ifa_flags); - found |= ra_deduplicate(addr, ifa->ifa_prefixlen); - } - } - } - return found; -} - - bool ra_process(void) { bool found = false; diff --git a/src/ra.h b/src/ra.h index f66ff26..a31e7f6 100644 --- a/src/ra.h +++ b/src/ra.h @@ -36,4 +36,3 @@ struct icmpv6_opt { int ra_init(const char *ifname, const struct in6_addr *ifid); bool ra_process(void); -bool ra_rtnl_process(void);