X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.h;h=88d386791737292f3bd79eb35ddc0f9ed8f1bd90;hb=b4a0f3d74b04074eae21e88fbf5b8f2ddc150f86;hp=1a4fbcef9d893448375b0329938e4684ac7a6216;hpb=7ea97a433c3ce62dab3d99f6dbe72a6cb319cd44;p=odhcp6c.git

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 1a4fbce..88d3867 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
@@ -24,6 +24,13 @@
 #define ND_OPT_RECURSIVE_DNS 25
 #define ND_OPT_DNSSL 31
 
+#define DHCPV6_SOL_MAX_RT 3600
+#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
+
 enum dhcvp6_opt {
 	DHCPV6_OPT_CLIENTID = 1,
 	DHCPV6_OPT_SERVERID = 2,
@@ -36,12 +43,14 @@ enum dhcvp6_opt {
 	DHCPV6_OPT_AUTH = 11,
 	DHCPV6_OPT_STATUS = 13,
 	DHCPV6_OPT_RAPID_COMMIT = 14,
+	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,
@@ -49,8 +58,10 @@ enum dhcvp6_opt {
 	DHCPV6_OPT_SIP_SERVER_A = 22,
 	DHCPV6_OPT_AFTR_NAME = 64,
 	DHCPV6_OPT_PD_EXCLUDE = 67,
+	DHCPV6_OPT_SOL_MAX_RT = 82,
+	DHCPV6_OPT_INF_MAX_RT = 83,
 #ifdef EXT_PREFIX_CLASS
-        /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
+	/* draft-bhandari-dhc-class-based-prefix, not yet standardized */
 	DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
 #endif
 };
@@ -87,6 +98,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);
 
@@ -164,6 +181,8 @@ struct dhcpv6_server_cand {
 	int16_t preference;
 	uint8_t duid_len;
 	uint8_t duid[130];
+	uint32_t sol_max_rt;
+	uint32_t inf_max_rt;
 	void *ia_na;
 	void *ia_pd;
 	size_t ia_na_len;
@@ -180,15 +199,18 @@ 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_MAX
 };
 
@@ -201,12 +223,11 @@ struct icmp6_opt {
 
 
 enum dhcpv6_mode {
-	DHCPV6_UNKNOWN,
+	DHCPV6_UNKNOWN = -1,
 	DHCPV6_STATELESS,
 	DHCPV6_STATEFUL
 };
 
-
 enum odhcp6c_ia_mode {
 	IA_MODE_NONE,
 	IA_MODE_TRY,
@@ -224,13 +245,19 @@ 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);
+int dhcpv6_promote_server_cand(void);
 
 int init_rtnetlink(void);
 int set_rtnetlink_addr(int ifindex, const struct in6_addr *addr,
@@ -249,6 +276,8 @@ 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);
 void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len);