X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=dfaec9b2bc99edcbc2dc9cca205f61f1f6ac431a;hp=531a0ff155767f91348638ba043a038c36e9a43c;hb=69ca34df0145dd204dceeacc7caf978e4055d679;hpb=ab6cef402c4f5982fddf72a8633d2a463e8d9006

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 531a0ff..dfaec9b 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -68,6 +68,9 @@ struct odhcpd_event {
 struct odhcpd_ipaddr {
 	struct in6_addr addr;
 	uint8_t prefix;
+	uint8_t dprefix;
+	bool has_class;
+	uint16_t class;
 	uint32_t preferred;
 	uint32_t valid;
 };
@@ -104,7 +107,6 @@ struct interface {
 	int ifindex;
 	char ifname[IF_NAMESIZE];
 	char name[IF_NAMESIZE];
-	bool inuse;
 
 	// Runtime data
 	struct uloop_timeout timer_rs;
@@ -114,9 +116,14 @@ struct interface {
 	bool ia_reconf;
 
 	// DHCPv4
+	struct odhcpd_event dhcpv6_event;
 	struct odhcpd_event dhcpv4_event;
 	struct list_head dhcpv4_assignments;
 
+	// Managed PD
+	char dhcpv6_pd_manager[128];
+	struct in6_addr dhcpv6_pd_cer;
+
 	// Services
 	enum odhcpd_mode ra;
 	enum odhcpd_mode dhcpv6;
@@ -124,11 +131,11 @@ struct interface {
 	enum odhcpd_mode dhcpv4;
 
 	// Config
+	bool inuse;
 	bool external;
 	bool master;
 	bool ignore;
 	bool always_rewrite_dns;
-	bool deprecate_ula_if_public_avail;
 	bool ra_not_onlink;
 	bool no_dynamic_dhcp;
 
@@ -150,11 +157,16 @@ struct interface {
 	uint8_t *search;
 	size_t search_len;
 
+	void *dhcpv6_raw;
+	size_t dhcpv6_raw_len;
+
 	char* static_ndp;
 	size_t static_ndp_len;
 
 	char *upstream;
 	size_t upstream_len;
+
+	char *filter_class;
 };
 
 extern struct list_head interfaces;
@@ -186,13 +198,17 @@ time_t odhcpd_time(void);
 ssize_t odhcpd_unhexlify(uint8_t *dst, size_t len, const char *src);
 void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len);
 
-int config_parse_interface(struct blob_attr *b, const char *iname, bool overwrite);
+int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
+void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
+
+int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
 #ifdef WITH_UBUS
 int init_ubus(void);
 const char* ubus_get_ifname(const char *name);
 void ubus_apply_network(void);
 bool ubus_has_prefix(const char *name, const char *ifname);
+bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass);
 #endif
 
 
@@ -206,3 +222,5 @@ int setup_router_interface(struct interface *iface, bool enable);
 int setup_dhcpv6_interface(struct interface *iface, bool enable);
 int setup_ndp_interface(struct interface *iface, bool enable);
 int setup_dhcpv4_interface(struct interface *iface, bool enable);
+
+void odhcpd_reload(void);