Remove obsolete prefix class support

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 8b5cb54308c8f7224e37c3dbd7d5e1571981d53e..2d828566ed75be0ddb0eb27b7e169a764754e65a 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -445,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;
 }
 
@@ -584,14 +584,12 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
                                        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));
@@ -654,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)