X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=0e5868cd06dc6b14cb14e732aa1bbce837f84f33;hp=759fb0401884096fb1a8b5150d0aaf57be23b716;hb=4c89614ccf5d72ee0c0824e5050a8814748a32c3;hpb=fbe87a359cbe58c56ae56d7aac4f8e337e5c1ec6

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 759fb04..0e5868c 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -44,6 +44,8 @@
 #define RELAYD_BUFFER_SIZE 8192
 #define RELAYD_MAX_PREFIXES 8
 
+#define INFINITE_VALID(x) ((x) == 0)
+
 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))
 
@@ -62,6 +64,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);
 };
 
 
@@ -81,6 +84,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 +103,7 @@ struct lease {
 	struct ether_addr mac;
 	uint16_t duid_len;
 	uint8_t *duid;
+	uint32_t dhcpv4_leasetime;
 	char hostname[];
 };
 
@@ -146,8 +155,6 @@ struct interface {
 	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;
@@ -187,7 +194,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]);
@@ -213,8 +220,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