X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=81eae06059481a6b046eca711ab68f8552071fbe;hp=f0a4938788a96ca7163c2c640dba6413990086aa;hb=c5040fea540479b731b040986a9c3a62e34afc37;hpb=1bbf34a1df3e16865b3b9330b338952076bc26f9

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index f0a4938..81eae06 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -18,6 +18,7 @@
 #include <stddef.h>
 #include <resolv.h>
 #include <sys/timerfd.h>
+#include <arpa/inet.h>
 
 #include "odhcpd.h"
 #include "dhcpv6.h"
@@ -51,7 +52,7 @@ int setup_dhcpv6_interface(struct interface *iface, bool enable)
 	}
 
 	// Configure multicast settings
-	if (enable && iface->dhcpv6 && !iface->master) {
+	if (enable && iface->dhcpv6) {
 		int sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
 		if (sock < 0) {
 			syslog(LOG_ERR, "Failed to create DHCPv6 server socket: %s",
@@ -224,19 +225,19 @@ static void handle_client_request(void *addr, void *data, size_t len,
 	} refresh = {htons(DHCPV6_OPT_INFO_REFRESH), htons(sizeof(uint32_t)),
 			htonl(600)};
 
-	struct odhcpd_ipaddr ipaddr;
-	struct in6_addr *dns_addr = iface->dns;
+	struct in6_addr dns_addr, *dns_addr_ptr = iface->dns;
 	size_t dns_cnt = iface->dns_cnt;
 
-	if (dns_cnt == 0 && odhcpd_get_interface_addresses(iface->ifindex, &ipaddr, 1) == 1) {
-		dns_addr = &ipaddr.addr;
+	if ((dns_cnt == 0) &&
+		!odhcpd_get_linklocal_interface_address(iface->ifindex, &dns_addr)) {
+		dns_addr_ptr = &dns_addr;
 		dns_cnt = 1;
 	}
 
 	struct {
 		uint16_t type;
 		uint16_t len;
-	} dns = {htons(DHCPV6_OPT_DNS_SERVERS), htons(dns_cnt * sizeof(*dns_addr))};
+	} dns = {htons(DHCPV6_OPT_DNS_SERVERS), htons(dns_cnt * sizeof(*dns_addr_ptr))};
 
 
 
@@ -274,7 +275,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
 		[IOV_DEST] = {&dest, (uint8_t*)&dest.clientid_type - (uint8_t*)&dest},
 		[IOV_MAXRT] = {&maxrt, sizeof(maxrt)},
 		[IOV_DNS] = {&dns, (dns_cnt) ? sizeof(dns) : 0},
-		[IOV_DNS_ADDR] = {dns_addr, dns_cnt * sizeof(*dns_addr)},
+		[IOV_DNS_ADDR] = {dns_addr_ptr, dns_cnt * sizeof(*dns_addr_ptr)},
 		[IOV_SEARCH] = {&search, (search_len) ? sizeof(search) : 0},
 		[IOV_SEARCH_DOMAIN] = {search_domain, search_len},
 		[IOV_PDBUF] = {pdbuf, 0},
@@ -302,6 +303,9 @@ static void handle_client_request(void *addr, void *data, size_t len,
 	} else if (opts[-4] == DHCPV6_MSG_INFORMATION_REQUEST) {
 		iov[IOV_REFRESH].iov_base = &refresh;
 		iov[IOV_REFRESH].iov_len = sizeof(refresh);
+
+		// Return inf max rt option in reply to information request
+		maxrt.type = htons(DHCPV6_OPT_INF_MAX_RT);
 	}
 
 	// Go through options and find what we need
@@ -330,7 +334,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
 			if (IN6_IS_ADDR_UNSPECIFIED(&cerid.addr)) {
 				struct odhcpd_ipaddr addrs[32];
 				ssize_t len = odhcpd_get_interface_addresses(0, addrs,
-						sizeof(addrs) / sizeof(*addrs));
+						ARRAY_SIZE(addrs));
 
 				for (ssize_t i = 0; i < len; ++i)
 					if (IN6_IS_ADDR_UNSPECIFIED(&cerid.addr)
@@ -452,15 +456,15 @@ static void relay_server_response(uint8_t *data, size_t len)
 		if (is_authenticated)
 			return; // Impossible to rewrite
 
-		struct odhcpd_ipaddr ip;
 		const struct in6_addr *rewrite = iface->dns;
+		struct in6_addr addr;
 		size_t rewrite_cnt = iface->dns_cnt;
 
 		if (rewrite_cnt == 0) {
-			if (odhcpd_get_interface_addresses(iface->ifindex, &ip, 1) < 1)
+			if (odhcpd_get_linklocal_interface_address(iface->ifindex, &addr))
 				return; // Unable to get interface address
 
-			rewrite = &ip.addr;
+			rewrite = &addr;
 			rewrite_cnt = 1;
 		}
 
@@ -529,5 +533,5 @@ static void relay_client_request(struct sockaddr_in6 *source,
 	struct sockaddr_in6 dhcpv6_servers = {AF_INET6,
 			htons(DHCPV6_SERVER_PORT), 0, ALL_DHCPV6_SERVERS, 0};
 	struct iovec iov[2] = {{&hdr, sizeof(hdr)}, {(void*)data, len}};
-	odhcpd_send(iface->dhcpv6_event.uloop.fd, &dhcpv6_servers, iov, 2, master);
+	odhcpd_send(master->dhcpv6_event.uloop.fd, &dhcpv6_servers, iov, 2, master);
 }