/**
- * 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 <net/if.h>
#include <sys/wait.h>
#include <sys/syscall.h>
+#include <arpa/inet.h>
#include "odhcp6c.h"
#include "ra.h"
static size_t state_len[_STATE_MAX] = {0};
static volatile int do_signal = 0;
-static int urandom_fd = -1;
-static bool bound = false, allow_slaac_only = true;
+static int urandom_fd = -1, allow_slaac_only = 0;
+static bool bound = false, release = true;
+static time_t last_update = 0;
int main(_unused int argc, char* const argv[])
{
- openlog("odhcp6c", LOG_PERROR | LOG_PID, LOG_DAEMON);
-
// Allocate ressources
const char *pidfile = NULL;
const char *script = "/usr/sbin/odhcp6c-update";
char *optpos;
uint16_t opttype;
enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
+ static struct in6_addr ifid = IN6ADDR_ANY_INIT;
bool help = false, daemonize = false;
+ int logopt = LOG_PID;
int c, request_pd = 0;
- while ((c = getopt(argc, argv, "SN:P:c:r:s:hdp:")) != -1) {
+ while ((c = getopt(argc, argv, "S::N:P:c:i:r:s:khedp:")) != -1) {
switch (c) {
case 'S':
- allow_slaac_only = false;
+ allow_slaac_only = (optarg) ? atoi(optarg) : -1;
break;
case 'N':
break;
case 'P':
- allow_slaac_only = false;
+ if (allow_slaac_only >= 0 && allow_slaac_only < 10)
+ allow_slaac_only = 10;
+
request_pd = strtoul(optarg, NULL, 10);
if (request_pd == 0)
request_pd = -1;
buf[0] = 0;
buf[1] = DHCPV6_OPT_CLIENTID;
buf[2] = 0;
- buf[4] = l;
+ buf[3] = l;
odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4);
} else {
help = true;
}
break;
+ case 'i':
+ if (inet_pton(AF_INET6, optarg, &ifid) != 1)
+ help = true;
+ break;
+
case 'r':
optpos = optarg;
while (optpos[0]) {
script = optarg;
break;
+ case 'k':
+ release = false;
+ break;
+
+ case 'e':
+ logopt |= LOG_PERROR;
+ break;
+
case 'd':
daemonize = true;
break;
}
}
+ openlog("odhcp6c", logopt, LOG_DAEMON);
const char *ifname = argv[optind];
if (help || !ifname)
return usage();
- if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
- init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
- script_init(script, ifname)) {
- syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
- return 3;
- }
-
signal(SIGIO, sighandler);
signal(SIGHUP, sighandler);
signal(SIGINT, sighandler);
signal(SIGUSR1, sighandler);
signal(SIGUSR2, sighandler);
+ if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
+ init_dhcpv6(ifname, request_pd) || ra_init(ifname, &ifid) ||
+ script_init(script, ifname)) {
+ syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
+ return 3;
+ }
+
if (daemonize) {
openlog("odhcp6c", LOG_PID, LOG_DAEMON); // Disable LOG_PERROR
if (daemon(0, 0)) {
while (do_signal != SIGTERM) { // Main logic
odhcp6c_clear_state(STATE_SERVER_ID);
- odhcp6c_clear_state(STATE_SERVER_CAND);
+ odhcp6c_clear_state(STATE_IA_NA);
odhcp6c_clear_state(STATE_IA_PD);
odhcp6c_clear_state(STATE_SNTP_IP);
odhcp6c_clear_state(STATE_SNTP_FQDN);
dhcpv6_set_ia_na_mode(ia_na_mode);
bound = false;
+ // Server candidates need deep-delete
+ size_t cand_len;
+ struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
+ for (size_t i = 0; i < cand_len / sizeof(*cand); ++i) {
+ free(cand[i].ia_na);
+ free(cand[i].ia_pd);
+ }
+ odhcp6c_clear_state(STATE_SERVER_CAND);
+
syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
do_signal = 0;
bound = false;
script_call("unbound");
- if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0))
+ if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0) && release)
dhcpv6_request(DHCPV6_MSG_RELEASE);
odhcp6c_clear_state(STATE_IA_NA);
const char buf[] =
"Usage: odhcp6c [options] <interface>\n"
"\nFeature options:\n"
- " -S Don't allow SLAAC-only (implied by -P)\n"
+ " -S <time> Wait at least <time> sec for a DHCP-server (0)\n"
" -N <mode> Mode for requesting addresses [try|force|none]\n"
" -P <length> Request IPv6-Prefix (0 = auto)\n"
" -c <clientid> Override client-ID (base-16 encoded)\n"
+ " -i <iface-id> Use a custom interface identifier for RA handling\n"
" -r <options> Options to be requested (comma-separated)\n"
" -s <script> Status update script (/usr/sbin/odhcp6c-update)\n"
+ " -k Don't send a RELEASE when stopping\n"
"\nInvocation options:\n"
" -p <pidfile> Set pidfile (/var/run/6relayd.pid)\n"
" -d Daemonize\n"
+ " -e Write logmessages to stderr\n"
//" -v Increase logging verbosity\n"
" -h Show this help\n\n";
write(STDERR_FILENO, buf, sizeof(buf));
{
if (do_signal == SIGIO) {
do_signal = 0;
- bool updated = ra_process();
- updated |= ra_rtnl_process();
- if (updated && (bound || allow_slaac_only)) {
- odhcp6c_expire();
- script_call("ra-updated");
- }
+ bool ra_updated = ra_process();
+
+ if (ra_updated && (bound || allow_slaac_only == 0))
+ script_call("ra-updated"); // Immediate process urgent events
+ else if (ra_updated && !bound && allow_slaac_only > 0)
+ script_delay_call("ra-updated", allow_slaac_only);
}
return do_signal != 0;
}
+void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len)
+{
+ *len = state_len[state];
+ void *data = state_data[state];
+
+ state_len[state] = 0;
+ state_data[state] = NULL;
+
+ return data;
+}
+
+
void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len)
{
*len = state_len[state];
if (x) {
x->valid = new->valid;
x->preferred = new->preferred;
+ x->prefix_class = new->prefix_class;
} else {
odhcp6c_add_state(state, new, sizeof(*new));
}
void odhcp6c_expire(void)
{
- static time_t last_update = 0;
time_t now = odhcp6c_get_milli_time() / 1000;
-
- uint32_t elapsed = now - last_update;
+ uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
last_update = now;
odhcp6c_expire_list(STATE_RA_PREFIX, elapsed);
}
+uint32_t odhcp6c_elapsed(void)
+{
+ return odhcp6c_get_milli_time() / 1000 - last_update;
+}
+
+
void odhcp6c_random(void *buf, size_t len)
{
read(urandom_fd, buf, len);