X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.h;h=cf8ff741bc2759740192c89b9c291efb87917cfb;hb=1234ab04386fd63eafb19ecf245b730d6461e869;hp=669b33d4149172b8240b3c90aedc422e92e546c2;hpb=2037bd1f310239f1982f3bd2f541ba409ee16b6a;p=odhcp6c.git

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 669b33d..cf8ff74 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -21,10 +21,6 @@
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-#ifndef SOL_NETLINK
-#define SOL_NETLINK 270
-#endif
-
 #define ND_OPT_RECURSIVE_DNS 25
 #define ND_OPT_DNSSL 31
 
@@ -38,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,
@@ -81,11 +78,17 @@ enum dhcpv6_msg {
 };
 
 enum dhcpv6_status {
+	DHCPV6_Success = 0,
+	DHCPV6_UnspecFail = 1,
 	DHCPV6_NoAddrsAvail = 2,
+	DHCPV6_NoBinding = 3,
+	DHCPV6_NotOnLink = 4,
+	DHCPV6_UseMulticast = 5,
 	DHCPV6_NoPrefixAvail = 6,
+	_DHCPV6_Status_Max
 };
 
-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
@@ -93,12 +96,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;
@@ -162,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;
@@ -219,6 +223,8 @@ struct odhcp6c_entry {
 	struct in6_addr target;
 	uint32_t valid;
 	uint32_t preferred;
+	uint32_t t1;
+	uint32_t t2;
 	uint16_t class;
 };
 
@@ -240,6 +246,8 @@ void script_delay_call(const char *status, int timeout);
 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);
@@ -250,8 +258,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);