X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=95dcb00b38185df5252f1498619595f469bef5c1;hp=fb3db37f80650a4c575a0cb5a2d8742f56033263;hb=7103b67707aac1a44b64211b45eca9c5c54bef2d;hpb=78c5e4b032c420852abc2a9e1e6f429a4d803c21

diff --git a/src/odhcpd.h b/src/odhcpd.h
index fb3db37..95dcb00 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -61,13 +61,14 @@ extern struct list_head leases;
 struct odhcpd_event {
 	struct uloop_fd uloop;
 	void (*handle_dgram)(void *addr, void *data, size_t len,
-			struct interface *iface);
+			struct interface *iface, void *dest_addr);
 };
 
 
 struct odhcpd_ipaddr {
 	struct in6_addr addr;
 	uint8_t prefix;
+	uint8_t dprefix;
 	uint32_t preferred;
 	uint32_t valid;
 };
@@ -104,7 +105,6 @@ struct interface {
 	int ifindex;
 	char ifname[IF_NAMESIZE];
 	char name[IF_NAMESIZE];
-	bool inuse;
 
 	// Runtime data
 	struct uloop_timeout timer_rs;
@@ -114,9 +114,15 @@ struct interface {
 	bool ia_reconf;
 
 	// DHCPv4
+	struct odhcpd_event dhcpv6_event;
 	struct odhcpd_event dhcpv4_event;
+	struct odhcpd_event ndp_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,12 +130,13 @@ 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 ra_advrouter;
 	bool no_dynamic_dhcp;
 
 	int learn_routes;
@@ -140,6 +147,8 @@ struct interface {
 	// DHCPv4
 	struct in_addr dhcpv4_start;
 	struct in_addr dhcpv4_end;
+	struct in_addr *dhcpv4_router;
+	size_t dhcpv4_router_cnt;
 	struct in_addr *dhcpv4_dns;
 	size_t dhcpv4_dns_cnt;
 	uint32_t dhcpv4_leasetime;
@@ -150,11 +159,13 @@ struct interface {
 	uint8_t *search;
 	size_t search_len;
 
-	char* static_ndp;
-	size_t static_ndp_len;
+	void *dhcpv6_raw;
+	size_t dhcpv6_raw_len;
 
 	char *upstream;
 	size_t upstream_len;
+
+	char *filter_class;
 };
 
 extern struct list_head interfaces;
@@ -166,12 +177,14 @@ extern struct list_head interfaces;
 // Exported main functions
 int odhcpd_open_rtnl(void);
 int odhcpd_register(struct odhcpd_event *event);
+void odhcpd_process(struct odhcpd_event *event);
 
 ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 		struct iovec *iov, size_t iov_len,
 		const struct interface *iface);
 ssize_t odhcpd_get_interface_addresses(int ifindex,
 		struct odhcpd_ipaddr *addrs, size_t cnt);
+int odhcpd_get_preferred_interface_address(int ifindex, struct in6_addr *addr);
 struct interface* odhcpd_get_interface_by_name(const char *name);
 int odhcpd_get_interface_mtu(const char *ifname);
 int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6]);
@@ -186,11 +199,10 @@ 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);
 
-const char* ubus_get_ifname(const char *name);
-void ubus_apply_network(void);
-bool ubus_has_prefix(const char *name, const char *ifname);
+int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
 
 // Exported module initializers
@@ -198,9 +210,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);