X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=src%2Fodhcpd.h;h=48ee51eb4b7a97798cc02b4a309aad50965d6361;hb=750e457e3000187b85906814a2529ede24775325;hp=3d8f2543f796332aeef11c6e2d4a77c09eeb2e64;hpb=028ab85da8ef40af43aeb48129ffa32c98503336;p=project%2Fodhcpd.git

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 3d8f254..48ee51e 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -71,6 +71,46 @@ union if_addr {
 	struct in6_addr in6;
 };
 
+struct netevent_handler_info {
+	struct interface *iface;
+	union {
+		struct {
+			union if_addr dst;
+			uint8_t dst_len;
+			union if_addr gateway;
+		} rt;
+		struct {
+			union if_addr dst;
+			uint16_t state;
+			uint8_t flags;
+		} neigh;
+		struct {
+			struct odhcpd_ipaddr *addrs;
+			size_t len;
+		} addrs_old;
+		union if_addr addr;
+	};
+};
+
+enum netevents {
+	NETEV_IFINDEX_CHANGE,
+	NETEV_ADDR_ADD,
+	NETEV_ADDR_DEL,
+	NETEV_ADDRLIST_CHANGE,
+	NETEV_ADDR6_ADD,
+	NETEV_ADDR6_DEL,
+	NETEV_ADDR6LIST_CHANGE,
+	NETEV_ROUTE6_ADD,
+	NETEV_ROUTE6_DEL,
+	NETEV_NEIGH6_ADD,
+	NETEV_NEIGH6_DEL,
+};
+
+struct netevent_handler {
+	struct list_head head;
+	void (*cb) (unsigned long event, struct netevent_handler_info *info);
+};
+
 struct odhcpd_ipaddr {
 	union if_addr addr;
 	uint8_t prefix;
@@ -126,8 +166,8 @@ struct interface {
 	const char *name;
 
 	// IPv6 runtime data
-	struct odhcpd_ipaddr *ia_addr;
-	size_t ia_addr_len;
+	struct odhcpd_ipaddr *addr6;
+	size_t addr6_len;
 
 	// RA runtime data
 	struct uloop_timeout timer_rs;
@@ -168,6 +208,8 @@ struct interface {
 	bool ra_advrouter;
 	bool ra_useleasetime;
 	bool no_dynamic_dhcp;
+	uint8_t pio_filter_length;
+	struct in6_addr pio_filter_addr;
 
 	// RA
 	int learn_routes;
@@ -226,12 +268,9 @@ int odhcpd_register(struct odhcpd_event *event);
 int odhcpd_deregister(struct odhcpd_event *event);
 void odhcpd_process(struct odhcpd_event *event);
 
-struct nl_sock *odhcpd_create_nl_socket(int protocol);
 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, bool v6,
-		struct odhcpd_ipaddr **addrs);
 int odhcpd_get_interface_dns_addr(const struct interface *iface,
 		struct in6_addr *addr);
 struct interface* odhcpd_get_interface_by_name(const char *name);
@@ -240,19 +279,12 @@ int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6]);
 struct interface* odhcpd_get_interface_by_index(int ifindex);
 struct interface* odhcpd_get_master_interface(void);
 int odhcpd_urandom(void *data, size_t len);
-int odhcpd_setup_route(const struct in6_addr *addr, const int prefixlen,
-		const struct interface *iface, const struct in6_addr *gw,
-		const uint32_t metric, const bool add);
-int odhcpd_setup_proxy_neigh(const struct in6_addr *addr,
-		const struct interface *iface, const bool add);
-int odhcpd_setup_addr(struct odhcpd_ipaddr *addr,
-		const struct interface *iface, const bool v6,
-		const bool add);
 
 void odhcpd_run(void);
 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);
+const char *odhcpd_print_mac(const uint8_t *mac, const size_t len);
 
 int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
 void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
@@ -262,25 +294,40 @@ bool odhcpd_bitlen2netmask(bool v6, unsigned int bits, void *mask);
 
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
-void dhcpv4_addr_update(struct interface *iface);
-
 #ifdef WITH_UBUS
-int init_ubus(void);
+int ubus_init(void);
 const char* ubus_get_ifname(const char *name);
 void ubus_apply_network(void);
 bool ubus_has_prefix(const char *name, const char *ifname);
+void ubus_bcast_dhcp_event(const char *type, const uint8_t *mac, const size_t mac_len,
+		const struct in_addr *addr, const char *name, const char *interface);
 #endif
 
+int netlink_add_netevent_handler(struct netevent_handler *hdlr);
+ssize_t netlink_get_interface_addrs(const int ifindex, bool v6,
+		struct odhcpd_ipaddr **addrs);
+int netlink_setup_route(const struct in6_addr *addr, const int prefixlen,
+		const int ifindex, const struct in6_addr *gw,
+		const uint32_t metric, const bool add);
+int netlink_setup_proxy_neigh(const struct in6_addr *addr,
+		const int ifindex, const bool add);
+int netlink_setup_addr(struct odhcpd_ipaddr *addr,
+		const int ifindex, const bool v6, const bool add);
+void netlink_dump_neigh_table(const bool proxy);
+void netlink_dump_addr_table(const bool v6);
 
 // Exported module initializers
-int init_router(void);
-int init_dhcpv6(void);
-int init_dhcpv4(void);
-int init_ndp(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);
+int netlink_init(void);
+int router_init(void);
+int dhcpv6_init(void);
+int ndp_init(void);
+#ifdef DHCPV4_SUPPORT
+int dhcpv4_init(void);
+
+int dhcpv4_setup_interface(struct interface *iface, bool enable);
+#endif
+int router_setup_interface(struct interface *iface, bool enable);
+int dhcpv6_setup_interface(struct interface *iface, bool enable);
+int ndp_setup_interface(struct interface *iface, bool enable);
 
 void odhcpd_reload(void);