Fix priority for on-link routes for prefixes

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index f7ae2fb917e73b8d3be1d3dd6d810386dd3440d3..f4f83f1efb846cbb2250c0827763b144d5ad365a 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -41,7 +41,7 @@ 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 = true;
+static bool bound = false, allow_slaac_only = true, release = true;
 
 
 int main(_unused int argc, char* const argv[])
@@ -59,7 +59,7 @@ int main(_unused int argc, char* const argv[])
 
        bool help = false, daemonize = false;
        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:khdp:")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = false;
@@ -89,7 +89,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;
@@ -112,6 +112,10 @@ int main(_unused int argc, char* const argv[])
                        script = optarg;
                        break;
 
+               case 'k':
+                       release = false;
+                       break;
+
                case 'd':
                        daemonize = true;
                        break;
@@ -183,6 +187,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();
@@ -203,6 +209,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");
@@ -218,6 +225,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
@@ -278,7 +286,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);
@@ -301,6 +309,7 @@ static int usage(void)
        "       -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"