Mercurial > hg > dhcpcd

changeset 1922:bf410e0a9173 draft dhcpcd-5.99.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add netlink code to listen to AF_INET6 RTM_NEWADDR messages for Linux.
author Roy Marples <roy@marples.name>
date Wed, 15 May 2013 11:17:36 +0000
parents e385beb3a4d7
children 215439ea52a8
files if-linux.c
diffstat 1 files changed, 52 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/if-linux.c	Wed May 15 10:27:36 2013 +0000
+++ b/if-linux.c	Wed May 15 11:17:36 2013 +0000
@@ -142,7 +142,15 @@
 	struct sockaddr_nl snl;
 
 	memset(&snl, 0, sizeof(snl));
-	snl.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_IFADDR;
+	snl.nl_groups = RTMGRP_LINK;
+
+#ifdef INET
+	snl.nl_groups |= RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_IFADDR;
+#endif
+#ifdef INET6
+	snl.nl_groups |= RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFADDR;
+#endif
+
 	return _open_link_socket(&snl);
 }
 
@@ -304,13 +312,17 @@
 static int
 link_addr(struct nlmsghdr *nlm)
 {
-#ifdef INET
 	int len;
 	struct rtattr *rta;
 	struct ifaddrmsg *ifa;
-	struct in_addr addr, net, dest;
 	char ifn[IF_NAMESIZE + 1];
 	struct interface *iface;
+#ifdef INET
+	struct in_addr addr, net, dest;
+#endif
+#ifdef INET6
+	struct in6_addr addr6;
+#endif
 
 	if (nlm->nlmsg_type != RTM_DELADDR && nlm->nlmsg_type != RTM_NEWADDR)
 		return 0;
@@ -330,26 +342,46 @@
 		return 1;
 	rta = (struct rtattr *) IFA_RTA(ifa);
 	len = NLMSG_PAYLOAD(nlm, sizeof(*ifa));
-	addr.s_addr = dest.s_addr = INADDR_ANY;
-	dest.s_addr = INADDR_ANY;
-	inet_cidrtoaddr(ifa->ifa_prefixlen, &net);
-	while (RTA_OK(rta, len)) {
-		switch (rta->rta_type) {
-		case IFA_ADDRESS:
-			if (iface->flags & IFF_POINTOPOINT) {
-				memcpy(&dest.s_addr, RTA_DATA(rta),
-				    sizeof(addr.s_addr));
+	switch (ifa->ifa_family) {
+#ifdef INET
+	case AF_INET:
+		addr.s_addr = dest.s_addr = INADDR_ANY;
+		dest.s_addr = INADDR_ANY;
+		inet_cidrtoaddr(ifa->ifa_prefixlen, &net);
+		while (RTA_OK(rta, len)) {
+			switch (rta->rta_type) {
+			case IFA_ADDRESS:
+				if (iface->flags & IFF_POINTOPOINT) {
+					memcpy(&dest.s_addr, RTA_DATA(rta),
+					       sizeof(addr.s_addr));
+				}
+				break;
+			case IFA_LOCAL:
+				memcpy(&addr.s_addr, RTA_DATA(rta),
+				       sizeof(addr.s_addr));
+				break;
 			}
-			break;
-		case IFA_LOCAL:
-			memcpy(&addr.s_addr, RTA_DATA(rta),
-			    sizeof(addr.s_addr));
-			break;
+			rta = RTA_NEXT(rta, len);
 		}
-		rta = RTA_NEXT(rta, len);
+		ipv4_handleifa(nlm->nlmsg_type, ifn, &addr, &net, &dest);
+		break;
+#endif
+#ifdef INET6
+	case AF_INET6:
+		memset(&addr6, 0, sizeof(addr6));
+		while (RTA_OK(rta, len)) {
+			switch (rta->rta_type) {
+			case IFA_ADDRESS:
+				memcpy(&addr6.s6_addr, RTA_DATA(rta),
+				       sizeof(addr6.s6_addr));
+				break;
+			}
+			rta = RTA_NEXT(rta, len);
+		}
+		ipv6_handleifa(nlm->nlmsg_type, ifn, &addr6);
+		break;
+#endif
 	}
-	ipv4_handleifa(nlm->nlmsg_type, ifn, &addr, &net, &dest);
-#endif
 	return 1;
 }