X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.h;h=024ebea5476b49b907e59895899c3a3388a6125e;hp=a33a92ea2b56be8bba85a4dc79eb581238c154e5;hb=dc30922e418be6271ad177f3f9d4ecf0c1eb3f01;hpb=63358b8f56aa4eb9976c09bf34e9e04f37d6a2a8

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index a33a92e..024ebea 100644
--- 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
 };
@@ -97,6 +97,12 @@ enum dhcpv6_status {
 	_DHCPV6_Status_Max
 };
 
+enum dhcpv6_config {
+	DHCPV6_STRICT_OPTIONS = 1,
+	DHCPV6_CLIENT_FQDN = 2,
+	DHCPV6_ACCEPT_RECONFIGURE = 4,
+};
+
 typedef int(reply_handler)(enum dhcpv6_msg orig, const int rc,
 		const void *opt, const void *end);
 
@@ -174,7 +180,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;
@@ -193,9 +198,11 @@ enum odhcp6c_state {
 	STATE_SEARCH,
 	STATE_IA_NA,
 	STATE_IA_PD,
+	STATE_IA_PD_INIT,
 	STATE_CUSTOM_OPTS,
 	STATE_SNTP_IP,
-	STATE_SNTP_FQDN,
+	STATE_NTP_IP,
+	STATE_NTP_FQDN,
 	STATE_SIP_IP,
 	STATE_SIP_FQDN,
 	STATE_RA_ROUTE,
@@ -236,10 +243,15 @@ struct odhcp6c_entry {
 	uint32_t t1;
 	uint32_t t2;
 	uint16_t class;
+	uint32_t iaid;
 };
 
+struct odhcp6c_request_prefix {
+	uint32_t iaid;
+	uint16_t length;
+};
 
-int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout);
+int init_dhcpv6(const char *ifname, unsigned int client_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);
@@ -258,11 +270,11 @@ 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);
 void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len);
+void odhcp6c_append_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);