X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.h;h=8abb6311f945ed61b65d39b5b98bfef3eb7464a7;hp=d4458ffd04b3a8f37009df89131a7e114dcd7e84;hb=76c4797e82ec820d488e41ffe37adc107b5d0218;hpb=b4d90de3204d4b7b813f0e1bc0019b8607a29c9f

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index d4458ff..8abb631 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2014 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
@@ -31,6 +31,8 @@
 #define DHCPV6_REB_MAX_RT 600
 #define DHCPV6_INF_MAX_RT 3600
 
+#define DEFAULT_MIN_UPDATE_INTERVAL 30
+
 enum dhcvp6_opt {
 	DHCPV6_OPT_CLIENTID = 1,
 	DHCPV6_OPT_SERVERID = 2,
@@ -43,12 +45,15 @@ enum dhcvp6_opt {
 	DHCPV6_OPT_AUTH = 11,
 	DHCPV6_OPT_STATUS = 13,
 	DHCPV6_OPT_RAPID_COMMIT = 14,
+	DHCPV6_OPT_USER_CLASS = 15,
+	DHCPV6_OPT_VENDOR_CLASS = 16,
 	DHCPV6_OPT_RECONF_MESSAGE = 19,
 	DHCPV6_OPT_RECONF_ACCEPT = 20,
 	DHCPV6_OPT_DNS_SERVERS = 23,
 	DHCPV6_OPT_DNS_DOMAIN = 24,
 	DHCPV6_OPT_IA_PD = 25,
 	DHCPV6_OPT_IA_PREFIX = 26,
+	DHCPV6_OPT_SNTP_SERVERS = 31,
 	DHCPV6_OPT_INFO_REFRESH = 32,
 	DHCPV6_OPT_FQDN = 39,
 	DHCPV6_OPT_NTP_SERVER = 56,
@@ -62,6 +67,21 @@ 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
+#ifdef EXT_S46
+	/* draft-ietf-softwire-map-dhcp-07 */
+	DHCPV6_OPT_S46_RULE = EXT_S46,
+	DHCPV6_OPT_S46_BR = EXT_S46 + 1,
+	DHCPV6_OPT_S46_DMR = EXT_S46 + 2,
+	DHCPV6_OPT_S46_V4V6BIND = EXT_S46 + 3,
+	DHCPV6_OPT_S46_PORTPARAMS = EXT_S46 + 4,
+	DHCPV6_OPT_S46_CONT_MAPE = EXT_S46 + 5,
+	DHCPV6_OPT_S46_CONT_MAPT = EXT_S46 + 6,
+	DHCPV6_OPT_S46_CONT_LW = EXT_S46 + 7,
+#endif
 };
 
 enum dhcpv6_opt_npt {
@@ -96,6 +116,12 @@ enum dhcpv6_status {
 	_DHCPV6_Status_Max
 };
 
+enum dhcpv6_config {
+	DHCPV6_STRICT_OPTIONS = 1,
+	DHCPV6_CLIENT_FQDN = 2,
+	DHCPV6_ACCEPT_RECONFIGURE = 4,
+};
+
 typedef int(reply_handler)(enum dhcpv6_msg orig, const int rc,
 		const void *opt, const void *end);
 
@@ -159,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) &&\
@@ -191,15 +251,23 @@ enum odhcp6c_state {
 	STATE_SEARCH,
 	STATE_IA_NA,
 	STATE_IA_PD,
+	STATE_IA_PD_INIT,
 	STATE_CUSTOM_OPTS,
 	STATE_SNTP_IP,
-	STATE_SNTP_FQDN,
+	STATE_NTP_IP,
+	STATE_NTP_FQDN,
 	STATE_SIP_IP,
 	STATE_SIP_FQDN,
 	STATE_RA_ROUTE,
 	STATE_RA_PREFIX,
 	STATE_RA_DNS,
 	STATE_AFTR_NAME,
+	STATE_VENDORCLASS,
+	STATE_USERCLASS,
+	STATE_CER,
+	STATE_S46_MAPT,
+	STATE_S46_MAPE,
+	STATE_S46_LW,
 	_STATE_MAX
 };
 
@@ -234,10 +302,15 @@ struct odhcp6c_entry {
 	uint32_t t1;
 	uint32_t t2;
 	uint16_t class;
+	uint32_t iaid;
 };
 
+struct odhcp6c_request_prefix {
+	uint32_t iaid;
+	uint16_t length;
+};
 
-int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout);
+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_request(enum dhcpv6_msg type);
 int dhcpv6_poll_reconfigure(void);
@@ -260,6 +333,7 @@ bool odhcp6c_is_bound(void);
 // State manipulation
 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);
 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);