Make SOL_MAX_RT configurable and default to 120

diff --git a/README b/README
index 32b6893828c6d7b357580642238bb926c68998f9..0b4cf9ae1e01d842add38aa8ec46116787ab3f3e 100644 (file)
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ especially routers. It compiles to only about 30 KB (-Os -s).
        e) NTP Options
        f) SIP Options
        g) Information-Refresh Options
-       h) SOL_MAX_RT default to 3600
+       h) Configurable SOL_MAX_RT
        i) DS-Lite AFTR-Name Option
 
 4. Support for requesting and parsing Router Advertisements

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index e9e6aafe0c260394081e067191477dbb5eddacdf..05794c6e570c58740627a5c4351fa6bab3060e57 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -60,7 +60,7 @@ static int dhcpv6_commit_advert(void);
 static struct dhcpv6_retx dhcpv6_retx[_DHCPV6_MSG_MAX] = {
        [DHCPV6_MSG_UNKNOWN] = {false, 1, 120, "<POLL>",
                        dhcpv6_handle_reconfigure, NULL},
-       [DHCPV6_MSG_SOLICIT] = {true, 1, 3600, "SOLICIT",
+       [DHCPV6_MSG_SOLICIT] = {true, 1, 120, "SOLICIT",
                        dhcpv6_handle_advert, dhcpv6_commit_advert},
        [DHCPV6_MSG_REQUEST] = {true, 1, 30, "REQUEST",
                        dhcpv6_handle_reply, NULL},
@@ -90,9 +90,10 @@ static uint8_t reconf_key[16];
 
 
 
-int init_dhcpv6(const char *ifname, int request_pd)
+int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout)
 {
        request_prefix = request_pd;
+       dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_timeout;
 
        sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
 

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"

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index b6f0ff2331d33588b39d9ee0273d6e4a066b8c43..669b33d4149172b8240b3c90aedc422e92e546c2 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -223,7 +223,7 @@ struct odhcp6c_entry {
 };
 
 
-int init_dhcpv6(const char *ifname, int request_pd);
+int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout);
 void dhcpv6_set_ia_mode(enum odhcp6c_ia_mode na, enum odhcp6c_ia_mode pd);
 int dhcpv6_request(enum dhcpv6_msg type);
 int dhcpv6_poll_reconfigure(void);