Avoid sending empty DHCPv6 release messages

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index c76c81316fc8e917099bfbdc6dad70ce24ffbe00..a37de913a7c722a2ed11e110428a0d93d5c57374 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -66,6 +66,7 @@ int main(_unused int argc, char* const argv[])
        int ia_pd_iaid_index = 0;
        static struct in6_addr ifid = IN6ADDR_ANY_INIT;
        int sol_timeout = DHCPV6_SOL_MAX_RT;
+       int verbosity = 0;
 
 
        bool help = false, daemonize = false;
@@ -73,7 +74,7 @@ int main(_unused int argc, char* const argv[])
        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:m:hedp:fa")) != -1) {
+       while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -211,6 +212,10 @@ int main(_unused int argc, char* const argv[])
                        client_options &= ~DHCPV6_ACCEPT_RECONFIGURE;
                        break;
 
+               case 'v':
+                       ++verbosity;
+                       break;
+
                default:
                        help = true;
                        break;
@@ -218,6 +223,9 @@ int main(_unused int argc, char* const argv[])
        }
 
        openlog("odhcp6c", logopt, LOG_DAEMON);
+       if (!verbosity)
+               setlogmask(LOG_UPTO(LOG_WARNING));
+
        const char *ifname = argv[optind];
 
        if (help || !ifname)
@@ -246,19 +254,15 @@ int main(_unused int argc, char* const argv[])
                        return 4;
                }
 
-               char pidbuf[128];
                if (!pidfile) {
-                       snprintf(pidbuf, sizeof(pidbuf),
-                                       "/var/run/odhcp6c.%s.pid", ifname);
-                       pidfile = pidbuf;
+                       snprintf((char*)buf, sizeof(buf), "/var/run/odhcp6c.%s.pid", ifname);
+                       pidfile = (char*)buf;
                }
 
-               int fd = open(pidfile, O_WRONLY | O_CREAT, 0644);
-               if (fd >= 0) {
-                       char buf[8];
-                       int len = snprintf(buf, sizeof(buf), "%i\n", getpid());
-                       write(fd, buf, len);
-                       close(fd);
+               FILE *fp = fopen(pidfile, "w");
+               if (fp) {
+                       fprintf(fp, "%i\n", getpid());
+                       fclose(fp);
                }
        }
 
@@ -336,8 +340,8 @@ 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);
 
                        while (!signal_usr2 && !signal_term) {
@@ -391,6 +395,8 @@ int main(_unused int argc, char* const argv[])
                        break;
                }
 
+               odhcp6c_expire();
+
                size_t ia_pd_len, ia_na_len, server_id_len;
                odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
                odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
@@ -437,7 +443,7 @@ static int usage(void)
        "       -p <pidfile>    Set pidfile (/var/run/odhcp6c.pid)\n"
        "       -d              Daemonize\n"
        "       -e              Write logmessages to stderr\n"
-       //"     -v              Increase logging verbosity\n"
+       "       -v              Increase logging verbosity\n"
        "       -h              Show this help\n\n";
        write(STDERR_FILENO, buf, sizeof(buf));
        return 1;
@@ -480,11 +486,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);
-
        }
 
        return signal_usr1 || signal_usr2 || signal_term;
@@ -564,7 +567,8 @@ struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct
 }
 
 
-bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
+               uint32_t safe, bool filterexcess)
 {
        size_t len;
        struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
@@ -575,7 +579,8 @@ 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 &&
+                       if (filterexcess && new->valid >= x->valid &&
+                                       new->valid != UINT32_MAX &&
                                        new->valid - x->valid < min_update_interval &&
                                        new->preferred >= x->preferred &&
                                        new->preferred != UINT32_MAX &&
@@ -598,12 +603,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 }
 
 
-bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
-{
-       return odhcp6c_update_entry_safe(state, new, 0);
-}
-
-
 static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
 {
        size_t len;