Fix odhcp6c_find_entry

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 89dfd369588842fd647288598d0648d6a71e8f0d..4c534c17b518a66d74688f9131123b2351c9ecc9 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);
@@ -431,7 +429,7 @@ static int usage(void)
        "       -F              Force IPv6-Prefix\n"
        "       -V <class>      Set vendor-class option (base-16 encoded)\n"
        "       -u <user-class> Set user-class option string\n"
-       "       -c <clientid>   Override client-ID (base-16 encoded)\n"
+       "       -c <clientid>   Override client-ID (base-16 encoded 16-bit type + value)\n"
        "       -i <iface-id>   Use a custom interface identifier for RA handling\n"
        "       -r <options>    Options to be requested (comma-separated)\n"
        "       -R              Do not request any options except those specified with -r\n"
@@ -447,7 +445,7 @@ static int usage(void)
        "       -e              Write logmessages to stderr\n"
        "       -v              Increase logging verbosity\n"
        "       -h              Show this help\n\n";
-       write(STDERR_FILENO, buf, sizeof(buf));
+       fputs(buf, stderr);
        return 1;
 }
 
@@ -555,9 +553,9 @@ void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len)
 }
 
 
-struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
+static struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
 {
-       size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + new->length / 8;
+       size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + ((new->length + 7) / 8);
        struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
        struct odhcp6c_entry *x = NULL;
 
@@ -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,18 +579,17 @@ 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 &&
-                                       new->preferred - x->preferred < min_update_interval &&
-                                       x->class == new->class)
+                                       new->preferred - x->preferred < min_update_interval)
                                return false;
                        x->valid = new->valid;
                        x->preferred = new->preferred;
                        x->t1 = new->t1;
                        x->t2 = new->t2;
-                       x->class = new->class;
                        x->iaid = new->iaid;
                } else {
                        odhcp6c_add_state(state, new, sizeof(*new));
@@ -603,12 +601,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;
@@ -660,9 +652,9 @@ uint32_t odhcp6c_elapsed(void)
 }
 
 
-void odhcp6c_random(void *buf, size_t len)
+int odhcp6c_random(void *buf, size_t len)
 {
-       read(urandom_fd, buf, len);
+       return read(urandom_fd, buf, len);
 }
 
 bool odhcp6c_is_bound(void)