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

diff --git a/src/odhcpd.h b/src/odhcpd.h
index a50fd76..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,8 +41,6 @@
 #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)
 
@@ -118,13 +115,13 @@ 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 *ia_addr;
 	size_t ia_addr_len;
 
 	// DHCPv4
@@ -163,8 +160,9 @@ struct interface {
 	int ra_mininterval;
 	int ra_lifetime;
 	uint32_t ra_reachabletime;
+	uint32_t ra_retranstime;
 	uint32_t ra_hoplimit;
-	uint32_t ra_mtu;
+	int ra_mtu;
 
 	// DHCPv4
 	struct in_addr dhcpv4_start;
@@ -206,7 +204,7 @@ 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);
+		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);