First hnet-based version.

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 9f7019da5a1ceb935f16a0476baa3ae635dbc224..64d363f46b9d21210d12c40fa72104a04848c5e0 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -41,13 +41,11 @@ static size_t state_len[_STATE_MAX] = {0};
 
 static volatile int do_signal = 0;
 static int urandom_fd = -1;
-static bool bound = false, allow_slaac_only = false;
+static bool bound = false, allow_slaac_only = true, release = true;
 
 
 int main(_unused int argc, char* const argv[])
 {
-       openlog("odhcp6c", LOG_PERROR | LOG_PID, LOG_DAEMON);
-
        // Allocate ressources
        const char *pidfile = NULL;
        const char *script = "/usr/sbin/odhcp6c-update";
@@ -58,11 +56,12 @@ int main(_unused int argc, char* const argv[])
        enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
 
        bool help = false, daemonize = false;
+       int logopt = LOG_PID;
        int c, request_pd = 0;
-       while ((c = getopt(argc, argv, "SN:P:c:r:s:hdp:")) != -1) {
+       while ((c = getopt(argc, argv, "SN:P:c:r:s:khedp:")) != -1) {
                switch (c) {
                case 'S':
-                       allow_slaac_only = true;
+                       allow_slaac_only = false;
                        break;
 
                case 'N':
@@ -77,6 +76,7 @@ int main(_unused int argc, char* const argv[])
                        break;
 
                case 'P':
+                       allow_slaac_only = false;
                        request_pd = strtoul(optarg, NULL, 10);
                        if (request_pd == 0)
                                request_pd = -1;
@@ -88,7 +88,7 @@ int main(_unused int argc, char* const argv[])
                                buf[0] = 0;
                                buf[1] = DHCPV6_OPT_CLIENTID;
                                buf[2] = 0;
-                               buf[4] = l;
+                               buf[3] = l;
                                odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4);
                        } else {
                                help = true;
@@ -111,6 +111,14 @@ int main(_unused int argc, char* const argv[])
                        script = optarg;
                        break;
 
+               case 'k':
+                       release = false;
+                       break;
+
+               case 'e':
+                       logopt |= LOG_PERROR;
+                       break;
+
                case 'd':
                        daemonize = true;
                        break;
@@ -125,6 +133,7 @@ int main(_unused int argc, char* const argv[])
                }
        }
 
+       openlog("odhcp6c", logopt, LOG_DAEMON);
        const char *ifname = argv[optind];
 
        if (help || !ifname)
@@ -182,6 +191,8 @@ int main(_unused int argc, char* const argv[])
                dhcpv6_set_ia_na_mode(ia_na_mode);
                bound = false;
 
+               syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
+
                do_signal = 0;
                int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
                odhcp6c_signal_process();
@@ -202,6 +213,7 @@ int main(_unused int argc, char* const argv[])
                                        script_call("informed");
 
                                bound = true;
+                               syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
 
                                if (dhcpv6_poll_reconfigure() > 0)
                                        script_call("informed");
@@ -217,6 +229,7 @@ int main(_unused int argc, char* const argv[])
                odhcp6c_signal_process();
                script_call("bound");
                bound = true;
+               syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
 
                while (do_signal == 0 || do_signal == SIGUSR1) {
                        // Renew Cycle
@@ -277,7 +290,7 @@ int main(_unused int argc, char* const argv[])
                bound = false;
                script_call("unbound");
 
-               if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0))
+               if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0) && release)
                        dhcpv6_request(DHCPV6_MSG_RELEASE);
 
                odhcp6c_clear_state(STATE_IA_NA);
@@ -294,15 +307,17 @@ static int usage(void)
        const char buf[] =
        "Usage: odhcp6c [options] <interface>\n"
        "\nFeature options:\n"
-       "       -S              Allow SLAAC-only assignment\n"
+       "       -S              Don't allow SLAAC-only (implied by -P)\n"
        "       -N <mode>       Mode for requesting addresses [try|force|none]\n"
        "       -P <length>     Request IPv6-Prefix (0 = auto)\n"
        "       -c <clientid>   Override client-ID (base-16 encoded)\n"
        "       -r <options>    Options to be requested (comma-separated)\n"
        "       -s <script>     Status update script (/usr/sbin/odhcp6c-update)\n"
+       "       -k              Don't send a RELEASE when stopping\n"
        "\nInvocation options:\n"
        "       -p <pidfile>    Set pidfile (/var/run/6relayd.pid)\n"
        "       -d              Daemonize\n"
+       "       -e              Write logmessages to stderr\n"
        //"     -v              Increase logging verbosity\n"
        "       -h              Show this help\n\n";
        write(STDERR_FILENO, buf, sizeof(buf));
@@ -412,6 +427,7 @@ void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
                if (x) {
                        x->valid = new->valid;
                        x->preferred = new->preferred;
+                        x->prefix_class = new->prefix_class;
                } else {
                        odhcp6c_add_state(state, new, sizeof(*new));
                }