X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.h;h=59c4a42b973d2b53c142f1e320d720ce5a98f2b4;hp=285f6b10d2e1d3da5d6644fdc69f02bfcde89f33;hb=0300fe7589a1701361735ac068e4b57bb1a1896f;hpb=d88e97eade44c39d4b51eef440c3506edb050044

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 285f6b1..59c4a42 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -31,18 +31,20 @@
 #define DHCPV6_REB_MAX_RT 600
 #define DHCPV6_INF_MAX_RT 3600
 
-#define DEFAULT_MIN_UPDATE_INTERVAL 60
+#define DEFAULT_MIN_UPDATE_INTERVAL 30
 
 enum dhcvp6_opt {
 	DHCPV6_OPT_CLIENTID = 1,
 	DHCPV6_OPT_SERVERID = 2,
 	DHCPV6_OPT_IA_NA = 3,
+	DHCPV6_OPT_IA_TA = 4,
 	DHCPV6_OPT_IA_ADDR = 5,
 	DHCPV6_OPT_ORO = 6,
 	DHCPV6_OPT_PREF = 7,
 	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_USER_CLASS = 15,
@@ -67,6 +69,19 @@ enum dhcvp6_opt {
 	/* draft-bhandari-dhc-class-based-prefix, not yet standardized */
 	DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
 #endif
+#ifdef EXT_CER_ID
+	/* draft-donley-dhc-cer-id-option-03 */
+	DHCPV6_OPT_CER_ID = EXT_CER_ID,
+#endif
+	/* draft-ietf-softwire-map-dhcp-08 */
+	DHCPV6_OPT_S46_RULE = 89,
+	DHCPV6_OPT_S46_BR = 90,
+	DHCPV6_OPT_S46_DMR = 91,
+	DHCPV6_OPT_S46_V4V6BIND = 92,
+	DHCPV6_OPT_S46_PORTPARAMS = 93,
+	DHCPV6_OPT_S46_CONT_MAPE = 94,
+	DHCPV6_OPT_S46_CONT_MAPT = 95,
+	DHCPV6_OPT_S46_CONT_LW = 96,
 };
 
 enum dhcpv6_opt_npt {
@@ -170,6 +185,40 @@ struct dhcpv6_auth_reconfigure {
 	uint8_t key[16];
 } _packed;
 
+struct dhcpv6_cer_id {
+	uint16_t type;
+	uint16_t len;
+	uint16_t reserved;
+	uint16_t auth_type;
+	uint8_t auth[16];
+	struct in6_addr addr;
+} _packed;
+
+struct dhcpv6_s46_portparams {
+	uint8_t offset;
+	uint8_t psid_len;
+	uint16_t psid;
+} _packed;
+
+struct dhcpv6_s46_v4v6bind {
+	struct in_addr ipv4_address;
+	uint8_t bindprefix6_len;
+	uint8_t bind_ipv6_prefix[];
+} _packed;
+
+struct dhcpv6_s46_dmr {
+	uint8_t dmr_prefix6_len;
+	uint8_t dmr_ipv6_prefix[];
+} _packed;
+
+struct dhcpv6_s46_rule {
+	uint8_t flags;
+	uint8_t ea_len;
+	uint8_t prefix4_len;
+	struct in_addr ipv4_prefix;
+	uint8_t prefix6_len;
+	uint8_t ipv6_prefix[];
+} _packed;
 
 #define dhcpv6_for_each_option(start, end, otype, olen, odata)\
 	for (uint8_t *_o = (uint8_t*)(start); _o + 4 <= (uint8_t*)(end) &&\
@@ -215,6 +264,11 @@ enum odhcp6c_state {
 	STATE_AFTR_NAME,
 	STATE_VENDORCLASS,
 	STATE_USERCLASS,
+	STATE_CER,
+	STATE_S46_MAPT,
+	STATE_S46_MAPE,
+	STATE_S46_LW,
+	STATE_PASSTHRU,
 	_STATE_MAX
 };