Fixup INF_MAX_RT for RFC 3315 as well

[odhcp6c.git] / src / odhcp6c.h

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 104213681c8b18001bf5a131ceb98c9a12c61c26..fb572d0a55e4673c9edd55754547874a37967eb6 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -24,12 +24,12 @@
 #define ND_OPT_RECURSIVE_DNS 25
 #define ND_OPT_DNSSL 31
 
-#define DHCPV6_SOL_MAX_RT 3600
+#define DHCPV6_SOL_MAX_RT 120
 #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
+#define DHCPV6_INF_MAX_RT 120
 
 #define DEFAULT_MIN_UPDATE_INTERVAL 30
 
@@ -255,6 +255,7 @@ enum odhcp6c_state {
        STATE_RA_ROUTE,
        STATE_RA_PREFIX,
        STATE_RA_DNS,
+       STATE_RA_SEARCH,
        STATE_AFTR_NAME,
        STATE_VENDORCLASS,
        STATE_USERCLASS,
@@ -289,7 +290,8 @@ enum odhcp6c_ia_mode {
 
 struct odhcp6c_entry {
        struct in6_addr router;
-       uint16_t length;
+       uint8_t auxlen;
+       uint8_t length;
        int16_t priority;
        struct in6_addr target;
        uint32_t valid;
@@ -297,6 +299,7 @@ struct odhcp6c_entry {
        uint32_t t1;
        uint32_t t2;
        uint32_t iaid;
+       uint8_t auxtarget[];
 };
 
 struct odhcp6c_request_prefix {