Avoid sending empty DHCPv6 release messages

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 89dfd369588842fd647288598d0648d6a71e8f0d..a37de913a7c722a2ed11e110428a0d93d5c57374 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -254,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);
                }
        }
 
@@ -399,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);
@@ -569,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);
@@ -580,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 &&
@@ -603,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;