X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.h;h=5b9b78fd1faa200c73e9f6f8e4ca9dbf70158bdc;hp=e0f6f62ce386515b73df1fea85f8e7582d7e677d;hb=24c064ccbf819f85c8709ea60acb3b278377b408;hpb=9c409ef5ce654ed5dd3ce706317eaac718a22983

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index e0f6f62..5b9b78f 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -53,8 +53,10 @@ enum dhcvp6_opt {
 	DHCPV6_OPT_SIP_SERVER_A = 22,
 	DHCPV6_OPT_AFTR_NAME = 64,
 	DHCPV6_OPT_PD_EXCLUDE = 67,
-        /* draft-bhandari-dhc-class-based-prefix */
-	DHCPV6_OPT_PREFIX_CLASS = 200, /* NOT STANDARDIZED! */
+#ifdef EXT_PREFIX_CLASS
+        /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
+	DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
+#endif
 };
 
 enum dhcpv6_opt_npt {
@@ -83,7 +85,7 @@ enum dhcpv6_status {
 	DHCPV6_NoPrefixAvail = 6,
 };
 
-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
@@ -91,12 +93,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;
@@ -217,12 +219,12 @@ struct odhcp6c_entry {
 	struct in6_addr target;
 	uint32_t valid;
 	uint32_t preferred;
-        uint32_t prefix_class;
+	uint16_t class;
 };
 
 
-int init_dhcpv6(const char *ifname, int request_pd);
-void dhcpv6_set_ia_na_mode(enum odhcp6c_ia_mode mode);
+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);
 
@@ -248,8 +250,8 @@ void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len);
 
 // Entry manipulation
 struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new);
-void odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new);
-void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe);
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new);
+bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe);
 
 void odhcp6c_expire(void);
 uint32_t odhcp6c_elapsed(void);