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

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 2c28c80..8771521 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -155,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]))
 
 
@@ -233,7 +233,6 @@ 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);
-void dhcpv6_clear_all_server_cand(void);
 
 int init_rtnetlink(void);
 int set_rtnetlink_addr(int ifindex, const struct in6_addr *addr,