htons(DHCPV6_OPT_INF_MAX_RT),
#ifdef EXT_PREFIX_CLASS
htons(DHCPV6_OPT_PREFIX_CLASS),
+#endif
+#ifdef EXT_CER_ID
+ htons(DHCPV6_OPT_CER_ID),
+#endif
+#ifdef EXT_S46
+ htons(DHCPV6_OPT_S46_CONT_MAPE),
+ htons(DHCPV6_OPT_S46_CONT_MAPT),
+ htons(DHCPV6_OPT_S46_CONT_LW),
#endif
};
odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val));
- val = 0;
- setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &val, sizeof(val));
setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname));
struct sockaddr_in6 client_addr = { .sin6_family = AF_INET6,
return 0;
}
+enum {
+ IOV_HDR=0,
+ IOV_ORO,
+ IOV_ORO_REFRESH,
+ IOV_CL_ID,
+ IOV_SRV_ID,
+ IOV_VENDOR_CLASS_HDR,
+ IOV_VENDOR_CLASS,
+ IOV_USER_CLASS_HDR,
+ IOV_USER_CLASS,
+ IOV_RECONF_ACCEPT,
+ IOV_FQDN,
+ IOV_HDR_IA_NA,
+ IOV_IA_NA,
+ IOV_IA_PD,
+ IOV_TOTAL
+};
void dhcpv6_set_ia_mode(enum odhcp6c_ia_mode na, enum odhcp6c_ia_mode pd)
{
void *srv_id = odhcp6c_get_state(STATE_SERVER_ID, &srv_id_len);
// Build IA_PDs
- size_t ia_pd_entries, ia_pd_len = 0;
+ size_t ia_pd_entries = 0, ia_pd_len = 0;
uint8_t *ia_pd;
if (type == DHCPV6_MSG_SOLICIT) {
uint16_t oro_refresh = htons(DHCPV6_OPT_INFO_REFRESH);
// Build vendor-class option
- size_t vendor_class_len;
+ size_t vendor_class_len, user_class_len;
struct dhcpv6_vendorclass *vendor_class = odhcp6c_get_state(STATE_VENDORCLASS, &vendor_class_len);
+ void *user_class = odhcp6c_get_state(STATE_USERCLASS, &user_class_len);
struct {
uint16_t type;
uint16_t length;
} vendor_class_hdr = {htons(DHCPV6_OPT_VENDOR_CLASS), htons(vendor_class_len)};
+ struct {
+ uint16_t type;
+ uint16_t length;
+ } user_class_hdr = {htons(DHCPV6_OPT_USER_CLASS), htons(user_class_len)};
+
// Prepare Header
size_t oro_len;
void *oro = odhcp6c_get_state(STATE_ORO, &oro_len);
htons(DHCPV6_OPT_ORO), htons(oro_len),
};
- struct iovec iov[] = {
- {&hdr, sizeof(hdr)},
- {oro, oro_len},
- {&oro_refresh, 0},
- {cl_id, cl_id_len},
- {srv_id, srv_id_len},
- {&vendor_class_hdr, vendor_class_len ? sizeof(vendor_class_hdr) : 0},
- {vendor_class, vendor_class_len},
- {&reconf_accept, sizeof(reconf_accept)},
- {&fqdn, fqdn_len},
- {&hdr_ia_na, sizeof(hdr_ia_na)},
- {ia_na, ia_na_len},
- {ia_pd, ia_pd_len},
+ struct iovec iov[IOV_TOTAL] = {
+ [IOV_HDR] = {&hdr, sizeof(hdr)},
+ [IOV_ORO] = {oro, oro_len},
+ [IOV_ORO_REFRESH] = {&oro_refresh, 0},
+ [IOV_CL_ID] = {cl_id, cl_id_len},
+ [IOV_SRV_ID] = {srv_id, srv_id_len},
+ [IOV_VENDOR_CLASS_HDR] = {&vendor_class_hdr, vendor_class_len ? sizeof(vendor_class_hdr) : 0},
+ [IOV_VENDOR_CLASS] = {vendor_class, vendor_class_len},
+ [IOV_USER_CLASS_HDR] = {&user_class_hdr, user_class_len ? sizeof(user_class_hdr) : 0},
+ [IOV_USER_CLASS] = {user_class, user_class_len},
+ [IOV_RECONF_ACCEPT] = {&reconf_accept, sizeof(reconf_accept)},
+ [IOV_FQDN] = {&fqdn, fqdn_len},
+ [IOV_HDR_IA_NA] = {&hdr_ia_na, sizeof(hdr_ia_na)},
+ [IOV_IA_NA] = {ia_na, ia_na_len},
+ [IOV_IA_PD] = {ia_pd, ia_pd_len},
};
- size_t cnt = ARRAY_SIZE(iov);
+ size_t cnt = IOV_TOTAL;
if (type == DHCPV6_MSG_INFO_REQ) {
- cnt = 7;
- iov[2].iov_len = sizeof(oro_refresh);
+ cnt = 9;
+ iov[IOV_ORO_REFRESH].iov_len = sizeof(oro_refresh);
hdr.oro_len = htons(oro_len + sizeof(oro_refresh));
} else if (!request_prefix) {
- cnt = 11;
+ cnt = 13;
}
// Disable IAs if not used
- if (type != DHCPV6_MSG_SOLICIT) {
- iov[7].iov_len = 0;
- if (ia_na_len == 0)
- iov[9].iov_len = 0;
- }
+ if (type != DHCPV6_MSG_SOLICIT && ia_na_len == 0)
+ iov[IOV_HDR_IA_NA].iov_len = 0;
if (na_mode == IA_MODE_NONE)
- iov[9].iov_len = 0;
+ iov[IOV_HDR_IA_NA].iov_len = 0;
- if (!(client_options & DHCPV6_ACCEPT_RECONFIGURE))
- iov[7].iov_len = 0;
+ if ((type != DHCPV6_MSG_SOLICIT && type != DHCPV6_MSG_REQUEST) ||
+ !(client_options & DHCPV6_ACCEPT_RECONFIGURE))
+ iov[IOV_RECONF_ACCEPT].iov_len = 0;
if (!(client_options & DHCPV6_CLIENT_FQDN))
- iov[8].iov_len = 0;
+ iov[IOV_FQDN].iov_len = 0;
struct sockaddr_in6 srv = {AF_INET6, htons(DHCPV6_SERVER_PORT),
0, ALL_DHCPV6_RELAYS, ifindex};
if (type == DHCPV6_MSG_UNKNOWN)
timeout = t1;
else if (type == DHCPV6_MSG_RENEW)
- timeout = (t2 > t1) ? t2 - t1 : 0;
+ timeout = (t2 > t1) ? t2 - t1 : ((t1 == UINT32_MAX) ? UINT32_MAX : 0);
else if (type == DHCPV6_MSG_REBIND)
- timeout = (t3 > t2) ? t3 - t2 : 0;
+ timeout = (t3 > t2) ? t3 - t2 : ((t2 == UINT32_MAX) ? UINT32_MAX : 0);
if (timeout == 0)
return -1;
uint64_t round_end = round_start + rto;
elapsed = round_start - start;
- // Don't wait too long
- if (round_end - start > timeout * 1000)
+ // Don't wait too long if timeout differs from infinite
+ if ((timeout != UINT32_MAX) && (round_end - start > timeout * 1000))
round_end = timeout * 1000 + start;
// Built and send package
// Set timeout for receiving
uint64_t t = round_end - round_start;
- struct timeval timeout = {t / 1000, (t % 1000) * 1000};
+ struct timeval tv = {t / 1000, (t % 1000) * 1000};
setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
- &timeout, sizeof(timeout));
+ &tv, sizeof(tv));
// Receive cycle
len = recvmsg(sock, &msg, 0);
// Allow
if (retx->handler_finish)
len = retx->handler_finish();
- } while (len < 0 && ((elapsed / 1000 < timeout) && (!retx->max_rc || rc < retx->max_rc)));
-
+ } while (len < 0 && ((timeout == UINT32_MAX) || (elapsed / 1000 < timeout)) &&
+ (!retx->max_rc || rc < retx->max_rc));
return len;
}
continue;
md5_ctx_t md5;
- uint8_t serverhash[16], secretbytes[16], hash[16];
+ uint8_t serverhash[16], secretbytes[64], hash[16];
memcpy(serverhash, r->key, sizeof(serverhash));
memset(r->key, 0, sizeof(r->key));
- memcpy(secretbytes, reconf_key, sizeof(secretbytes));
+
+ memset(secretbytes, 0, sizeof(secretbytes));
+ memcpy(secretbytes, reconf_key, sizeof(reconf_key));
for (size_t i = 0; i < sizeof(secretbytes); ++i)
secretbytes[i] ^= 0x36;
uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
last_update = now;
- t1 -= elapsed;
- t2 -= elapsed;
- t3 -= elapsed;
+ if (t1 != UINT32_MAX)
+ t1 -= elapsed;
+
+ if (t2 != UINT32_MAX)
+ t2 -= elapsed;
+
+ if (t3 != UINT32_MAX)
+ t3 -= elapsed;
if (t1 < 0)
t1 = 0;
odhcp6c_clear_state(STATE_SIP_IP);
odhcp6c_clear_state(STATE_SIP_FQDN);
odhcp6c_clear_state(STATE_AFTR_NAME);
+ odhcp6c_clear_state(STATE_CER);
+ odhcp6c_clear_state(STATE_S46_MAPT);
+ odhcp6c_clear_state(STATE_S46_MAPE);
+ odhcp6c_clear_state(STATE_S46_LW);
}
// Parse and find all matching IAs
if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
dhcpv6_retx[DHCPV6_MSG_INFO_REQ].max_timeo = inf_max_rt;
- }else if (otype != DHCPV6_OPT_CLIENTID &&
+#ifdef EXT_CER_ID
+ } else if (otype == DHCPV6_OPT_CER_ID && olen == -4 +
+ sizeof(struct dhcpv6_cer_id)) {
+ struct dhcpv6_cer_id *cer_id = (void*)&odata[-4];
+ struct in6_addr any = IN6ADDR_ANY_INIT;
+ if (memcmp(&cer_id->addr, &any, sizeof(any)))
+ odhcp6c_add_state(STATE_CER, &cer_id->addr, sizeof(any));
+#endif
+#ifdef EXT_S46
+ } else if (otype == DHCPV6_OPT_S46_CONT_MAPT) {
+ odhcp6c_add_state(STATE_S46_MAPT, odata, olen);
+ } else if (otype == DHCPV6_OPT_S46_CONT_MAPE) {
+ size_t mape_len;
+ odhcp6c_get_state(STATE_S46_MAPE, &mape_len);
+ if (mape_len == 0)
+ odhcp6c_add_state(STATE_S46_MAPE, odata, olen);
+ } else if (otype == DHCPV6_OPT_S46_CONT_LW) {
+ odhcp6c_add_state(STATE_S46_LW, odata, olen);
+#endif
+ } else if (otype != DHCPV6_OPT_CLIENTID &&
otype != DHCPV6_OPT_SERVERID) {
odhcp6c_add_state(STATE_CUSTOM_OPTS,
&odata[-4], olen + 4);
size_t cand_len;
struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
uint16_t hdr[2];
- int ret = (na_mode == IA_MODE_NONE && pd_mode == IA_MODE_NONE) ?
- DHCPV6_STATELESS : DHCPV6_STATEFUL;
+ int ret = DHCPV6_STATELESS;
// Clear lingering candidate state info
odhcp6c_clear_state(STATE_SERVER_ID);
projects / odhcp6c.git / blobdiff