X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=7302d5d989018dd0908a33e17209461cdcc1129d;hp=aaefa5e4126764f30cf0636a7c94bcfad08c4688;hb=ee243b09f3c81f824cc463c1c757e905f882350e;hpb=fc7fb637811089b4f26fb00ca81a0d05c09076bd

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index aaefa5e..7302d5d 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -28,9 +28,9 @@ static void relay_client_request(struct sockaddr_in6 *source,
 static void relay_server_response(uint8_t *data, size_t len);
 
 static void handle_dhcpv6(void *addr, void *data, size_t len,
-		struct interface *iface);
+		struct interface *iface, void *dest);
 static void handle_client_request(void *addr, void *data, size_t len,
-		struct interface *iface);
+		struct interface *iface, void *dest_addr);
 
 
 
@@ -97,21 +97,37 @@ int setup_dhcpv6_interface(struct interface *iface, bool enable)
 	return setup_dhcpv6_ia_interface(iface, enable);
 }
 
+enum {
+	IOV_NESTED = 0,
+	IOV_DEST,
+	IOV_MAXRT,
+#define IOV_STAT IOV_MAXRT
+	IOV_DNS,
+	IOV_DNS_ADDR,
+	IOV_SEARCH,
+	IOV_SEARCH_DOMAIN,
+	IOV_PDBUF,
+#define	IOV_REFRESH IOV_PDBUF
+	IOV_CERID,
+	IOV_DHCPV6_RAW,
+	IOV_RELAY_MSG,
+	IOV_TOTAL
+};
 
 static void handle_nested_message(uint8_t *data, size_t len,
-		uint8_t **opts, uint8_t **end, struct iovec iov[9])
+		uint8_t **opts, uint8_t **end, struct iovec iov[IOV_TOTAL - 1])
 {
 	struct dhcpv6_relay_header *hdr = (struct dhcpv6_relay_header*)data;
-	if (iov[0].iov_base == NULL) {
-		iov[0].iov_base = data;
-		iov[0].iov_len = len;
+	if (iov[IOV_NESTED].iov_base == NULL) {
+		iov[IOV_NESTED].iov_base = data;
+		iov[IOV_NESTED].iov_len = len;
 	}
 
 	if (len < sizeof(struct dhcpv6_client_header))
 		return;
 
 	if (hdr->msg_type != DHCPV6_MSG_RELAY_FORW) {
-		iov[0].iov_len = data - (uint8_t*)iov[0].iov_base;
+		iov[IOV_NESTED].iov_len = data - (uint8_t*)iov[IOV_NESTED].iov_base;
 		struct dhcpv6_client_header *hdr = (void*)data;
 		*opts = (uint8_t*)&hdr[1];
 		*end = data + len;
@@ -122,9 +138,9 @@ static void handle_nested_message(uint8_t *data, size_t len,
 	uint8_t *odata;
 	dhcpv6_for_each_option(hdr->options, data + len, otype, olen, odata) {
 		if (otype == DHCPV6_OPT_RELAY_MSG) {
-			iov[9].iov_base = odata + olen;
-			iov[9].iov_len = (((uint8_t*)iov[0].iov_base) + iov[0].iov_len)
-					- (odata + olen);
+			iov[IOV_RELAY_MSG].iov_base = odata + olen;
+			iov[IOV_RELAY_MSG].iov_len = (((uint8_t*)iov[IOV_NESTED].iov_base) + 
+					iov[IOV_NESTED].iov_len) - (odata + olen);
 			handle_nested_message(odata, olen, opts, end, iov);
 			return;
 		}
@@ -153,12 +169,12 @@ static void update_nested_message(uint8_t *data, size_t len, ssize_t pdiff)
 	}
 }
 
-
 // Simple DHCPv6-server for information requests
 static void handle_client_request(void *addr, void *data, size_t len,
-		struct interface *iface)
+		struct interface *iface, void *dest_addr)
 {
 	struct dhcpv6_client_header *hdr = data;
+
 	if (len < sizeof(*hdr))
 		return;
 
@@ -173,9 +189,6 @@ static void handle_client_request(void *addr, void *data, size_t len,
 		uint16_t duid_type;
 		uint16_t hardware_type;
 		uint8_t mac[6];
-		uint16_t solmaxrt_type;
-		uint16_t solmaxrt_length;
-		uint32_t solmaxrt_value;
 		uint16_t clientid_type;
 		uint16_t clientid_length;
 		uint8_t clientid_buf[130];
@@ -185,9 +198,6 @@ static void handle_client_request(void *addr, void *data, size_t len,
 		.serverid_length = htons(10),
 		.duid_type = htons(3),
 		.hardware_type = htons(1),
-		.solmaxrt_type = htons(DHCPV6_OPT_SOL_MAX_RT),
-		.solmaxrt_length = htons(4),
-		.solmaxrt_value = htonl(60),
 		.clientid_type = htons(DHCPV6_OPT_CLIENTID),
 		.clientid_buf = {0}
 	};
@@ -196,9 +206,16 @@ static void handle_client_request(void *addr, void *data, size_t len,
 	struct __attribute__((packed)) {
 		uint16_t type;
 		uint16_t len;
+		uint32_t value;
+	} maxrt = {htons(DHCPV6_OPT_SOL_MAX_RT), htons(sizeof(maxrt) - 4),
+			htonl(60)};
+
+	struct __attribute__((packed)) {
+		uint16_t type;
+		uint16_t len;
 		uint16_t value;
 	} stat = {htons(DHCPV6_OPT_STATUS), htons(sizeof(stat) - 4),
-			htons(DHCPV6_STATUS_NOADDRSAVAIL)};
+			htons(DHCPV6_STATUS_USEMULTICAST)};
 
 	struct __attribute__((packed)) {
 		uint16_t type;
@@ -207,19 +224,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_preferred_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))};
 
 
 
@@ -252,16 +269,19 @@ static void handle_client_request(void *addr, void *data, size_t len,
 
 
 	uint8_t pdbuf[512];
-	struct iovec iov[] = {{NULL, 0},
-			{&dest, (uint8_t*)&dest.clientid_type - (uint8_t*)&dest},
-			{&dns, (dns_cnt) ? sizeof(dns) : 0},
-			{dns_addr, dns_cnt * sizeof(*dns_addr)},
-			{&search, (search_len) ? sizeof(search) : 0},
-			{search_domain, search_len},
-			{pdbuf, 0},
-			{&cerid, 0},
-			{iface->dhcpv6_raw, iface->dhcpv6_raw_len},
-			{NULL, 0}};
+	struct iovec iov[IOV_TOTAL] = {
+		[IOV_NESTED] = {NULL, 0},
+		[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_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},
+		[IOV_CERID] = {&cerid, 0},
+		[IOV_DHCPV6_RAW] = {iface->dhcpv6_raw, iface->dhcpv6_raw_len},
+		[IOV_RELAY_MSG] = {NULL, 0}
+	};
 
 	uint8_t *opts = (uint8_t*)&hdr[1], *opts_end = (uint8_t*)data + len;
 	if (hdr->msg_type == DHCPV6_MSG_RELAY_FORW)
@@ -272,11 +292,19 @@ static void handle_client_request(void *addr, void *data, size_t len,
 	if (opts[-4] == DHCPV6_MSG_ADVERTISE || opts[-4] == DHCPV6_MSG_REPLY || opts[-4] == DHCPV6_MSG_RELAY_REPL)
 		return;
 
+	if (!IN6_IS_ADDR_MULTICAST((struct in6_addr *)dest_addr) && iov[IOV_NESTED].iov_len == 0 &&
+		(opts[-4] == DHCPV6_MSG_SOLICIT || opts[-4] == DHCPV6_MSG_CONFIRM ||
+		 opts[-4] == DHCPV6_MSG_REBIND || opts[-4] == DHCPV6_MSG_INFORMATION_REQUEST))
+		return;
+
 	if (opts[-4] == DHCPV6_MSG_SOLICIT) {
 		dest.msg_type = DHCPV6_MSG_ADVERTISE;
 	} else if (opts[-4] == DHCPV6_MSG_INFORMATION_REQUEST) {
-		iov[6].iov_base = &refresh;
-		iov[6].iov_len = sizeof(refresh);
+		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
@@ -286,7 +314,7 @@ static void handle_client_request(void *addr, void *data, size_t len,
 		if (otype == DHCPV6_OPT_CLIENTID && olen <= 130) {
 			dest.clientid_length = htons(olen);
 			memcpy(dest.clientid_buf, odata, olen);
-			iov[1].iov_len += 4 + olen;
+			iov[IOV_DEST].iov_len += 4 + olen;
 		} else if (otype == DHCPV6_OPT_SERVERID) {
 			if (olen != ntohs(dest.serverid_length) ||
 					memcmp(odata, &dest.duid_type, olen))
@@ -300,12 +328,12 @@ static void handle_client_request(void *addr, void *data, size_t len,
 			}
 		} else if (otype == DHCPV6_OPT_IA_PD) {
 #ifdef EXT_CER_ID
-			iov[7].iov_len = sizeof(cerid);
+			iov[IOV_CERID].iov_len = sizeof(cerid);
 
 			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)
@@ -316,17 +344,32 @@ static void handle_client_request(void *addr, void *data, size_t len,
 		}
 	}
 
+	if (!IN6_IS_ADDR_MULTICAST((struct in6_addr *)dest_addr) && iov[IOV_NESTED].iov_len == 0 &&
+		(opts[-4] == DHCPV6_MSG_REQUEST || opts[-4] == DHCPV6_MSG_RENEW ||
+		 opts[-4] == DHCPV6_MSG_RELEASE || opts[-4] == DHCPV6_MSG_DECLINE)) {
+		iov[IOV_STAT].iov_base = &stat;
+		iov[IOV_STAT].iov_len = sizeof(stat);
+
+		for (ssize_t i = IOV_STAT + 1; i < IOV_TOTAL; ++i)
+			iov[i].iov_len = 0;
+
+		odhcpd_send(iface->dhcpv6_event.uloop.fd, addr, iov, ARRAY_SIZE(iov), iface);
+		return;
+	}
+
 	if (opts[-4] != DHCPV6_MSG_INFORMATION_REQUEST) {
 		ssize_t ialen = dhcpv6_handle_ia(pdbuf, sizeof(pdbuf), iface, addr, &opts[-4], opts_end);
-		iov[6].iov_len = ialen;
+		iov[IOV_PDBUF].iov_len = ialen;
 		if (ialen < 0 || (ialen == 0 && (opts[-4] == DHCPV6_MSG_REBIND || opts[-4] == DHCPV6_MSG_CONFIRM)))
 			return;
 	}
 
-	if (iov[0].iov_len > 0) // Update length
-		update_nested_message(data, len, iov[1].iov_len + iov[2].iov_len +
-				iov[3].iov_len + iov[4].iov_len + iov[5].iov_len +
-				iov[6].iov_len + iov[7].iov_len - (4 + opts_end - opts));
+	if (iov[IOV_NESTED].iov_len > 0) // Update length
+		update_nested_message(data, len, iov[IOV_DEST].iov_len + iov[IOV_MAXRT].iov_len +
+				iov[IOV_DNS].iov_len + iov[IOV_DNS_ADDR].iov_len +
+				iov[IOV_SEARCH].iov_len + iov[IOV_SEARCH_DOMAIN].iov_len +
+				iov[IOV_PDBUF].iov_len + iov[IOV_CERID].iov_len +
+				iov[IOV_DHCPV6_RAW].iov_len - (4 + opts_end - opts));
 
 	odhcpd_send(iface->dhcpv6_event.uloop.fd, addr, iov, ARRAY_SIZE(iov), iface);
 }
@@ -334,10 +377,10 @@ static void handle_client_request(void *addr, void *data, size_t len,
 
 // Central DHCPv6-relay handler
 static void handle_dhcpv6(void *addr, void *data, size_t len,
-		struct interface *iface)
+		struct interface *iface, void *dest_addr)
 {
 	if (iface->dhcpv6 == RELAYD_SERVER) {
-		handle_client_request(addr, data, len, iface);
+		handle_client_request(addr, data, len, iface, dest_addr);
 	} else if (iface->dhcpv6 == RELAYD_RELAY) {
 		if (iface->master)
 			relay_server_response(data, len);
@@ -412,15 +455,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_preferred_interface_address(iface->ifindex, &addr) < 1)
 				return; // Unable to get interface address
 
-			rewrite = &ip.addr;
+			rewrite = &addr;
 			rewrite_cnt = 1;
 		}