Finalizing bfd work

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 20639352fde8979b00bc5aadfda2db14ce4e4028..de03b814f95efa86bde343374a14b6769e04cd02 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -32,6 +32,10 @@
 #include "odhcp6c.h"
 #include "ra.h"
 
+#ifdef EXT_BFD_PING
+#include "bfd.h"
+#endif
+
 
 static void sighandler(int signal);
 static int usage(void);
@@ -59,10 +63,14 @@ int main(_unused int argc, char* const argv[])
        static struct in6_addr ifid = IN6ADDR_ANY_INIT;
        int sol_timeout = 120;
 
+#ifdef EXT_BFD_PING
+       int bfd_interval = 0, bfd_loss = 3;
+#endif
+
        bool help = false, daemonize = false;
        int logopt = LOG_PID;
        int c, request_pd = 0;
-       while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:kt:hedp:")) != -1) {
+       while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -89,7 +97,6 @@ int main(_unused int argc, char* const argv[])
                        if (request_pd == 0)
                                request_pd = -1;
 
-                       ia_pd_mode = IA_MODE_TRY;
                        break;
 
                case 'F':
@@ -97,6 +104,12 @@ int main(_unused int argc, char* const argv[])
                        ia_pd_mode = IA_MODE_FORCE;
                        break;
 
+#ifdef EXT_BFD_PING
+               case 'B':
+                       bfd_interval = atoi(optarg);
+                       break;
+#endif
+
                case 'c':
                        l = script_unhexlify(&buf[4], sizeof(buf) - 4, optarg);
                        if (l > 0) {
@@ -263,6 +276,10 @@ int main(_unused int argc, char* const argv[])
                script_call("bound");
                bound = true;
                syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
+#ifdef EXT_BFD_PING
+               if (bfd_interval > 0)
+                       bfd_start(ifname, bfd_loss, bfd_interval);
+#endif
 
                while (do_signal == 0 || do_signal == SIGUSR1) {
                        // Renew Cycle
@@ -312,6 +329,10 @@ int main(_unused int argc, char* const argv[])
                                script_call("rebound");
                }
 
+#ifdef EXT_BFD_PING
+               bfd_stop();
+#endif
+
 
                size_t ia_pd_len, ia_na_len, server_id_len;
                odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
@@ -343,6 +364,9 @@ static int usage(void)
        "       -N <mode>       Mode for requesting addresses [try|force|none]\n"
        "       -P <length>     Request IPv6-Prefix (0 = auto)\n"
        "       -F              Force IPv6-Prefix\n"
+#ifdef EXT_BFD_PING
+       "       -B <interval>   Enable BFD ping check\n"
+#endif
        "       -c <clientid>   Override client-ID (base-16 encoded)\n"
        "       -i <iface-id>   Use a custom interface identifier for RA handling\n"
        "       -r <options>    Options to be requested (comma-separated)\n"
@@ -392,10 +416,17 @@ bool odhcp6c_signal_process(void)
                do_signal = 0;
                bool ra_updated = ra_process();
 
+               if (ra_link_up())
+                       do_signal = SIGUSR2;
+
                if (ra_updated && (bound || allow_slaac_only == 0))
                        script_call("ra-updated"); // Immediate process urgent events
                else if (ra_updated && !bound && allow_slaac_only > 0)
                        script_delay_call("ra-updated", allow_slaac_only);
+
+#ifdef EXT_BFD_PING
+               bfd_receive();
+#endif
        }
 
        return do_signal != 0;
@@ -466,7 +497,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
        size_t len;
        struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
        struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
-       bool changed = true;
 
        if (x && x->valid > new->valid && new->valid < safe)
                new->valid = safe;
@@ -477,7 +507,7 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
                                        new->preferred >= x->preferred &&
                                        new->preferred - x->preferred < 60 &&
                                        x->class == new->class)
-                               changed = false;
+                               return false;
                        x->valid = new->valid;
                        x->preferred = new->preferred;
                        x->t1 = new->t1;
@@ -489,7 +519,7 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
        } else if (x) {
                odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x));
        }
-       return changed;
+       return true;
 }