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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index d3a5ad6..fb78ec0 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -43,6 +43,9 @@
 
 #define RELAYD_BUFFER_SIZE 8192
 #define RELAYD_MAX_PREFIXES 8
+#define RELAYD_MAX_ADDRS 8
+
+#define INFINITE_VALID(x) ((x) == 0)
 
 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))
@@ -56,12 +59,15 @@
 
 
 struct interface;
+struct nl_sock;
 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, void *dest_addr);
+	void (*handle_error)(struct odhcpd_event *e, int error);
+	void (*recv_msgs)(struct odhcpd_event *e);
 };
 
 
@@ -81,6 +87,11 @@ enum odhcpd_mode {
 };
 
 
+enum odhcpd_assignment_flags {
+	OAF_BOUND	= (1 << 0),
+	OAF_STATIC	= (1 << 1),
+};
+
 struct config {
 	bool legacy;
 	char *dhcp_cb;
@@ -95,6 +106,7 @@ struct lease {
 	struct ether_addr mac;
 	uint16_t duid_len;
 	uint8_t *duid;
+	uint32_t dhcpv4_leasetime;
 	char hostname[];
 };
 
@@ -109,9 +121,8 @@ struct interface {
 	// Runtime data
 	struct uloop_timeout timer_rs;
 	struct list_head ia_assignments;
-	struct odhcpd_ipaddr ia_addr[8];
+	struct odhcpd_ipaddr ia_addr[RELAYD_MAX_ADDRS];
 	size_t ia_addr_len;
-	bool ia_reconf;
 
 	// DHCPv4
 	struct odhcpd_event dhcpv6_event;
@@ -143,10 +154,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;
@@ -177,24 +187,28 @@ extern struct list_head interfaces;
 
 
 // Exported main functions
-int odhcpd_open_rtnl(void);
 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,
 		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]);
 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);
+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);
 
 void odhcpd_run(void);
 time_t odhcpd_time(void);
@@ -211,8 +225,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