X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.h;h=87715214622def7044354a6fc46a78c70a35620b;hp=1a4fbcef9d893448375b0329938e4684ac7a6216;hb=26c5d8724355b29694af684ee29b47e52129a33c;hpb=7ea97a433c3ce62dab3d99f6dbe72a6cb319cd44

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 1a4fbce..8771521 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -34,6 +34,7 @@ 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,
@@ -154,7 +155,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]) + (odata) <= (uint8_t*)(end); \
+		 ((olen) = _o[2] << 8 | _o[3]); \
 		_o += 4 + (_o[2] << 8 | _o[3]))
 
 
@@ -164,6 +165,7 @@ struct dhcpv6_server_cand {
 	int16_t preference;
 	uint8_t duid_len;
 	uint8_t duid[130];
+	struct in6_addr server_addr;
 	void *ia_na;
 	void *ia_pd;
 	size_t ia_na_len;
@@ -201,12 +203,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,
@@ -231,6 +232,7 @@ int init_dhcpv6(const char *ifname, int request_pd, 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,
@@ -245,10 +247,12 @@ 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_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);