Make SOL_MAX_RT configurable and default to 120

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index d47e17c158ab1b8d2ffe4026954d8a4e6e934793..5c433af31e7c90b1fcad9746be36d29734cc6aab 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -56,26 +56,30 @@ int main(_unused int argc, char* const argv[])
        char *optpos;
        uint16_t opttype;
        enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
+       enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_TRY;
        static struct in6_addr ifid = IN6ADDR_ANY_INIT;
+       int sol_timeout = 120;
 
        bool help = false, daemonize = false;
        int logopt = LOG_PID;
        int c, request_pd = 0;
-       while ((c = getopt(argc, argv, "S::N:P:c:i:r:s:khedp:")) != -1) {
+       while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:kt:hedp:")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
                        break;
 
                case 'N':
-                       if (!strcmp(optarg, "force"))
+                       if (!strcmp(optarg, "force")) {
                                ia_na_mode = IA_MODE_FORCE;
-                       else if (!strcmp(optarg, "none"))
+                               allow_slaac_only = -1;
+                       } else if (!strcmp(optarg, "none")) {
                                ia_na_mode = IA_MODE_NONE;
-                       else if (!strcmp(optarg, "try"))
+                       } else if (!strcmp(optarg, "try")) {
                                ia_na_mode = IA_MODE_TRY;
-                       else
+                       } else{
                                help = true;
+                       }
                        break;
 
                case 'P':
@@ -85,6 +89,13 @@ int main(_unused int argc, char* const argv[])
                        request_pd = strtoul(optarg, NULL, 10);
                        if (request_pd == 0)
                                request_pd = -1;
+
+                       ia_pd_mode = IA_MODE_TRY;
+                       break;
+
+               case 'F':
+                       allow_slaac_only = -1;
+                       ia_pd_mode = IA_MODE_FORCE;
                        break;
 
                case 'c':
@@ -125,6 +136,10 @@ int main(_unused int argc, char* const argv[])
                        release = false;
                        break;
 
+               case 't':
+                       sol_timeout = atoi(optarg);
+                       break;
+
                case 'e':
                        logopt |= LOG_PERROR;
                        break;
@@ -158,8 +173,8 @@ int main(_unused int argc, char* const argv[])
        signal(SIGUSR2, sighandler);
 
        if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-                       init_dhcpv6(ifname, request_pd) || ra_init(ifname, &ifid) ||
-                       script_init(script, ifname)) {
+                       init_dhcpv6(ifname, request_pd, sol_timeout) ||
+                       ra_init(ifname, &ifid) || script_init(script, ifname)) {
                syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
                return 3;
        }
@@ -198,7 +213,7 @@ int main(_unused int argc, char* const argv[])
                odhcp6c_clear_state(STATE_SNTP_FQDN);
                odhcp6c_clear_state(STATE_SIP_IP);
                odhcp6c_clear_state(STATE_SIP_FQDN);
-               dhcpv6_set_ia_na_mode(ia_na_mode);
+               dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode);
                bound = false;
 
                // Server candidates need deep-delete
@@ -329,11 +344,13 @@ static int usage(void)
        "       -S <time>       Wait at least <time> sec for a DHCP-server (0)\n"
        "       -N <mode>       Mode for requesting addresses [try|force|none]\n"
        "       -P <length>     Request IPv6-Prefix (0 = auto)\n"
+       "       -F              Force IPv6-Prefix\n"
        "       -c <clientid>   Override client-ID (base-16 encoded)\n"
        "       -i <iface-id>   Use a custom interface identifier for RA handling\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"
+       "       -t <seconds>    Maximum timeout for DHCPv6-SOLICIT (120)\n"
        "\nInvocation options:\n"
        "       -p <pidfile>    Set pidfile (/var/run/6relayd.pid)\n"
        "       -d              Daemonize\n"
@@ -375,10 +392,9 @@ bool odhcp6c_signal_process(void)
 {
        if (do_signal == SIGIO) {
                do_signal = 0;
-               bool ra_rtnled = ra_rtnl_process();
                bool ra_updated = ra_process();
 
-               if (ra_rtnled || (ra_updated && (bound || allow_slaac_only == 0)))
+               if (ra_updated && (bound || allow_slaac_only == 0))
                        script_call("ra-updated"); // Immediate process urgent events
                else if (ra_updated && !bound && allow_slaac_only > 0)
                        script_delay_call("ra-updated", allow_slaac_only);
@@ -460,7 +476,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;
+                       x->class = new->class;
                } else {
                        odhcp6c_add_state(state, new, sizeof(*new));
                }