/**
- * 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
static size_t state_len[_STATE_MAX] = {0};
static volatile int do_signal = 0;
-static int urandom_fd = -1;
-static bool bound = false;
+static int urandom_fd = -1, allow_slaac_only = 0;
+static bool bound = false, release = true;
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";
enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
bool help = false, daemonize = false;
+ int logopt = LOG_PID;
int c, request_pd = 0;
- while ((c = getopt(argc, argv, "N:P:c:r:s:hdp:")) != -1) {
+ while ((c = getopt(argc, argv, "S::N:P:c:r:s:khedp:")) != -1) {
switch (c) {
+ case 'S':
+ allow_slaac_only = (optarg) ? atoi(optarg) : -1;
+ break;
+
case 'N':
if (!strcmp(optarg, "force"))
ia_na_mode = IA_MODE_FORCE;
break;
case 'P':
+ 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;
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) ||
+ 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)) {
dhcpv6_set_ia_na_mode(ia_na_mode);
bound = false;
+ syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
+
do_signal = 0;
int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
+ odhcp6c_signal_process();
if (res < 0) {
continue; // Might happen if we got a signal
do_signal = 0;
res = dhcpv6_request(DHCPV6_MSG_INFO_REQ);
+ odhcp6c_signal_process();
if (do_signal == SIGUSR1)
continue;
else if (res < 0)
script_call("informed");
bound = true;
+ syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
if (dhcpv6_poll_reconfigure() > 0)
script_call("informed");
if (dhcpv6_request(DHCPV6_MSG_REQUEST) < 0)
continue;
+ odhcp6c_signal_process();
script_call("bound");
bound = true;
+ syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
while (do_signal == 0 || do_signal == SIGUSR1) {
// Renew Cycle
// Wait for T1 to expire or until we get a reconfigure
int res = dhcpv6_poll_reconfigure();
+ odhcp6c_signal_process();
if (res >= 0) {
if (res > 0)
script_call("updated");
r = dhcpv6_request(DHCPV6_MSG_REQUEST);
else
r = dhcpv6_request(DHCPV6_MSG_RENEW);
+ odhcp6c_signal_process();
if (r > 0) // Publish updates
script_call("updated");
if (r >= 0)
// If we have IAs, try rebind otherwise restart
res = dhcpv6_request(DHCPV6_MSG_REBIND);
+ odhcp6c_signal_process();
odhcp6c_get_state(STATE_IA_PD, &ia_pd_new);
odhcp6c_get_state(STATE_IA_NA, &ia_na_new);
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 <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"
" -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 (len == 0)
return state_data[state] + state_len[state];
+ else if (state_len[state] + len > 1024)
+ return NULL;
uint8_t *n = realloc(state_data[state], state_len[state] + len);
if (n || state_len[state] + len == 0) {
{
if (do_signal == SIGIO) {
do_signal = 0;
- bool updated = ra_process();
- updated |= ra_rtnl_process();
- if (updated && bound) {
- odhcp6c_expire();
- script_call("ra-updated");
- }
+ bool ra_updated = ra_process();
+
+ if (ra_rtnl_process() || (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_update_entry_safe(enum odhcp6c_state state, const struct odhcp6c_entry *new, uint32_t safe)
+void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
{
size_t len;
struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
if (x && x->valid > new->valid && new->valid < safe)
- return;
+ new->valid = safe;
if (new->valid > 0) {
- if (x)
- *x = *new;
- else
+ if (x) {
+ x->valid = new->valid;
+ x->preferred = new->preferred;
+ } else {
odhcp6c_add_state(state, new, sizeof(*new));
+ }
} else if (x) {
odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x));
}
}
-void odhcp6c_update_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
+void odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
{
odhcp6c_update_entry_safe(state, new, 0);
}
odhcp6c_expire_list(STATE_RA_PREFIX, elapsed);
odhcp6c_expire_list(STATE_RA_ROUTE, elapsed);
+ odhcp6c_expire_list(STATE_RA_DNS, elapsed);
odhcp6c_expire_list(STATE_IA_NA, elapsed);
odhcp6c_expire_list(STATE_IA_PD, elapsed);
}