X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=fd43dfe3ba206762beaa7e48a7dd3e279cf578da;hp=d3a5ad65577931be3028a0eabfece10be448cf56;hb=e60710d1fe0c5bf19b9acf9b116e0645e8e114d1;hpb=ebbff3872a1f242ef5b0a7c029895848876a54b2

diff --git a/src/odhcpd.h b/src/odhcpd.h
index d3a5ad6..fd43dfe 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -62,6 +62,7 @@ struct odhcpd_event {
 	struct uloop_fd uloop;
 	void (*handle_dgram)(void *addr, void *data, size_t len,
 			struct interface *iface, void *dest_addr);
+	void (*handle_error)(int error);
 };
 
 
@@ -143,10 +144,9 @@ struct interface {
 	int default_router;
 	int managed;
 	int route_preference;
+	int ra_maxinterval;
 
 	// DHCPv4
-	struct in_addr dhcpv4_addr;
-	struct in_addr dhcpv4_mask;
 	struct in_addr dhcpv4_start;
 	struct in_addr dhcpv4_end;
 	struct in_addr *dhcpv4_router;
@@ -186,7 +186,7 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 		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);
+int odhcpd_get_linklocal_interface_address(int ifindex, struct in6_addr *lladdr);
 struct interface* odhcpd_get_interface_by_name(const char *name);
 int odhcpd_get_interface_config(const char *ifname, const char *what);
 int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6]);
@@ -194,7 +194,8 @@ struct interface* odhcpd_get_interface_by_index(int ifindex);
 struct interface* odhcpd_get_master_interface(void);
 int odhcpd_urandom(void *data, size_t len);
 void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
-		const struct interface *iface, const struct in6_addr *gw, bool add);
+		const struct interface *iface, const struct in6_addr *gw,
+		int metric, bool add);
 
 void odhcpd_run(void);
 time_t odhcpd_time(void);
@@ -211,8 +212,6 @@ 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);
-const char* ubus_get_address4(const char *name);
-int ubus_get_mask4(const char *name);
 #endif