dhcp6: don't listen on IPv6 addresses when not using DHCP6

To achieve this we need to learn the addresses AFTER the interface
configuration has been loaded.

1 files changed, 19 insertions, 13 deletions

diff --git a/src/if.c b/src/if.c
index 2ae50793..828dc4ac 100644
--- a/src/if.c
+++ b/src/if.c
@@ -190,8 +190,9 @@ if_hasconf(struct dhcpcd_ctx *ctx, const char *ifname)
 	return 0;
 }
 
-static void if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs,
-    struct ifaddrs *ifaddrs)
+void
+if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs,
+    struct ifaddrs **ifaddrs)
 {
 	struct ifaddrs *ifa;
 	struct interface *ifp;
@@ -203,7 +204,7 @@ static void if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs,
 #endif
 	int addrflags;
 
-	for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
+	for (ifa = *ifaddrs; ifa; ifa = ifa->ifa_next) {
 		if (ifa->ifa_addr == NULL)
 			continue;
 		if ((ifp = if_find(ifs, ifa->ifa_name)) == NULL)
@@ -262,6 +263,9 @@ static void if_learnaddrs(struct dhcpcd_ctx *ctx, struct if_head *ifs,
 #endif
 		}
 	}
+
+	freeifaddrs(*ifaddrs);
+	*ifaddrs = NULL;
 }
 
 bool
@@ -283,9 +287,10 @@ if_valid_hwaddr(const uint8_t *hwaddr, size_t hwlen)
 }
 
 struct if_head *
-if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
+if_discover(struct dhcpcd_ctx *ctx, struct ifaddrs **ifaddrs,
+    int argc, char * const *argv)
 {
-	struct ifaddrs *ifaddrs, *ifa;
+	struct ifaddrs *ifa;
 	int i;
 	unsigned int active;
 	struct if_head *ifs;
@@ -307,14 +312,17 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 	const struct sockaddr_ll *sll;
 #endif
 
-	if (getifaddrs(&ifaddrs) == -1)
+	if ((ifs = malloc(sizeof(*ifs))) == NULL) {
+		logerr(__func__);
 		return NULL;
-
-	if ((ifs = malloc(sizeof(*ifs))) == NULL)
-		goto failed;
+	}
 	TAILQ_INIT(ifs);
+	if (getifaddrs(ifaddrs) == -1) {
+		logerr(__func__);
+		goto out;
+	}
 
-	for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
+	for (ifa = *ifaddrs; ifa; ifa = ifa->ifa_next) {
 		if (ifa->ifa_addr != NULL) {
 #ifdef AF_LINK
 			if (ifa->ifa_addr->sa_family != AF_LINK)
@@ -565,9 +573,7 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 		TAILQ_INSERT_TAIL(ifs, ifp, next);
 	}
 
-	if_learnaddrs(ctx, ifs, ifaddrs);
-failed:
-	freeifaddrs(ifaddrs);
+out:
 	return ifs;
 }