X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=789f696f139bb197f121c7b1cdff80480e2f5833;hp=5608fa9c58a35831045c798a64e1a7ab7906dad3;hb=baee1992982f92a45870ba0aaea111c00963de5d;hpb=8b19de666e02f24280728938dd985ecb3673b83e

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 5608fa9..789f696 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -68,6 +68,8 @@ struct odhcpd_event {
 struct odhcpd_ipaddr {
 	struct in6_addr addr;
 	uint8_t prefix;
+	bool has_class;
+	uint16_t class;
 	uint32_t preferred;
 	uint32_t valid;
 };
@@ -104,7 +106,6 @@ struct interface {
 	int ifindex;
 	char ifname[IF_NAMESIZE];
 	char name[IF_NAMESIZE];
-	bool inuse;
 
 	// Runtime data
 	struct uloop_timeout timer_rs;
@@ -114,6 +115,7 @@ struct interface {
 	bool ia_reconf;
 
 	// DHCPv4
+	struct odhcpd_event dhcpv6_event;
 	struct odhcpd_event dhcpv4_event;
 	struct list_head dhcpv4_assignments;
 
@@ -124,11 +126,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;
 
@@ -186,10 +188,15 @@ 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);
+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
 
 
 // Exported module initializers
@@ -197,9 +204,10 @@ int init_router(void);
 int init_dhcpv6(void);
 int init_dhcpv4(void);
 int init_ndp(void);
-int init_ubus(void);
 
 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);