odhcp6c: Set bound state true before script_call in statefull mode

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index e52e4e0dcd186e53f740afdffb00638384c177aa..61ffe9d832b25ae4fbae54f7fd450bdbc4214ba5 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -32,9 +32,6 @@
 #include "odhcp6c.h"
 #include "ra.h"
 
-#ifdef EXT_BFD_PING
-#include "bfd.h"
-#endif
 
 
 static void sighandler(int signal);
@@ -52,6 +49,8 @@ static int urandom_fd = -1, allow_slaac_only = 0;
 static bool bound = false, release = true;
 static time_t last_update = 0;
 
+static unsigned int min_update_interval = DEFAULT_MIN_UPDATE_INTERVAL;
+
 int main(_unused int argc, char* const argv[])
 {
        // Allocate ressources
@@ -68,16 +67,13 @@ int main(_unused int argc, char* const argv[])
        static struct in6_addr ifid = IN6ADDR_ANY_INIT;
        int sol_timeout = DHCPV6_SOL_MAX_RT;
 
-#ifdef EXT_BFD_PING
-       int bfd_interval = 0, bfd_loss = 3;
-#endif
 
        bool help = false, daemonize = false;
        int logopt = LOG_PID;
        int c;
        unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
 
-       while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:hedp:fa")) != -1) {
+       while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fa")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -139,12 +135,6 @@ 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) {
@@ -197,6 +187,10 @@ int main(_unused int argc, char* const argv[])
                        sol_timeout = atoi(optarg);
                        break;
 
+               case 'm':
+                       min_update_interval = atoi(optarg);
+                       break;
+
                case 'e':
                        logopt |= LOG_PERROR;
                        break;
@@ -259,7 +253,7 @@ int main(_unused int argc, char* const argv[])
                        pidfile = pidbuf;
                }
 
-               int fd = open(pidfile, O_WRONLY | O_CREAT);
+               int fd = open(pidfile, O_WRONLY | O_CREAT, 0644);
                if (fd >= 0) {
                        char buf[8];
                        int len = snprintf(buf, sizeof(buf), "%i\n", getpid());
@@ -272,6 +266,7 @@ int main(_unused int argc, char* const argv[])
 
        while (!signal_term) { // Main logic
                odhcp6c_clear_state(STATE_SERVER_ID);
+               odhcp6c_clear_state(STATE_SERVER_ADDR);
                odhcp6c_clear_state(STATE_IA_NA);
                odhcp6c_clear_state(STATE_IA_PD);
                odhcp6c_clear_state(STATE_SNTP_IP);
@@ -341,13 +336,9 @@ int main(_unused int argc, char* const argv[])
                        break;
 
                case DHCPV6_STATEFUL:
-                       script_call("bound");
                        bound = true;
+                       script_call("bound");
                        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 (!signal_usr2 && !signal_term) {
                                // Renew Cycle
@@ -366,16 +357,7 @@ int main(_unused int argc, char* const argv[])
                                        break; // Other signal type
 
                                // Send renew as T1 expired
-                               size_t ia_pd_len, ia_na_len;
-                               odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
-                               odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
-
-                               // If we have any IAs, send renew, otherwise request
-                               if (ia_pd_len == 0 && ia_na_len == 0)
-                                       res = dhcpv6_request(DHCPV6_MSG_REQUEST);
-                               else
-                                       res = dhcpv6_request(DHCPV6_MSG_RENEW);
-
+                               res = dhcpv6_request(DHCPV6_MSG_RENEW);
                                odhcp6c_signal_process();
                                if (res > 0) { // Renew was succesfull
                                        // Publish updates
@@ -384,6 +366,14 @@ int main(_unused int argc, char* const argv[])
                                }
 
                                odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
+                               odhcp6c_clear_state(STATE_SERVER_ADDR);
+
+                               size_t ia_pd_len, ia_na_len;
+                               odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
+                               odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
+
+                               if (ia_pd_len == 0 && ia_na_len == 0)
+                                       break;
 
                                // If we have IAs, try rebind otherwise restart
                                res = dhcpv6_request(DHCPV6_MSG_REBIND);
@@ -392,9 +382,6 @@ int main(_unused int argc, char* const argv[])
                                if (res > 0)
                                        script_call("rebound");
                                else {
-#ifdef EXT_BFD_PING
-                                       bfd_stop();
-#endif
                                        break;
                                }
                        }
@@ -435,9 +422,7 @@ static int usage(void)
        "       -P <length>     Request IPv6-Prefix (0 = auto)\n"
        "       -F              Force IPv6-Prefix\n"
        "       -V <class>      Set vendor-class option (base-16 encoded)\n"
-#ifdef EXT_BFD_PING
-       "       -B <interval>   Enable BFD ping check\n"
-#endif
+       "       -u <user-class> Set user-class option string\n"
        "       -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"
@@ -447,6 +432,7 @@ static int usage(void)
        "       -f              Don't send Client FQDN option\n"
        "       -k              Don't send a RELEASE when stopping\n"
        "       -t <seconds>    Maximum timeout for DHCPv6-SOLICIT (3600)\n"
+       "       -m <seconds>    Minimum time between accepting updates (30)\n"
        "\nInvocation options:\n"
        "       -p <pidfile>    Set pidfile (/var/run/odhcp6c.pid)\n"
        "       -d              Daemonize\n"
@@ -463,7 +449,7 @@ uint64_t odhcp6c_get_milli_time(void)
 {
        struct timespec t = {0, 0};
        syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t);
-       return t.tv_sec * 1000 + t.tv_nsec / 1000000;
+       return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000;
 }
 
 
@@ -494,14 +480,8 @@ bool odhcp6c_signal_process(void)
                if (ra_link_up())
                        signal_usr2 = true;
 
-               if (ra_updated && (bound || allow_slaac_only == 0))
+               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 signal_usr1 || signal_usr2 || signal_term;
@@ -593,10 +573,10 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
        if (new->valid > 0) {
                if (x) {
                        if (new->valid >= x->valid && new->valid != UINT32_MAX &&
-                                       new->valid - x->valid < 60 &&
+                                       new->valid - x->valid < min_update_interval &&
                                        new->preferred >= x->preferred &&
                                        new->preferred != UINT32_MAX &&
-                                       new->preferred - x->preferred < 60 &&
+                                       new->preferred - x->preferred < min_update_interval &&
                                        x->class == new->class)
                                return false;
                        x->valid = new->valid;