X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=cbeaaf82644f36c8ce6f51afa0a54d76d79514ac;hp=2cadccb253a6e7fb7bad0c91bdc0d2d5dd577512;hb=c5040fea540479b731b040986a9c3a62e34afc37;hpb=f13c624c16a8e3fd30bb47f9ed614c7e2bd6d75e

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 2cadccb..cbeaaf8 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))
@@ -62,6 +65,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);
 };
 
 
@@ -69,8 +73,6 @@ struct odhcpd_ipaddr {
 	struct in6_addr addr;
 	uint8_t prefix;
 	uint8_t dprefix;
-	bool has_class;
-	uint16_t class;
 	uint32_t preferred;
 	uint32_t valid;
 };
@@ -83,6 +85,11 @@ enum odhcpd_mode {
 };
 
 
+enum odhcpd_assignment_flags {
+	OAF_BOUND	= (1 << 0),
+	OAF_STATIC	= (1 << 1),
+};
+
 struct config {
 	bool legacy;
 	char *dhcp_cb;
@@ -97,6 +104,7 @@ struct lease {
 	struct ether_addr mac;
 	uint16_t duid_len;
 	uint8_t *duid;
+	uint32_t dhcpv4_leasetime;
 	char hostname[];
 };
 
@@ -111,13 +119,14 @@ 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;
 	struct odhcpd_event dhcpv4_event;
+	struct odhcpd_event ndp_event;
 	struct list_head dhcpv4_assignments;
 
 	// Managed PD
@@ -144,6 +153,7 @@ struct interface {
 	int default_router;
 	int managed;
 	int route_preference;
+	int ra_maxinterval;
 
 	// DHCPv4
 	struct in_addr dhcpv4_start;
@@ -163,9 +173,6 @@ struct interface {
 	void *dhcpv6_raw;
 	size_t dhcpv6_raw_len;
 
-	char* static_ndp;
-	size_t static_ndp_len;
-
 	char *upstream;
 	size_t upstream_len;
 
@@ -181,20 +188,23 @@ 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_linklocal_interface_address(int ifindex, struct in6_addr *lladdr);
 struct interface* odhcpd_get_interface_by_name(const char *name);
-int odhcpd_get_interface_mtu(const char *ifname);
+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);
-void odhcpd_urandom(void *data, size_t len);
+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,7 +221,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);
-bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass);
 #endif