[src/trunk]: src/usr.sbin/ifwatchd Check address is not tentative, duplicated...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/28f75c21107c
branches:  trunk
changeset: 347906:28f75c21107c
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Sep 21 21:07:29 2016 +0000

description:
Check address is not tentative, duplicated or detached before running
scripts.

XXX Do we want new script actions for detached or duplicated addresses?

diffstat:

 usr.sbin/ifwatchd/ifwatchd.c |  49 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 6 deletions(-)

diffs (123 lines):

diff -r 83ac447a6d90 -r 28f75c21107c usr.sbin/ifwatchd/ifwatchd.c
--- a/usr.sbin/ifwatchd/ifwatchd.c      Wed Sep 21 20:32:47 2016 +0000
+++ b/usr.sbin/ifwatchd/ifwatchd.c      Wed Sep 21 21:07:29 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifwatchd.c,v 1.32 2016/09/21 20:31:31 roy Exp $        */
+/*     $NetBSD: ifwatchd.c,v 1.33 2016/09/21 21:07:29 roy Exp $        */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -48,6 +48,7 @@
 #endif
 #include <net/route.h>
 #include <netinet/in.h>
+#include <netinet/in_var.h>
 #include <arpa/inet.h>
 
 #include <paths.h>
@@ -61,10 +62,12 @@
 #include <syslog.h>
 
 enum event { ARRIVAL, DEPARTURE, UP, DOWN, CARRIER, NO_CARRIER };
+enum addrflag { NOTREADY, DETACHED, READY };
 
 /* local functions */
 __dead static void usage(void);
 static void dispatch(const void *, size_t);
+static enum addrflag check_addrflags(int af, int addrflags);
 static void check_addrs(const struct ifa_msghdr *ifam);
 static void invoke_script(const struct sockaddr *sa, const struct sockaddr *dst,
     enum event ev, int ifindex, const char *ifname_hint);
@@ -293,6 +296,27 @@
        }
 }
 
+static enum addrflag
+check_addrflags(int af, int addrflags)
+{
+
+       switch (af) {
+       case AF_INET:
+               if (addrflags & IN_IFF_NOTREADY)
+                       return NOTREADY;
+               if (addrflags & IN_IFF_DETACHED)
+                       return DETACHED;
+               break;
+       case AF_INET6:
+               if (addrflags & IN6_IFF_NOTREADY)
+                       return NOTREADY;
+               if (addrflags & IN6_IFF_DETACHED)
+                       return DETACHED;
+               break;
+       }
+       return READY;
+}
+
 static void
 check_addrs(const struct ifa_msghdr *ifam)
 {
@@ -300,6 +324,7 @@
        const struct sockaddr *sa, *ifa = NULL, *brd = NULL;
        unsigned i;
        struct interface_data *ifd = NULL;
+       int aflag;
        enum event ev;
 
        if (ifam->ifam_addrs == 0)
@@ -327,6 +352,13 @@
        }
        if (ifa != NULL && ifd != NULL) {
                ev = ifam->ifam_type == RTM_DELADDR ? DOWN : UP;
+               aflag = check_addrflags(ifa->sa_family, ifam->ifam_addrflags);
+               if (ev == UP) {
+                       if (aflag == NOTREADY)
+                               return;
+                       if (aflag == DETACHED)
+                               return;         /* XXX set ev to DOWN? */
+               }
                if ((ev == UP && if_is_connected(ifd->ifname)) ||
                    (ev == DOWN && if_is_not_connected(ifd->ifname)))
                        invoke_script(ifa, brd, ev, ifd->index, ifd->ifname);
@@ -540,7 +572,8 @@
 {
        struct interface_data * ifd;
        struct ifaddrs *res = NULL, *p;
-       int s;
+       struct sockaddr *ifa;
+       int s, aflag;
 
        s = socket(AF_INET, SOCK_DGRAM, 0);
        if (s < 0)
@@ -557,15 +590,16 @@
                if (ifd == NULL)
                        continue;
 
-               if (p->ifa_addr && p->ifa_addr->sa_family == AF_LINK)
+               ifa = p->ifa_addr;
+               if (ifa != NULL && ifa->sa_family == AF_LINK)
                        invoke_script(NULL, NULL, ARRIVAL, ifd->index,
                            NULL);
 
                if ((p->ifa_flags & IFF_UP) == 0)
                        continue;
-               if (p->ifa_addr == NULL)
+               if (ifa == NULL)
                        continue;
-               if (p->ifa_addr->sa_family == AF_LINK) {
+               if (ifa->sa_family == AF_LINK) {
                        struct ifmediareq ifmr;
 
                        memset(&ifmr, 0, sizeof(ifmr));
@@ -581,8 +615,11 @@
                            }
                        continue;
                }
+               aflag = check_addrflags(ifa->sa_family, p->ifa_addrflags);
+               if (aflag != READY)
+                       continue;
                if (if_is_connected(ifd->ifname))
-                       invoke_script(p->ifa_addr, p->ifa_dstaddr, UP,
+                       invoke_script(ifa, p->ifa_dstaddr, UP,
                            ifd->index, ifd->ifname);
        }
        freeifaddrs(res);