X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fdhcpv6.c;h=6ae6f7a02fd8d9040fc8b676cd81a73d361d21c6;hp=ca41db6b48e88dd90d05b73eb270f4d585fc5c55;hb=e20ee553da0b17d2e2569650327fff568a4a222d;hpb=2015de99e2495e886a0e5c748a654d7d5b112cf9

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index ca41db6..6ae6f7a 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -328,6 +328,11 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
 					.addr = e[j].target
 				};
 
+				if (type == DHCPV6_MSG_REQUEST) {
+					p.preferred = htonl(e[j].preferred);
+					p.valid = htonl(e[j].valid);
+				}
+
 				memcpy(ia_pd + ia_pd_len, &p, sizeof(p));
 				ia_pd_len += sizeof(p);
 
@@ -372,8 +377,14 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
 		pa[i].type = htons(DHCPV6_OPT_IA_ADDR);
 		pa[i].len = htons(sizeof(pa[i]) - 4U);
 		pa[i].addr = e[i].target;
-		pa[i].preferred = 0;
-		pa[i].valid = 0;
+
+		if (type == DHCPV6_MSG_REQUEST) {
+			pa[i].preferred = htonl(e[i].preferred);
+			pa[i].valid = htonl(e[i].valid);
+		} else {
+			pa[i].preferred = 0;
+			pa[i].valid = 0;
+		}
 	}
 
 	ia_na = pa;
@@ -464,7 +475,8 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
 
 	struct sockaddr_in6 srv = {AF_INET6, htons(DHCPV6_SERVER_PORT),
 		0, ALL_DHCPV6_RELAYS, ifindex};
-	struct msghdr msg = {&srv, sizeof(srv), iov, cnt, NULL, 0, 0};
+	struct msghdr msg = {.msg_name = &srv, .msg_namelen = sizeof(srv),
+			.msg_iov = iov, .msg_iovlen = cnt};
 
 	sendmsg(sock, &msg, 0);
 }
@@ -486,8 +498,8 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
 	if (retx->delay) {
 		struct timespec ts = {0, 0};
-		ts.tv_nsec = dhcpv6_rand_delay(10 * DHCPV6_REQ_DELAY);
-		nanosleep(&ts, NULL);
+		ts.tv_nsec = (dhcpv6_rand_delay((10000 * DHCPV6_REQ_DELAY) / 2) + (1000 * DHCPV6_REQ_DELAY) / 2) * 1000000;
+		while (nanosleep(&ts, &ts) < 0 && errno == EINTR);
 	}
 
 	if (type == DHCPV6_MSG_UNKNOWN)
@@ -552,8 +564,9 @@ int dhcpv6_request(enum dhcpv6_msg type)
 			uint8_t buf[1536], cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
 			struct iovec iov = {buf, sizeof(buf)};
 			struct sockaddr_in6 addr;
-			struct msghdr msg = {&addr, sizeof(addr), &iov, 1,
-					cmsg_buf, sizeof(cmsg_buf), 0};
+			struct msghdr msg = {.msg_name = &addr, .msg_namelen = sizeof(addr),
+					.msg_iov = &iov, .msg_iovlen = 1, .msg_control = cmsg_buf,
+					.msg_controllen = sizeof(cmsg_buf)};
 			struct in6_pktinfo *pktinfo = NULL;
 
 
@@ -872,7 +885,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 {
 	uint8_t *odata;
 	uint16_t otype, olen;
-	uint32_t refresh = UINT32_MAX;
+	uint32_t refresh = 86400;
 	int ret = 1;
 	bool handled_status_codes[_DHCPV6_Status_Max] = { false, };
 
@@ -934,6 +947,10 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 				&& olen > -4 + sizeof(struct dhcpv6_ia_hdr)) {
 			struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
 
+			if ((na_mode == IA_MODE_NONE && otype == DHCPV6_OPT_IA_NA) ||
+			    (pd_mode == IA_MODE_NONE && otype == DHCPV6_OPT_IA_PD))
+				continue;
+
 			// Test ID
 			if (ia_hdr->iaid != htonl(1) && otype == DHCPV6_OPT_IA_NA)
 				continue;
@@ -1200,7 +1217,7 @@ static int dhcpv6_parse_ia(void *opt, void *end)
 			}
 
 			if (ok) {
-				odhcp6c_update_entry(STATE_IA_PD, &entry);
+				odhcp6c_update_entry(STATE_IA_PD, &entry, 0, false);
 				parsed_ia++;
 			}
 
@@ -1235,7 +1252,7 @@ static int dhcpv6_parse_ia(void *opt, void *end)
 					entry.class = sdata[0] << 8 | sdata[1];
 #endif
 
-			odhcp6c_update_entry(STATE_IA_NA, &entry);
+			odhcp6c_update_entry(STATE_IA_NA, &entry, 0, false);
 			parsed_ia++;
 		}
 	}
@@ -1354,23 +1371,8 @@ static void dhcpv6_handle_ia_status_code(const enum dhcpv6_msg orig,
 		}
 		break;
 
-	case DHCPV6_NoAddrsAvail:
-	case DHCPV6_NoPrefixAvail:
-		switch (orig) {
-		case DHCPV6_MSG_REQUEST:
-			if (*ret != 0)
-				*ret = 0;
-			break;
-		default:
-			break;
-		}
-		break;
-
-	case DHCPV6_NotOnLink:
-		// TODO handle not onlink in case of confirm
-		break;
-
 	default:
+		*ret = 0;
 		break;
 	}
 }