X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=30c9fb2678f16ecd384b697a5c0635b919c7c2e3;hp=b7fccaca62e78e9a048b8da5151677523ef69dcd;hb=d6fe99f6d03873e7a670c9b6f26fa03b219422f5;hpb=3e52a1448eee0fbf7ff67c123265bedcbc9c26d0

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index b7fccac..30c9fb2 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -551,10 +551,12 @@ int dhcpv6_request(enum dhcpv6_msg type)
 				round_start = odhcp6c_get_milli_time()) {
 			uint8_t buf[1536], cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
 			struct iovec iov = {buf, sizeof(buf)};
-			struct msghdr msg = {NULL, 0, &iov, 1,
+			struct sockaddr_in6 addr;
+			struct msghdr msg = {&addr, sizeof(addr), &iov, 1,
 					cmsg_buf, sizeof(cmsg_buf), 0};
 			struct in6_pktinfo *pktinfo = NULL;
 
+
 			// Check for pending signal
 			if (odhcp6c_signal_process())
 				return -1;
@@ -599,7 +601,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 					"%llums", (unsigned long long)elapsed);
 
 			if (retx->handler_reply)
-				len = retx->handler_reply(type, rc, opt, opt_end);
+				len = retx->handler_reply(type, rc, opt, opt_end, &addr);
 
 			if (len > 0 && round_end - round_start > 1000)
 				round_end = 1000 + round_start;
@@ -729,7 +731,7 @@ int dhcpv6_poll_reconfigure(void)
 
 
 static int dhcpv6_handle_reconfigure(_unused enum dhcpv6_msg orig, const int rc,
-		const void *opt, const void *end)
+		const void *opt, const void *end, _unused const struct sockaddr_in6 *from)
 {
 	uint16_t otype, olen;
 	uint8_t *odata, msg = DHCPV6_MSG_RENEW;
@@ -739,14 +741,14 @@ static int dhcpv6_handle_reconfigure(_unused enum dhcpv6_msg orig, const int rc,
 				odata[0] == DHCPV6_MSG_INFO_REQ))
 			msg = odata[0];
 
-	dhcpv6_handle_reply(DHCPV6_MSG_UNKNOWN, rc, NULL, NULL);
+	dhcpv6_handle_reply(DHCPV6_MSG_UNKNOWN, rc, NULL, NULL, NULL);
 	return msg;
 }
 
 
 // Collect all advertised servers
 static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
-		const void *opt, const void *end)
+		const void *opt, const void *end, _unused const struct sockaddr_in6 *from)
 {
 	uint16_t olen, otype;
 	uint8_t *odata, pref = 0;
@@ -854,18 +856,18 @@ static int dhcpv6_commit_advert(void)
 
 
 static int dhcpv6_handle_rebind_reply(enum dhcpv6_msg orig, const int rc,
-		const void *opt, const void *end)
+		const void *opt, const void *end, const struct sockaddr_in6 *from)
 {
-	dhcpv6_handle_advert(orig, rc, opt, end);
+	dhcpv6_handle_advert(orig, rc, opt, end, from);
 	if (dhcpv6_commit_advert() < 0)
 		return -1;
 
-	return dhcpv6_handle_reply(orig, rc, opt, end);
+	return dhcpv6_handle_reply(orig, rc, opt, end, from);
 }
 
 
 static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
-		const void *opt, const void *end)
+		const void *opt, const void *end, const struct sockaddr_in6 *from)
 {
 	uint8_t *odata;
 	uint16_t otype, olen;
@@ -1090,6 +1092,11 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 			default :
 				break;
 			}
+
+			if (orig == DHCPV6_MSG_REBIND || orig == DHCPV6_MSG_REQUEST) {
+				odhcp6c_clear_state(STATE_SERVER_ADDR);
+				odhcp6c_add_state(STATE_SERVER_ADDR, &from->sin6_addr, 16);
+			}
 		}
 	}
 	else if (ret > 0) {