X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=4ddadbee635ae1c7d21c6dfed424b5f5690f05a7;hp=91c4f94def9b12c445a3a1e85dbb4af813b93072;hb=9268ca65d6e000b6cd4ed72d4a8fa427dada6f06;hpb=cf90f5ab2d5b4b6cece7d0096df12eb29e7d1568

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 91c4f94..4ddadbe 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,14 +57,18 @@
 #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, void *dest_addr);
+	void (*handle_error)(struct odhcpd_event *e, int error);
+	void (*recv_msgs)(struct odhcpd_event *e);
 };
 
 
@@ -69,8 +76,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,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;
 
 
@@ -97,6 +108,7 @@ struct lease {
 	struct ether_addr mac;
 	uint16_t duid_len;
 	uint8_t *duid;
+	uint32_t dhcpv4_leasetime;
 	char hostname[];
 };
 
@@ -111,9 +123,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;
@@ -139,12 +150,17 @@ struct interface {
 	bool always_rewrite_dns;
 	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;
@@ -177,22 +193,29 @@ 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_interface_dns_addr(const struct interface *iface,
+		struct in6_addr *addr);
 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);
@@ -204,12 +227,14 @@ 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);
 
+void ndp_handle_addr6_dump(void);
+void ndp_rqs_addr6_dump(void);
+
 #ifdef WITH_UBUS
 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