X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.h;h=a240aa163b9ea18a0541d52af6f0a37f5e482a07;hp=fb78ec0eee7812ac1fbe557c3e0797c853e19da2;hb=f66103ef4e100b4c3d375553cb916cb924cc40e5;hpb=fa57225cb62b43adffc37a50c3dbd3fa7d225b0b

diff --git a/src/odhcpd.h b/src/odhcpd.h
index fb78ec0..a240aa1 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]))
 
@@ -41,10 +40,6 @@
 #define ND_OPT_RECURSIVE_DNS 25
 #define ND_OPT_DNS_SEARCH 31
 
-#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))
@@ -57,6 +52,7 @@
 #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;
@@ -70,20 +66,29 @@ struct odhcpd_event {
 	void (*recv_msgs)(struct odhcpd_event *e);
 };
 
+union if_addr {
+	struct in_addr in;
+	struct in6_addr in6;
+};
 
 struct odhcpd_ipaddr {
-	struct in6_addr addr;
+	union if_addr addr;
 	uint8_t prefix;
-	uint8_t dprefix;
 	uint32_t preferred;
 	uint32_t valid;
+
+	/* ipv6 only */
+	uint8_t dprefix;
+
+	/* ipv4 only */
+	struct in_addr broadcast;
 };
 
 enum odhcpd_mode {
-	RELAYD_DISABLED,
-	RELAYD_SERVER,
-	RELAYD_RELAY,
-	RELAYD_HYBRID
+	MODE_DISABLED,
+	MODE_SERVER,
+	MODE_RELAY,
+	MODE_HYBRID
 };
 
 
@@ -94,8 +99,10 @@ enum odhcpd_assignment_flags {
 
 struct config {
 	bool legacy;
+	bool main_dhcpv4;
 	char *dhcp_cb;
 	char *dhcp_statefile;
+	int log_level;
 } config;
 
 
@@ -115,13 +122,15 @@ 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[RELAYD_MAX_ADDRS];
+	struct odhcpd_ipaddr *addr4;
+	size_t addr4_len;
+	struct odhcpd_ipaddr *ia_addr;
 	size_t ia_addr_len;
 
 	// DHCPv4
@@ -148,13 +157,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 ra_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;
@@ -171,8 +188,10 @@ struct interface {
 	uint8_t *search;
 	size_t search_len;
 
+	// DHCPV6
 	void *dhcpv6_raw;
 	size_t dhcpv6_raw_len;
+	bool dhcpv6_assignall;
 
 	char *upstream;
 	size_t upstream_len;
@@ -182,8 +201,9 @@ struct interface {
 
 extern struct list_head interfaces;
 
-#define RELAYD_MANAGED_MFLAG	1
-#define RELAYD_MANAGED_NO_AFLAG	2
+#define RA_MANAGED_NO_MFLAG	0
+#define RA_MANAGED_MFLAG	1
+#define RA_MANAGED_NO_AFLAG	2
 
 
 // Exported main functions
@@ -195,9 +215,10 @@ 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);
+ssize_t odhcpd_get_interface_addresses(int ifindex, bool v6,
+		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]);