/**
* Copyright (C) 2012-2014 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2017 Hans Dedecker <dedeckeh@gmail.com>
*
* 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 "odhcp6c.h"
#include "ra.h"
-
#ifndef IN6_IS_ADDR_UNIQUELOCAL
#define IN6_IS_ADDR_UNIQUELOCAL(a) \
((((__const uint32_t *) (a))[0] & htonl (0xfe000000)) \
static time_t last_update = 0;
static char *ifname = NULL;
-static unsigned int min_update_interval = DEFAULT_MIN_UPDATE_INTERVAL;
static unsigned int script_sync_delay = 10;
static unsigned int script_accu_delay = 1;
int main(_unused int argc, char* const argv[])
{
- // Allocate ressources
+ static struct in6_addr ifid = IN6ADDR_ANY_INIT;
+ // Allocate resources
const char *pidfile = NULL;
const char *script = "/usr/sbin/odhcp6c-update";
ssize_t l;
enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE;
int ia_pd_iaid_index = 0;
- static struct in6_addr ifid = IN6ADDR_ANY_INIT;
int sol_timeout = DHCPV6_SOL_MAX_RT;
int verbosity = 0;
-
-
bool help = false, daemonize = false;
int logopt = LOG_PID;
int c;
unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
unsigned int ra_options = RA_RDNSS_DEFAULT_LIFETIME;
+ unsigned int ra_holdoff_interval = RA_MIN_ADV_INTERVAL;
while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:Lhedp:fav")) != -1) {
switch (c) {
if (!strcmp(optarg, "force")) {
ia_na_mode = IA_MODE_FORCE;
allow_slaac_only = -1;
- } else if (!strcmp(optarg, "none")) {
+ } else if (!strcmp(optarg, "none"))
ia_na_mode = IA_MODE_NONE;
- } else if (!strcmp(optarg, "try")) {
+ else if (!strcmp(optarg, "try"))
ia_na_mode = IA_MODE_TRY;
- } else{
+ else
help = true;
- }
break;
case 'V':
l = script_unhexlify(buf, sizeof(buf), optarg);
if (!l)
- help=true;
+ help = true;
odhcp6c_add_state(STATE_VENDORCLASS, buf, l);
-
break;
+
case 'P':
if (ia_pd_mode == IA_MODE_NONE)
ia_pd_mode = IA_MODE_TRY;
char *iaid_begin;
int iaid_len = 0;
-
int prefix_length = strtoul(optarg, &iaid_begin, 10);
if (*iaid_begin != '\0' && *iaid_begin != ',' && *iaid_begin != ':') {
prefix.iaid = htonl(++ia_pd_iaid_index);
odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix));
-
break;
case 'F':
buf[2] = 0;
buf[3] = l;
odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4);
- } else {
+ } else
help = true;
- }
break;
case 'i':
break;
else if (optpos[0])
optarg = &optpos[1];
+
odhcp6c_add_state(STATE_ORO, &opttype, 2);
}
break;
break;
case 'm':
- min_update_interval = atoi(optarg);
+ ra_holdoff_interval = atoi(optarg);
break;
case 'L':
if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
init_dhcpv6(ifname, client_options, sol_timeout) ||
- ra_init(ifname, &ifid, ra_options) ||
+ ra_init(ifname, &ifid, ra_options, ra_holdoff_interval) ||
script_init(script, ifname)) {
syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
return 3;
int mode = dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode);
if (mode != DHCPV6_STATELESS)
mode = dhcpv6_request(DHCPV6_MSG_SOLICIT);
+
odhcp6c_signal_process();
if (mode < 0)
signal_usr1 = false; // Acknowledged
continue;
}
+
if (signal_usr2 || signal_term)
break;
res = dhcpv6_request(DHCPV6_MSG_INFO_REQ);
odhcp6c_signal_process();
+
if (signal_usr1)
continue;
else if (res < 0)
// Handle signal, if necessary
if (signal_usr1)
signal_usr1 = false; // Acknowledged
+
if (signal_usr2 || signal_term)
break; // Other signal type
// Send renew as T1 expired
res = dhcpv6_request(DHCPV6_MSG_RENEW);
odhcp6c_signal_process();
+
if (res > 0) { // Renew was succesfull
// Publish updates
script_call("updated", 0, false);
if (res > 0)
script_call("rebound", 0, true);
- else {
+ else
break;
- }
}
break;
}
script_call("stopped", 0, true);
+
return 0;
}
-
static int usage(void)
{
const char buf[] =
" -f Don't send Client FQDN option\n"
" -k Don't send a RELEASE when stopping\n"
" -t <seconds> Maximum timeout for DHCPv6-SOLICIT (120)\n"
- " -m <seconds> Minimum time between accepting updates (30)\n"
+ " -m <seconds> Minimum time between accepting RA updates (3)\n"
" -L Ignore default lifetime for RDNSS records\n"
"\nInvocation options:\n"
" -p <pidfile> Set pidfile (/var/run/odhcp6c.pid)\n"
" -v Increase logging verbosity\n"
" -h Show this help\n\n";
fputs(buf, stderr);
+
return 1;
}
-
// Don't want to pull-in librt and libpthread just for a monotonic clock...
uint64_t odhcp6c_get_milli_time(void)
{
struct timespec t = {0, 0};
syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t);
+
return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000;
}
-
static uint8_t* odhcp6c_resize_state(enum odhcp6c_state state, ssize_t len)
{
if (len == 0)
return NULL;
uint8_t *n = realloc(state_data[state], state_len[state] + len);
+
if (n || state_len[state] + len == 0) {
state_data[state] = n;
n += state_len[state];
state_len[state] += len;
}
+
return n;
}
-
bool odhcp6c_signal_process(void)
{
while (signal_io) {
return signal_usr1 || signal_usr2 || signal_term;
}
-
void odhcp6c_clear_state(enum odhcp6c_state state)
{
state_len[state] = 0;
}
-
void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len)
{
uint8_t *n = odhcp6c_resize_state(state, len);
+
if (n)
memcpy(n, data, len);
}
return -1;
uint8_t *n = odhcp6c_resize_state(state, len);
+
if (n) {
uint8_t *sdata = state_data[state];
{
uint8_t *data = state_data[state];
ssize_t len_after = state_len[state] - (offset + len);
+
if (len_after < 0)
return state_len[state];
memmove(data + offset, data + offset + len, len_after);
+
return state_len[state] -= len;
}
-
void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len)
{
*len = state_len[state];
return data;
}
-
void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len)
{
*len = state_len[state];
+
return state_data[state];
}
-
static struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
{
size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + ((new->length + 7) / 8);
for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start;
(uint8_t*)c < &start[len] &&
(uint8_t*)odhcp6c_next_entry(c) <= &start[len];
- c = odhcp6c_next_entry(c))
+ c = odhcp6c_next_entry(c)) {
if (!memcmp(c, new, cmplen) && !memcmp(c->auxtarget, new->auxtarget, new->auxlen))
return c;
+ }
return NULL;
}
-
bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
- uint32_t safe, bool filterexcess)
+ uint32_t safe, unsigned int holdoff_interval)
{
size_t len;
struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
if (new->valid > 0) {
if (x) {
- if (filterexcess && new->valid >= x->valid &&
+ if (holdoff_interval && new->valid >= x->valid &&
new->valid != UINT32_MAX &&
- new->valid - x->valid < min_update_interval &&
+ new->valid - x->valid < holdoff_interval &&
new->preferred >= x->preferred &&
new->preferred != UINT32_MAX &&
- new->preferred - x->preferred < min_update_interval)
+ new->preferred - x->preferred < holdoff_interval)
return false;
+
x->valid = new->valid;
x->preferred = new->preferred;
x->t1 = new->t1;
x->t2 = new->t2;
x->iaid = new->iaid;
- } else {
+ } else
odhcp6c_add_state(state, new, odhcp6c_entry_size(new));
- }
- } else if (x) {
+ } else if (x)
odhcp6c_remove_state(state, ((uint8_t*)x) - start, odhcp6c_entry_size(x));
- }
+
return true;
}
-
static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
{
size_t len;
uint8_t *start = odhcp6c_get_state(state, &len);
+
for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start;
(uint8_t*)c < &start[len] &&
(uint8_t*)odhcp6c_next_entry(c) <= &start[len];
if (!c->valid) {
odhcp6c_remove_state(state, ((uint8_t*)c) - start, odhcp6c_entry_size(c));
start = odhcp6c_get_state(state, &len);
- } else {
+ } else
c = odhcp6c_next_entry(c);
- }
}
}
-
void odhcp6c_expire(void)
{
time_t now = odhcp6c_get_milli_time() / 1000;
uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
+
last_update = now;
odhcp6c_expire_list(STATE_RA_PREFIX, elapsed);
odhcp6c_expire_list(STATE_IA_PD, elapsed);
}
-
uint32_t odhcp6c_elapsed(void)
{
return odhcp6c_get_milli_time() / 1000 - last_update;
}
-
int odhcp6c_random(void *buf, size_t len)
{
return read(urandom_fd, buf, len);
struct in6_addr inet6_addr;
uint32_t flags, dummy;
unsigned int i;
- char name[8], addr_buf[32];
+ char name[IF_NAMESIZE], addr_buf[33];
len = strlen(buf);
(flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE | IFA_F_DEPRECATED)))
continue;
- for (i = 0; i < sizeof(addr_buf); i++) {
+ for (i = 0; i < strlen(addr_buf); i++) {
if (!isxdigit(addr_buf[i]) || isupper(addr_buf[i]))
return false;
}
memset(&inet6_addr, 0, sizeof(inet6_addr));
- for (i = 0; i < (sizeof(addr_buf) / 2); i++) {
+ for (i = 0; i < (strlen(addr_buf) / 2); i++) {
unsigned char byte;
static const char hex[] = "0123456789abcdef";
byte = ((index(hex, addr_buf[i * 2]) - hex) << 4) |
(IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr)))
return true;
}
+
return false;
}
projects / project / odhcp6c.git / blobdiff