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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 0e5868c..8a196ea 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -16,11 +16,10 @@
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <netinet/ether.h>
-#include <net/if.h>
 #include <stdbool.h>
 #include <syslog.h>
 
-#include "libubox/blobmsg.h"
+#include <libubox/blobmsg.h>
 
 #ifndef typeof
 #define typeof __typeof
@@ -31,8 +30,8 @@
     (type *)( (char *)ptr - offsetof(type,member) ))
 #endif
 
-#include "libubox/list.h"
-#include "libubox/uloop.h"
+#include <libubox/list.h>
+#include <libubox/uloop.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
@@ -42,7 +41,6 @@
 #define ND_OPT_DNS_SEARCH 31
 
 #define RELAYD_BUFFER_SIZE 8192
-#define RELAYD_MAX_PREFIXES 8
 
 #define INFINITE_VALID(x) ((x) == 0)
 
@@ -56,15 +54,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)(int error);
+	void (*handle_error)(struct odhcpd_event *e, int error);
+	void (*recv_msgs)(struct odhcpd_event *e);
 };
 
 
@@ -91,8 +92,10 @@ enum odhcpd_assignment_flags {
 
 struct config {
 	bool legacy;
+	bool main_dhcpv4;
 	char *dhcp_cb;
 	char *dhcp_statefile;
+	int log_level;
 } config;
 
 
@@ -112,15 +115,14 @@ struct interface {
 	struct list_head head;
 
 	int ifindex;
-	char ifname[IF_NAMESIZE];
-	char name[IF_NAMESIZE];
+	char *ifname;
+	const char *name;
 
 	// Runtime data
 	struct uloop_timeout timer_rs;
 	struct list_head ia_assignments;
-	struct odhcpd_ipaddr ia_addr[8];
+	struct odhcpd_ipaddr *ia_addr;
 	size_t ia_addr_len;
-	bool ia_reconf;
 
 	// DHCPv4
 	struct odhcpd_event dhcpv6_event;
@@ -146,13 +148,21 @@ 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;
+	uint32_t ra_reachabletime;
+	uint32_t ra_retranstime;
+	uint32_t ra_hoplimit;
+	int ra_mtu;
 
 	// DHCPv4
 	struct in_addr dhcpv4_start;
@@ -185,25 +195,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_linklocal_interface_address(int ifindex, struct in6_addr *lladdr);
+		struct odhcpd_ipaddr **addrs);
+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_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,
+int odhcpd_setup_route(const struct in6_addr *addr, const int prefixlen,
 		const struct interface *iface, const struct in6_addr *gw,
-		int metric, bool add);
+		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);
@@ -215,6 +229,9 @@ 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);