X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.h;h=928f82f32e1004502ecaf2b61e8439af9e9716d5;hb=78bc7d9c835404ad1b5d2eb26de390bd45e26d2a;hp=f7ddc968a93f7eb0288c10040f1761ee77d18b4a;hpb=b5afadae8ed69c98f4e9e6a33dfaf570c5bd9b51;p=odhcp6c.git

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index f7ddc96..928f82f 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -24,12 +24,12 @@
 #define ND_OPT_RECURSIVE_DNS 25
 #define ND_OPT_DNSSL 31
 
-#define DHCPV6_SOL_MAX_RT 3600
+#define DHCPV6_SOL_MAX_RT 120
 #define DHCPV6_REQ_MAX_RT 30
 #define DHCPV6_CNF_MAX_RT 4
 #define DHCPV6_REN_MAX_RT 600
 #define DHCPV6_REB_MAX_RT 600
-#define DHCPV6_INF_MAX_RT 3600
+#define DHCPV6_INF_MAX_RT 120
 
 #define DEFAULT_MIN_UPDATE_INTERVAL 30
 
@@ -255,6 +255,7 @@ enum odhcp6c_state {
 	STATE_RA_ROUTE,
 	STATE_RA_PREFIX,
 	STATE_RA_DNS,
+	STATE_RA_SEARCH,
 	STATE_AFTR_NAME,
 	STATE_VENDORCLASS,
 	STATE_USERCLASS,
@@ -289,7 +290,8 @@ enum odhcp6c_ia_mode {
 
 struct odhcp6c_entry {
 	struct in6_addr router;
-	uint16_t length;
+	uint8_t auxlen;
+	uint8_t length;
 	int16_t priority;
 	struct in6_addr target;
 	uint32_t valid;
@@ -297,6 +299,7 @@ struct odhcp6c_entry {
 	uint32_t t1;
 	uint32_t t2;
 	uint32_t iaid;
+	uint8_t auxtarget[];
 };
 
 struct odhcp6c_request_prefix {
@@ -305,7 +308,7 @@ struct odhcp6c_request_prefix {
 };
 
 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_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);
@@ -321,7 +324,7 @@ int ra_conf_retransmit(int newvalue);
 
 int script_init(const char *path, const char *ifname);
 ssize_t script_unhexlify(uint8_t *dst, size_t len, const char *src);
-void script_call(const char *status);
+void script_call(const char *status, int delay, bool resume);
 
 bool odhcp6c_signal_process(void);
 uint64_t odhcp6c_get_milli_time(void);
@@ -332,13 +335,12 @@ bool odhcp6c_is_bound(void);
 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);
+int 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);
 
 // Entry manipulation
-struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new);
 bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe, bool filterexcess);
 
 void odhcp6c_expire(void);