ipv6nd: don't handle NA or RA if not active interface

This stops interfaces activated only for delegating to from
receiving these messages by default.

diff --git a/src/ipv6nd.c b/src/ipv6nd.c
index 4b2127ff4ded34bddaa4ec8944fd8e0da50e873a..a35381f7c4b79ddac1a82e4fdfc00447038ad7f1 100644 (file)
--- a/src/ipv6nd.c
+++ b/src/ipv6nd.c
@@ -1559,15 +1559,18 @@ ipv6nd_handledata(void *arg)
                return;
        }
 
+       /* Find the receiving interface */
        TAILQ_FOREACH(ifp, ctx->ifaces, next) {
-               if (ifp->active &&
-                   ifp->index == (unsigned int)pkt.ipi6_ifindex) {
-                       if (!(ifp->options->options & DHCPCD_IPV6))
-                               return;
+               if (ifp->index == (unsigned int)pkt.ipi6_ifindex)
                        break;
-               }
        }
 
+       /* Don't do anything if the user hasn't configured it. */
+       if (ifp != NULL &&
+           (ifp->active != IF_ACTIVE_USER ||
+           !(ifp->options->options & DHCPCD_IPV6)))
+               return;
+
        icp = (struct icmp6_hdr *)ctx->rcvhdr.msg_iov[0].iov_base;
        if (icp->icmp6_code == 0) {
                switch(icp->icmp6_type) {