fix NTP server option handling

[odhcp6c.git] / src / odhcp6c.h

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index a33a92ea2b56be8bba85a4dc79eb581238c154e5..e3c6c5eeacf71b4ad187aab4e4033226ff372316 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -41,7 +41,6 @@ enum dhcvp6_opt {
        DHCPV6_OPT_ELAPSED = 8,
        DHCPV6_OPT_RELAY_MSG = 9,
        DHCPV6_OPT_AUTH = 11,
-       DHCPV6_OPT_UNICAST = 12,
        DHCPV6_OPT_STATUS = 13,
        DHCPV6_OPT_RAPID_COMMIT = 14,
        DHCPV6_OPT_RECONF_MESSAGE = 19,
@@ -50,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,
@@ -60,7 +60,7 @@ enum dhcvp6_opt {
        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
 };
@@ -174,7 +174,6 @@ struct dhcpv6_server_cand {
        int16_t preference;
        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;
@@ -195,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,
@@ -258,7 +258,6 @@ 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);
-bool odhcp6c_addr_in_scope(const struct in6_addr *addr);
 
 // State manipulation
 void odhcp6c_clear_state(enum odhcp6c_state state);