X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=538a7e5213a899e8b44cb9dab46403e738ad4cdc;hp=9949253ff7698cc8aca5e06010ad66e31f055f79;hb=3495f179bd901d6d232e0dbf35444ebe483fdfd9;hpb=16cee36ff3cf1895f87368709dabd3ffd5f24e4f

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 9949253..538a7e5 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))
@@ -54,20 +57,25 @@
 #define ALL_IPV6_ROUTERS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}}}
 
+#define IN6_IS_ADDR_ULA(a) (((a)->s6_addr32[0] & htonl(0xfe000000)) == htonl(0xfc000000))
 
 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);
+			struct interface *iface, void *dest_addr);
+	void (*handle_error)(struct odhcpd_event *e, int error);
+	void (*recv_msgs)(struct odhcpd_event *e);
 };
 
 
 struct odhcpd_ipaddr {
 	struct in6_addr addr;
 	uint8_t prefix;
+	uint8_t dprefix;
 	uint32_t preferred;
 	uint32_t valid;
 };
@@ -80,10 +88,16 @@ enum odhcpd_mode {
 };
 
 
+enum odhcpd_assignment_flags {
+	OAF_BOUND	= (1 << 0),
+	OAF_STATIC	= (1 << 1),
+};
+
 struct config {
 	bool legacy;
 	char *dhcp_cb;
 	char *dhcp_statefile;
+	int log_level;
 } config;
 
 
@@ -94,6 +108,7 @@ struct lease {
 	struct ether_addr mac;
 	uint16_t duid_len;
 	uint8_t *duid;
+	uint32_t dhcpv4_leasetime;
 	char hostname[];
 };
 
@@ -108,14 +123,19 @@ 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
+	char dhcpv6_pd_manager[128];
+	struct in6_addr dhcpv6_pd_cer;
+
 	// Services
 	enum odhcpd_mode ra;
 	enum odhcpd_mode dhcpv6;
@@ -128,18 +148,25 @@ struct interface {
 	bool master;
 	bool ignore;
 	bool always_rewrite_dns;
-	bool deprecate_ula_if_public_avail;
 	bool ra_not_onlink;
+	bool ra_advrouter;
+	bool ra_useleasetime;
 	bool no_dynamic_dhcp;
 
+	// RA
 	int learn_routes;
 	int default_router;
 	int managed;
 	int route_preference;
+	int ra_maxinterval;
+	int ra_mininterval;
+	int ra_lifetime;
 
 	// DHCPv4
 	struct in_addr dhcpv4_start;
 	struct in_addr dhcpv4_end;
+	struct in_addr *dhcpv4_router;
+	size_t dhcpv4_router_cnt;
 	struct in_addr *dhcpv4_dns;
 	size_t dhcpv4_dns_cnt;
 	uint32_t dhcpv4_leasetime;
@@ -150,11 +177,13 @@ struct interface {
 	uint8_t *search;
 	size_t search_len;
 
-	char* static_ndp;
-	size_t static_ndp_len;
+	void *dhcpv6_raw;
+	size_t dhcpv6_raw_len;
 
 	char *upstream;
 	size_t upstream_len;
+
+	char *filter_class;
 };
 
 extern struct list_head interfaces;
@@ -164,28 +193,37 @@ 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_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);
-void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
-		const struct interface *iface, const struct in6_addr *gw, bool add);
+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);
 
 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);
 
+int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits);
+void odhcpd_bmemcpy(void *av, const void *bv, size_t bits);
+
 int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite);
 
 #ifdef WITH_UBUS