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

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 2d4fa90..5b9b78f 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -48,6 +48,21 @@ enum dhcvp6_opt {
 	DHCPV6_OPT_IA_PREFIX = 26,
 	DHCPV6_OPT_INFO_REFRESH = 32,
 	DHCPV6_OPT_FQDN = 39,
+	DHCPV6_OPT_NTP_SERVER = 56,
+	DHCPV6_OPT_SIP_SERVER_D = 21,
+	DHCPV6_OPT_SIP_SERVER_A = 22,
+	DHCPV6_OPT_AFTR_NAME = 64,
+	DHCPV6_OPT_PD_EXCLUDE = 67,
+#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 {
+	NTP_SRV_ADDR = 1,
+	NTP_MC_ADDR = 2,
+	NTP_SRV_FQDN = 3
 };
 
 enum dhcpv6_msg {
@@ -70,20 +85,20 @@ enum dhcpv6_status {
 	DHCPV6_NoPrefixAvail = 6,
 };
 
-typedef int(reply_handler)(enum dhcpv6_msg orig,
-		const void *opt, const void *end, uint32_t elapsed);
+typedef int(reply_handler)(enum dhcpv6_msg orig, const int rc,
+		const void *opt, const void *end);
 
 // retransmission strategy
 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)(uint32_t elapsed);
+	int(*handler_finish)(void);
 };
 
-
 // DHCPv6 Protocol Headers
 struct dhcpv6_header {
 	uint8_t msg_type;
@@ -122,6 +137,17 @@ struct dhcpv6_duid {
 	uint8_t data[128];
 } _packed;
 
+struct dhcpv6_auth_reconfigure {
+	uint16_t type;
+	uint16_t len;
+	uint8_t protocol;
+	uint8_t algorithm;
+	uint8_t rdm;
+	uint64_t replay;
+	uint8_t reconf_type;
+	uint8_t key[16];
+} _packed;
+
 
 #define dhcpv6_for_each_option(start, end, otype, olen, odata)\
 	for (uint8_t *_o = (uint8_t*)(start); _o + 4 <= (uint8_t*)(end) &&\
@@ -136,6 +162,10 @@ struct dhcpv6_server_cand {
 	int16_t preference;
 	uint8_t duid_len;
 	uint8_t duid[130];
+	void *ia_na;
+	void *ia_pd;
+	size_t ia_na_len;
+	size_t ia_pd_len;
 };
 
 
@@ -148,8 +178,15 @@ enum odhcp6c_state {
 	STATE_SEARCH,
 	STATE_IA_NA,
 	STATE_IA_PD,
-	STATE_IA_PD_LOST,
 	STATE_CUSTOM_OPTS,
+	STATE_SNTP_IP,
+	STATE_SNTP_FQDN,
+	STATE_SIP_IP,
+	STATE_SIP_FQDN,
+	STATE_RA_ROUTE,
+	STATE_RA_PREFIX,
+	STATE_RA_DNS,
+	STATE_AFTR_NAME,
 	_STATE_MAX
 };
 
@@ -175,27 +212,46 @@ enum odhcp6c_ia_mode {
 };
 
 
-int init_dhcpv6(const char *ifname, int request_pd);
-void dhcpv6_set_ia_na_mode(enum odhcp6c_ia_mode mode);
+struct odhcp6c_entry {
+	struct in6_addr router;
+	uint16_t length;
+	int16_t priority;
+	struct in6_addr target;
+	uint32_t valid;
+	uint32_t preferred;
+	uint16_t class;
+};
+
+
+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);
-void dhcpv6_remove_addrs(void);
 
 int init_rtnetlink(void);
 int set_rtnetlink_addr(int ifindex, const struct in6_addr *addr,
-		time_t pref, time_t valid);
+		uint32_t pref, uint32_t valid);
 
 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_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);
 
 // State manipulation
-bool odhcp6c_signal_is_pending(void);
-uint64_t odhcp6c_get_milli_time(void);
 void odhcp6c_clear_state(enum odhcp6c_state state);
 void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len);
 size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len);
-bool odhcp6c_commit_state(enum odhcp6c_state state, size_t old_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);
+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);