Support for SOL_MAX_RT and INF_MAX_RT options (RFC7083)

[odhcp6c.git] / src / odhcp6c.h

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 87715214622def7044354a6fc46a78c70a35620b..a33a92ea2b56be8bba85a4dc79eb581238c154e5 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -24,6 +24,13 @@
 #define ND_OPT_RECURSIVE_DNS 25
 #define ND_OPT_DNSSL 31
 
+#define DHCPV6_SOL_MAX_RT 3600
+#define DHCPV6_REQ_MAX_RT 30
+#define DHCPV6_CNF_MAX_RT 4
+#define DHCPV6_REN_MAX_RT 600
+#define DHCPV6_REB_MAX_RT 600
+#define DHCPV6_INF_MAX_RT 3600
+
 enum dhcvp6_opt {
        DHCPV6_OPT_CLIENTID = 1,
        DHCPV6_OPT_SERVERID = 2,
@@ -50,6 +57,8 @@ enum dhcvp6_opt {
        DHCPV6_OPT_SIP_SERVER_A = 22,
        DHCPV6_OPT_AFTR_NAME = 64,
        DHCPV6_OPT_PD_EXCLUDE = 67,
+       DHCPV6_OPT_SOL_MAX_RT = 82,
+       DHCPV6_OPT_INF_MAX_RT = 83,
 #ifdef EXT_PREFIX_CLASS
         /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
        DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
@@ -155,7 +164,7 @@ struct dhcpv6_auth_reconfigure {
 #define dhcpv6_for_each_option(start, end, otype, olen, odata)\
        for (uint8_t *_o = (uint8_t*)(start); _o + 4 <= (uint8_t*)(end) &&\
                ((otype) = _o[0] << 8 | _o[1]) && ((odata) = (void*)&_o[4]) &&\
-                ((olen) = _o[2] << 8 | _o[3]); \
+               ((olen) = _o[2] << 8 | _o[3]) + (odata) <= (uint8_t*)(end); \
                _o += 4 + (_o[2] << 8 | _o[3]))
 
 
@@ -166,6 +175,8 @@ struct dhcpv6_server_cand {
        uint8_t duid_len;
        uint8_t duid[130];
        struct in6_addr server_addr;
+       uint32_t sol_max_rt;
+       uint32_t inf_max_rt;
        void *ia_na;
        void *ia_pd;
        size_t ia_na_len;