]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
inet: Either call the IPv4LL handler or the DHCP handler - not both
authorRoy Marples <roy@marples.name>
Tue, 1 Oct 2019 16:01:49 +0000 (17:01 +0100)
committerRoy Marples <roy@marples.name>
Tue, 1 Oct 2019 16:01:49 +0000 (17:01 +0100)
src/ipv4.c

index 05fc8066affda5032e758e6b5cddd7f13dd9a3d0..544432ab44a3542681587cc7b5842d42a058fa7f 100644 (file)
@@ -936,10 +936,14 @@ ipv4_handleifa(struct dhcpcd_ctx *ctx,
        }
 
        if (addr->s_addr != INADDR_ANY && addr->s_addr != INADDR_BROADCAST) {
-               dhcp_handleifa(cmd, ia, pid);
+               if (IN_LINKLOCAL(addr->s_addr))
 #ifdef IPV4LL
-               ipv4ll_handleifa(cmd, ia, pid);
+                       ipv4ll_handleifa(cmd, ia, pid);
+#else
+                       ;
 #endif
+               else
+                       dhcp_handleifa(cmd, ia, pid);
        }
 
        if (cmd == RTM_DELADDR)