added command line switch for strict oro

[odhcp6c.git] / src / odhcp6c.h

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 61dee63ffcc9a57b5c918cc5d7e106ca289b4f97..3f23e64f5685d1ebced05da4b7255ca6b93700aa 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -21,13 +21,16 @@
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-#ifndef SOL_NETLINK
-#define SOL_NETLINK 270
-#endif
-
 #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,
@@ -46,6 +49,7 @@ enum dhcvp6_opt {
        DHCPV6_OPT_DNS_DOMAIN = 24,
        DHCPV6_OPT_IA_PD = 25,
        DHCPV6_OPT_IA_PREFIX = 26,
+       DHCPV6_OPT_SNTP_SERVERS = 31,
        DHCPV6_OPT_INFO_REFRESH = 32,
        DHCPV6_OPT_FQDN = 39,
        DHCPV6_OPT_NTP_SERVER = 56,
@@ -53,8 +57,10 @@ 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 */
+       /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
        DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
 #endif
 };
@@ -81,11 +87,17 @@ enum dhcpv6_msg {
 };
 
 enum dhcpv6_status {
+       DHCPV6_Success = 0,
+       DHCPV6_UnspecFail = 1,
        DHCPV6_NoAddrsAvail = 2,
+       DHCPV6_NoBinding = 3,
+       DHCPV6_NotOnLink = 4,
+       DHCPV6_UseMulticast = 5,
        DHCPV6_NoPrefixAvail = 6,
+       _DHCPV6_Status_Max
 };
 
-typedef int(reply_handler)(enum dhcpv6_msg orig,
+typedef int(reply_handler)(enum dhcpv6_msg orig, const int rc,
                const void *opt, const void *end);
 
 // retransmission strategy
@@ -93,12 +105,12 @@ struct dhcpv6_retx {
        bool delay;
        uint8_t init_timeo;
        uint16_t max_timeo;
+       uint8_t max_rc;
        char name[8];
        reply_handler *handler_reply;
        int(*handler_finish)(void);
 };
 
-
 // DHCPv6 Protocol Headers
 struct dhcpv6_header {
        uint8_t msg_type;
@@ -162,6 +174,8 @@ struct dhcpv6_server_cand {
        int16_t preference;
        uint8_t duid_len;
        uint8_t duid[130];
+       uint32_t sol_max_rt;
+       uint32_t inf_max_rt;
        void *ia_na;
        void *ia_pd;
        size_t ia_na_len;
@@ -180,7 +194,8 @@ enum odhcp6c_state {
        STATE_IA_PD,
        STATE_CUSTOM_OPTS,
        STATE_SNTP_IP,
-       STATE_SNTP_FQDN,
+       STATE_NTP_IP,
+       STATE_NTP_FQDN,
        STATE_SIP_IP,
        STATE_SIP_FQDN,
        STATE_RA_ROUTE,
@@ -199,12 +214,11 @@ struct icmp6_opt {
 
 
 enum dhcpv6_mode {
-       DHCPV6_UNKNOWN,
+       DHCPV6_UNKNOWN = -1,
        DHCPV6_STATELESS,
        DHCPV6_STATEFUL
 };
 
-
 enum odhcp6c_ia_mode {
        IA_MODE_NONE,
        IA_MODE_TRY,
@@ -219,14 +233,17 @@ struct odhcp6c_entry {
        struct in6_addr target;
        uint32_t valid;
        uint32_t preferred;
+       uint32_t t1;
+       uint32_t t2;
        uint16_t class;
 };
 
 
-int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout);
+int init_dhcpv6(const char *ifname, int request_pd, bool strict_options, 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);
+int dhcpv6_promote_server_cand(void);
 
 int init_rtnetlink(void);
 int set_rtnetlink_addr(int ifindex, const struct in6_addr *addr,
@@ -240,10 +257,12 @@ void script_delay_call(const char *status, int timeout);
 bool odhcp6c_signal_process(void);
 uint64_t odhcp6c_get_milli_time(void);
 void odhcp6c_random(void *buf, size_t len);
+bool odhcp6c_is_bound(void);
 
 // State manipulation
 void odhcp6c_clear_state(enum odhcp6c_state state);
 void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len);
+void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len);
 size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len);
 void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len);
 void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len);