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 7e0710b7e1a10a5d59bb72bd13b48cdebcd8a01b..5c433af31e7c90b1fcad9746be36d29734cc6aab 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -58,11 +58,12 @@ int main(_unused int argc, char* const argv[])
        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:Fc: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;
@@ -135,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;
@@ -168,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;
        }
@@ -345,6 +350,7 @@ static int usage(void)
        "       -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"