/**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License v2 as published by
#include <time.h>
#include <fcntl.h>
#include <errno.h>
+#include <stdlib.h>
#include <signal.h>
#include <limits.h>
#include <resolv.h>
#include <net/ethernet.h>
#include "odhcp6c.h"
+#include "md5.h"
#define ALL_DHCPV6_RELAYS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
const uint8_t transaction[3], enum dhcpv6_msg type);
-static time_t dhcpv6_parse_ia(void *opt, void *end);
+static uint32_t dhcpv6_parse_ia(void *opt, void *end);
static reply_handler dhcpv6_handle_reply;
static reply_handler dhcpv6_handle_advert;
dhcpv6_handle_reconfigure, NULL},
[DHCPV6_MSG_SOLICIT] = {true, 1, 120, "SOLICIT",
dhcpv6_handle_advert, dhcpv6_commit_advert},
- [DHCPV6_MSG_REQUEST] = {true, 30, 10, "REQUEST",
+ [DHCPV6_MSG_REQUEST] = {true, 1, 30, "REQUEST",
dhcpv6_handle_reply, NULL},
[DHCPV6_MSG_RENEW] = {false, 10, 600, "RENEW",
dhcpv6_handle_reply, NULL},
// Sockets
static int sock = -1;
static int ifindex = -1;
-static time_t t1 = 0, t2 = 0, t3 = 0;
+static int64_t t1 = 0, t2 = 0, t3 = 0;
// IA states
static int request_prefix = -1;
-static enum odhcp6c_ia_mode na_mode = IA_MODE_NONE;
+static enum odhcp6c_ia_mode na_mode = IA_MODE_NONE, pd_mode = IA_MODE_NONE;
static bool accept_reconfig = false;
+// Reconfigure key
+static uint8_t reconf_key[16];
-int init_dhcpv6(const char *ifname, int request_pd)
+
+int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout)
{
request_prefix = request_pd;
+ dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_timeout;
sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
}
// Create ORO
- uint16_t oro[] = {htons(DHCPV6_OPT_DNS_SERVERS),
+ uint16_t oro[] = {
+ htons(DHCPV6_OPT_SIP_SERVER_D),
+ htons(DHCPV6_OPT_SIP_SERVER_A),
+ htons(DHCPV6_OPT_DNS_SERVERS),
htons(DHCPV6_OPT_DNS_DOMAIN),
htons(DHCPV6_OPT_NTP_SERVER),
htons(DHCPV6_OPT_SIP_SERVER_A),
- htons(DHCPV6_OPT_SIP_SERVER_D)};
+ htons(DHCPV6_OPT_AFTR_NAME),
+ htons(DHCPV6_OPT_PD_EXCLUDE),
+#ifdef EXT_PREFIX_CLASS
+ htons(DHCPV6_OPT_PREFIX_CLASS),
+#endif
+ };
odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
}
-void dhcpv6_set_ia_na_mode(enum odhcp6c_ia_mode mode)
+void dhcpv6_set_ia_mode(enum odhcp6c_ia_mode na, enum odhcp6c_ia_mode pd)
{
- na_mode = mode;
+ na_mode = na;
+ pd_mode = pd;
}
void *srv_id = odhcp6c_get_state(STATE_SERVER_ID, &srv_id_len);
// Build IA_PDs
- size_t ia_pd_entry_len, ia_pd_len = 0;
- void *ia_pd = NULL;
- void *ia_pd_entries = odhcp6c_get_state(STATE_IA_PD, &ia_pd_entry_len);
+ size_t ia_pd_entries, ia_pd_len = 0;
+ struct odhcp6c_entry *e = odhcp6c_get_state(STATE_IA_PD, &ia_pd_entries);
+ ia_pd_entries /= sizeof(*e);
struct dhcpv6_ia_hdr hdr_ia_pd = {
htons(DHCPV6_OPT_IA_PD),
- htons(sizeof(hdr_ia_pd) - 4 + ia_pd_len),
+ htons(sizeof(hdr_ia_pd) - 4),
1, 0, 0
};
+
+ uint8_t *ia_pd = alloca(ia_pd_entries * (sizeof(struct dhcpv6_ia_prefix) + 10));
+ for (size_t i = 0; i < ia_pd_entries; ++i) {
+ uint8_t ex_len = 0;
+ if (e[i].priority > 0)
+ ex_len = ((e[i].priority - e[i].length - 1) / 8) + 6;
+
+ struct dhcpv6_ia_prefix p = {
+ .type = htons(DHCPV6_OPT_IA_PREFIX),
+ .len = htons(sizeof(p) - 4U + ex_len),
+ .prefix = e[i].length,
+ .addr = e[i].target
+ };
+
+ memcpy(ia_pd + ia_pd_len, &p, sizeof(p));
+ ia_pd_len += sizeof(p);
+
+ if (ex_len) {
+ ia_pd[ia_pd_len++] = 0;
+ ia_pd[ia_pd_len++] = DHCPV6_OPT_PD_EXCLUDE;
+ ia_pd[ia_pd_len++] = 0;
+ ia_pd[ia_pd_len++] = ex_len - 4;
+ ia_pd[ia_pd_len++] = e[i].priority;
+
+ uint32_t excl = ntohl(e[i].router.s6_addr32[1]);
+ excl >>= (64 - e[i].priority);
+ excl <<= 8 - ((e[i].priority - e[i].length) % 8);
+
+ for (size_t i = ex_len - 5; i > 0; --i, excl >>= 8)
+ ia_pd[ia_pd_len + i] = excl & 0xff;
+ ia_pd_len += ex_len - 5;
+ }
+ }
+
struct dhcpv6_ia_prefix pref = {
.type = htons(DHCPV6_OPT_IA_PREFIX),
.len = htons(25), .prefix = request_prefix
};
-
- if (ia_pd_entry_len > 0) {
- struct odhcp6c_entry *e = ia_pd_entries;
- size_t entries = ia_pd_entry_len / sizeof(*e);
- struct dhcpv6_ia_prefix p[entries];
- for (size_t i = 0; i < entries; ++i) {
- p[i].type = htons(DHCPV6_OPT_IA_PREFIX);
- p[i].len = htons(sizeof(p[i]) - 4U);
- p[i].preferred = htonl(e[i].preferred);
- p[i].valid = htonl(e[i].valid);
- p[i].prefix = e[i].length;
- p[i].addr = e[i].target;
- }
- ia_pd = p;
- ia_pd_len = sizeof(p);
- } else if (request_prefix > 0 &&
- (type == DHCPV6_MSG_SOLICIT ||
- type == DHCPV6_MSG_REQUEST)) {
- ia_pd = &pref;
+ if (request_prefix > 0 && ia_pd_len == 0 && type == DHCPV6_MSG_SOLICIT) {
+ ia_pd = (uint8_t*)&pref;
ia_pd_len = sizeof(pref);
}
+ hdr_ia_pd.len = htons(ntohs(hdr_ia_pd.len) + ia_pd_len);
// Build IA_NAs
- size_t ia_na_entry_len, ia_na_len = 0;
+ size_t ia_na_entries, ia_na_len = 0;
void *ia_na = NULL;
- void *ia_na_entries = odhcp6c_get_state(STATE_IA_NA, &ia_na_entry_len);
+ e = odhcp6c_get_state(STATE_IA_NA, &ia_na_entries);
+ ia_na_entries /= sizeof(*e);
+
struct dhcpv6_ia_hdr hdr_ia_na = {
htons(DHCPV6_OPT_IA_NA),
- htons(sizeof(hdr_ia_na) - 4 + ia_na_len),
+ htons(sizeof(hdr_ia_na) - 4),
1, 0, 0
};
- if (ia_na_entry_len > 0) {
- struct odhcp6c_entry *e = ia_na_entries;
- size_t entries = ia_na_entry_len / sizeof(*e);
- struct dhcpv6_ia_addr p[entries];
- for (size_t i = 0; i < entries; ++i) {
- p[i].type = htons(DHCPV6_OPT_IA_ADDR);
- p[i].len = htons(sizeof(p[i]) - 4U);
- p[i].addr = e[i].target;
- p[i].preferred = htonl(e[i].preferred);
- p[i].valid = htonl(e[i].valid);
- }
- ia_na = p;
- ia_na_len = sizeof(p);
+ struct dhcpv6_ia_addr pa[ia_na_entries];
+ for (size_t i = 0; i < ia_na_entries; ++i) {
+ 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;
}
+ ia_na = pa;
+ ia_na_len = sizeof(pa);
+ hdr_ia_na.len = htons(ntohs(hdr_ia_na.len) + ia_na_len);
+
// Reconfigure Accept
struct {
uint16_t type;
{&oro_refresh, 0},
{cl_id, cl_id_len},
{srv_id, srv_id_len},
- {&reconf_accept, 0},
+ {&reconf_accept, sizeof(reconf_accept)},
{&fqdn, fqdn_len},
{&hdr_ia_na, sizeof(hdr_ia_na)},
{ia_na, ia_na_len},
}
// Disable IAs if not used
- if (type == DHCPV6_MSG_SOLICIT) {
- iov[5].iov_len = sizeof(reconf_accept);
- } else if (type != DHCPV6_MSG_REQUEST) {
+ if (type != DHCPV6_MSG_SOLICIT) {
+ iov[5].iov_len = 0;
if (ia_na_len == 0)
iov[7].iov_len = 0;
if (ia_pd_len == 0)
{
int random;
odhcp6c_random(&random, sizeof(random));
- return (time * (random % 1000)) / 10000;
+ return (time * ((int64_t)random % 1000LL)) / 10000LL;
}
int dhcpv6_request(enum dhcpv6_msg type)
{
uint8_t buf[1536];
- uint32_t timeout = UINT32_MAX;
+ uint64_t timeout = UINT32_MAX;
struct dhcpv6_retx *retx = &dhcpv6_retx[type];
if (retx->delay) {
nanosleep(&ts, NULL);
}
- if (type == DHCPV6_MSG_RELEASE || type == DHCPV6_MSG_DECLINE)
+ if (type == DHCPV6_MSG_REQUEST)
+ timeout = 60;
+ else if (type == DHCPV6_MSG_RELEASE || type == DHCPV6_MSG_DECLINE)
timeout = 3;
else if (type == DHCPV6_MSG_UNKNOWN)
timeout = t1;
else if (type == DHCPV6_MSG_RENEW)
- timeout = t2 - t1;
+ timeout = (t2 > t1) ? t2 - t1 : 0;
else if (type == DHCPV6_MSG_REBIND)
- timeout = t3 - t2;
+ timeout = (t3 > t2) ? t3 - t2 : 0;
if (timeout == 0)
return -1;
- syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, timeout);
+ syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, (unsigned)timeout);
uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
// Generate transaction ID
- uint8_t trid[3];
- odhcp6c_random(trid, sizeof(trid));
+ uint8_t trid[3] = {0, 0, 0};
+ if (type != DHCPV6_MSG_UNKNOWN)
+ odhcp6c_random(trid, sizeof(trid));
ssize_t len = -1;
int64_t rto = 0;
len = retx->handler_reply(
type, opt, opt_end);
- if (round_end - round_start > 1000)
+ if (len > 0 && round_end - round_start > 1000)
round_end = 1000 + round_start;
}
}
uint8_t *end = ((uint8_t*)buf) + len, *odata;
uint16_t otype, olen;
- bool clientid_ok = false, serverid_ok = false;
+ bool clientid_ok = false, serverid_ok = false, rcauth_ok = false;
size_t client_id_len, server_id_len;
void *client_id = odhcp6c_get_state(STATE_CLIENT_ID, &client_id_len);
void *server_id = odhcp6c_get_state(STATE_SERVER_ID, &server_id_len);
- dhcpv6_for_each_option(&rep[1], end, otype, olen, odata)
- if (otype == DHCPV6_OPT_CLIENTID)
+ dhcpv6_for_each_option(&rep[1], end, otype, olen, odata) {
+ if (otype == DHCPV6_OPT_CLIENTID) {
clientid_ok = (olen + 4U == client_id_len) && !memcmp(
&odata[-4], client_id, client_id_len);
- else if (otype == DHCPV6_OPT_SERVERID)
+ } else if (otype == DHCPV6_OPT_SERVERID) {
serverid_ok = (olen + 4U == server_id_len) && !memcmp(
&odata[-4], server_id, server_id_len);
+ } else if (otype == DHCPV6_OPT_AUTH && olen == -4 +
+ sizeof(struct dhcpv6_auth_reconfigure)) {
+ struct dhcpv6_auth_reconfigure *r = (void*)&odata[-4];
+ if (r->protocol != 3 || r->algorithm != 1 || r->reconf_type != 2)
+ continue;
+
+ md5_state_t md5;
+ uint8_t serverhash[16], secretbytes[16], hash[16];
+ memcpy(serverhash, r->key, sizeof(serverhash));
+ memset(r->key, 0, sizeof(r->key));
+ memcpy(secretbytes, reconf_key, sizeof(secretbytes));
+
+ for (size_t i = 0; i < sizeof(secretbytes); ++i)
+ secretbytes[i] ^= 0x36;
+
+ md5_init(&md5);
+ md5_append(&md5, secretbytes, sizeof(secretbytes));
+ md5_append(&md5, buf, len);
+ md5_finish(&md5, hash);
+
+ for (size_t i = 0; i < sizeof(secretbytes); ++i) {
+ secretbytes[i] ^= 0x36;
+ secretbytes[i] ^= 0x5c;
+ }
+
+ md5_init(&md5);
+ md5_append(&md5, secretbytes, sizeof(secretbytes));
+ md5_append(&md5, hash, 16);
+ md5_finish(&md5, hash);
+
+ rcauth_ok = !memcmp(hash, serverhash, sizeof(hash));
+ }
+ }
+
+ if (rep->msg_type == DHCPV6_MSG_RECONF && !rcauth_ok)
+ return false;
return clientid_ok && (serverid_ok || server_id_len == 0);
}
// Collect all advertised servers
-static int dhcpv6_handle_advert(_unused enum dhcpv6_msg orig,
+static int dhcpv6_handle_advert(enum dhcpv6_msg orig,
const void *opt, const void *end)
{
uint16_t olen, otype;
uint8_t *odata;
- struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}};
+ struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}, NULL, NULL, 0, 0};
+ bool have_na = false;
+ int have_pd = 0;
dhcpv6_for_each_option(opt, end, otype, olen, odata) {
+ if (orig == DHCPV6_MSG_SOLICIT &&
+ (otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA) &&
+ olen > sizeof(struct dhcpv6_ia_hdr)) {
+ struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
+ dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
+ }
+
if (otype == DHCPV6_OPT_SERVERID && olen <= 130) {
memcpy(cand.duid, odata, olen);
cand.duid_len = olen;
- } else if (otype == DHCPV6_OPT_STATUS && olen >= 2 && !odata[0]
- && odata[1] == DHCPV6_NoAddrsAvail) {
- if (na_mode == IA_MODE_FORCE) {
- return -1;
- } else {
- cand.has_noaddravail = true;
- cand.preference -= 1000;
- }
} else if (otype == DHCPV6_OPT_STATUS && olen >= 2 && !odata[0]
&& odata[1] == DHCPV6_NoPrefixAvail) {
cand.preference -= 2000;
} else if (otype == DHCPV6_OPT_PREF && olen >= 1 &&
cand.preference >= 0) {
- cand.preference = odata[1];
+ cand.preference = odata[0];
} else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
cand.wants_reconfigure = true;
} else if (otype == DHCPV6_OPT_IA_PD && request_prefix) {
- struct dhcpv6_ia_hdr *h = (void*)odata;
+ struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4];
uint8_t *oend = odata + olen, *d;
dhcpv6_for_each_option(&h[1], oend, otype, olen, d) {
- if (otype == DHCPV6_OPT_IA_PREFIX)
- cand.preference += 2000;
- else if (otype == DHCPV6_OPT_STATUS &&
- olen >= 2 && d[0] == 0 &&
- d[1] == DHCPV6_NoPrefixAvail)
- cand.preference -= 2000;
+ if (otype == DHCPV6_OPT_IA_PREFIX && (olen + 4) >=
+ (uint16_t)sizeof(struct dhcpv6_ia_prefix)) {
+ struct dhcpv6_ia_prefix *p = (struct dhcpv6_ia_prefix*)&d[-4];
+ have_pd = p->prefix;
+ }
}
+ } else if (otype == DHCPV6_OPT_IA_NA) {
+ struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4];
+ uint8_t *oend = odata + olen, *d;
+ dhcpv6_for_each_option(&h[1], oend, otype, olen, d)
+ if (otype == DHCPV6_OPT_IA_ADDR)
+ have_na = true;
}
}
- if (cand.duid_len > 0)
+ if ((!have_na && na_mode == IA_MODE_FORCE) ||
+ (!have_pd && pd_mode == IA_MODE_FORCE))
+ return -1;
+
+ if (na_mode != IA_MODE_NONE && !have_na) {
+ cand.has_noaddravail = true;
+ cand.preference -= 1000;
+ }
+
+ if (pd_mode != IA_MODE_NONE) {
+ if (have_pd)
+ cand.preference += 2000 + (128 - have_pd);
+ else
+ cand.preference -= 2000;
+ }
+
+ if (cand.duid_len > 0) {
+ cand.ia_na = odhcp6c_move_state(STATE_IA_NA, &cand.ia_na_len);
+ cand.ia_pd = odhcp6c_move_state(STATE_IA_PD, &cand.ia_pd_len);
odhcp6c_add_state(STATE_SERVER_CAND, &cand, sizeof(cand));
+ }
+
+ if (orig == DHCPV6_MSG_SOLICIT) {
+ odhcp6c_clear_state(STATE_IA_NA);
+ odhcp6c_clear_state(STATE_IA_PD);
+ }
return -1;
}
odhcp6c_add_state(STATE_SERVER_ID, hdr, sizeof(hdr));
odhcp6c_add_state(STATE_SERVER_ID, c->duid, c->duid_len);
accept_reconfig = c->wants_reconfigure;
+ odhcp6c_add_state(STATE_IA_NA, c->ia_na, c->ia_na_len);
+ odhcp6c_add_state(STATE_IA_PD, c->ia_pd, c->ia_pd_len);
}
+ for (size_t i = 0; i < cand_len / sizeof(*c); ++i) {
+ free(cand[i].ia_na);
+ free(cand[i].ia_pd);
+ }
odhcp6c_clear_state(STATE_SERVER_CAND);
if (!c)
uint8_t *odata;
uint16_t otype, olen;
- static time_t last_update = 0;
- time_t now = odhcp6c_get_milli_time() / 1000;
-
- uint32_t elapsed = now - last_update;
odhcp6c_expire();
if (orig == DHCPV6_MSG_UNKNOWN) {
+ static time_t last_update = 0;
+ time_t now = odhcp6c_get_milli_time() / 1000;
+
+ uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
+ last_update = now;
+
t1 -= elapsed;
t2 -= elapsed;
t3 -= elapsed;
if (t3 < 0)
t3 = 0;
} else {
- t1 = t2 = t3 = 86400;
+ t1 = t2 = t3 = UINT32_MAX;
+ }
+
+ if (orig == DHCPV6_MSG_REQUEST) {
+ // Delete NA and PD we have in the state from the Advert
+ odhcp6c_clear_state(STATE_IA_NA);
+ odhcp6c_clear_state(STATE_IA_PD);
}
if (opt) {
odhcp6c_clear_state(STATE_SNTP_FQDN);
odhcp6c_clear_state(STATE_SIP_IP);
odhcp6c_clear_state(STATE_SIP_FQDN);
+ odhcp6c_clear_state(STATE_AFTR_NAME);
}
// Parse and find all matching IAs
if ((otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA)
&& olen > sizeof(struct dhcpv6_ia_hdr)) {
struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
- time_t l_t1 = ntohl(ia_hdr->t1);
- time_t l_t2 = ntohl(ia_hdr->t2);
+ uint32_t l_t1 = ntohl(ia_hdr->t1);
+ uint32_t l_t2 = ntohl(ia_hdr->t2);
// Test ID and T1-T2 validity
if (ia_hdr->iaid != 1 || l_t2 < l_t1)
continue;
+ int error = 0;
uint16_t stype, slen;
uint8_t *sdata;
// Test status and bail if error
dhcpv6_for_each_option(&ia_hdr[1], odata + olen,
stype, slen, sdata)
- if (stype == DHCPV6_OPT_STATUS && slen >= 2 &&
- (sdata[0] || sdata[1]))
- continue;
+ if (stype == DHCPV6_OPT_STATUS && slen >= 2)
+ error = ((int)sdata[0]) << 8 | ((int)sdata[1]);
+
+ if (error) {
+ syslog(LOG_WARNING, "Server returned IAID status %i!", error);
+ if (error != 2)
+ raise(SIGUSR2);
+ break;
+ }
+
+ uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
+
+ if (!l_t1)
+ l_t1 = 300;
+
+ if (!l_t2)
+ l_t2 = 600;
+
+ if (n < t3)
+ t3 = n;
// Update times
if (l_t1 > 0 && t1 > l_t1)
if (l_t2 > 0 && t2 > l_t2)
t2 = l_t2;
- time_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
-
- if (n < t1)
- t1 = n;
-
- if (n < t2)
- t2 = n;
-
- if (n < t3)
- t3 = n;
-
} else if (otype == DHCPV6_OPT_DNS_SERVERS) {
if (olen % 16 == 0)
odhcp6c_add_state(STATE_DNS, odata, olen);
uint32_t refresh = ntohl(*((uint32_t*)odata));
if (refresh < (uint32_t)t1)
t1 = refresh;
+ } else if (otype == DHCPV6_OPT_AUTH && olen == -4 +
+ sizeof(struct dhcpv6_auth_reconfigure)) {
+ struct dhcpv6_auth_reconfigure *r = (void*)&odata[-4];
+ if (r->protocol == 3 && r->algorithm == 1 &&
+ r->reconf_type == 1)
+ memcpy(reconf_key, r->key, sizeof(r->key));
+ } else if (otype == DHCPV6_OPT_AFTR_NAME && olen > 3) {
+ size_t cur_len;
+ odhcp6c_get_state(STATE_AFTR_NAME, &cur_len);
+ if (cur_len == 0)
+ odhcp6c_add_state(STATE_AFTR_NAME, odata, olen);
} else if (otype != DHCPV6_OPT_CLIENTID &&
otype != DHCPV6_OPT_SERVERID) {
odhcp6c_add_state(STATE_CUSTOM_OPTS,
}
}
+ if (t1 == UINT32_MAX)
+ t1 = 300;
+
+ if (t2 == UINT32_MAX)
+ t2 = 600;
+
+ if (t3 == UINT32_MAX)
+ t3 = 3600;
+
return true;
}
-static time_t dhcpv6_parse_ia(void *opt, void *end)
+static uint32_t dhcpv6_parse_ia(void *opt, void *end)
{
uint32_t timeout = UINT32_MAX; // Minimum timeout
uint16_t otype, olen;
uint8_t *odata;
- struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT,
- 0, 0, IN6ADDR_ANY_INIT, 0, 0};
-
// Update address IA
dhcpv6_for_each_option(opt, end, otype, olen, odata) {
+ struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0,
+ IN6ADDR_ANY_INIT, 0, 0, 0};
+
if (otype == DHCPV6_OPT_IA_PREFIX) {
struct dhcpv6_ia_prefix *prefix = (void*)&odata[-4];
if (olen + 4U < sizeof(*prefix))
entry.length = prefix->prefix;
entry.target = prefix->addr;
+ uint16_t stype, slen;
+ uint8_t *sdata;
+
+#ifdef EXT_PREFIX_CLASS
+ // Find prefix class, if any
+ dhcpv6_for_each_option(&prefix[1], odata + olen,
+ stype, slen, sdata)
+ if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
+ entry.class = sdata[0] << 8 | sdata[1];
+#endif
+
+ // Parse PD-exclude
+ bool ok = true;
+ dhcpv6_for_each_option(odata + sizeof(*prefix) - 4U,
+ odata + olen, stype, slen, sdata) {
+ if (stype != DHCPV6_OPT_PD_EXCLUDE || slen < 2)
+ continue;
+
+ uint8_t elen = sdata[0];
+ if (elen > 64)
+ elen = 64;
+
+ if (elen <= 32 || elen <= entry.length) {
+ ok = false;
+ continue;
+ }
+
+
+ uint8_t bytes = ((elen - entry.length - 1) / 8) + 1;
+ if (slen <= bytes) {
+ ok = false;
+ continue;
+ }
+
+ uint32_t exclude = 0;
+ do {
+ exclude = exclude << 8 | sdata[bytes];
+ } while (--bytes);
+
+ exclude >>= 8 - ((elen - entry.length) % 8);
+ exclude <<= 64 - elen;
+
+ // Abusing router & priority fields for exclusion
+ entry.router = entry.target;
+ entry.router.s6_addr32[1] |= htonl(exclude);
+ entry.priority = elen;
+ }
+
+ if (ok)
+ odhcp6c_update_entry(STATE_IA_PD, &entry);
- odhcp6c_update_entry(STATE_IA_PD, &entry);
+ entry.priority = 0;
+ memset(&entry.router, 0, sizeof(entry.router));
} else if (otype == DHCPV6_OPT_IA_ADDR) {
struct dhcpv6_ia_addr *addr = (void*)&odata[-4];
if (olen + 4U < sizeof(*addr))
entry.length = 128;
entry.target = addr->addr;
+#ifdef EXT_PREFIX_CLASS
+ uint16_t stype, slen;
+ uint8_t *sdata;
+ // Find prefix class, if any
+ dhcpv6_for_each_option(&addr[1], odata + olen,
+ stype, slen, sdata)
+ if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
+ entry.class = sdata[0] << 8 | sdata[1];
+#endif
+
odhcp6c_update_entry(STATE_IA_NA, &entry);
}
-
if (entry.valid > 0 && timeout > entry.valid)
timeout = entry.valid;
}
projects / odhcp6c.git / blobdiff