X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=de452c04a7fef0de9488aef00fdafcac1119e779;hp=0825610a2a61f87d6f3c11935d118b983be7a4f6;hb=8563be22c8d9e3cf38b26d69d52368c68ad3a6dd;hpb=6bdec649886d077620f4b3004782dee662f90c14 diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 0825610..de452c0 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -1,5 +1,5 @@ /** - * Copyright (C) 2012 Steven Barth + * Copyright (C) 2012-2013 Steven Barth * * 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 @@ -14,36 +14,51 @@ #include #include +#include #include #include #include +#include #include #include #include #include +#include #include #include #include #include +#include +#include #include "odhcp6c.h" +#include "ra.h" +#ifdef EXT_BFD_PING +#include "bfd.h" +#endif + +#ifndef IN6_IS_ADDR_UNIQUELOCAL +#define IN6_IS_ADDR_UNIQUELOCAL(a) \ + ((((__const uint32_t *) (a))[0] & htonl (0xfe000000)) \ + == htonl (0xfc000000)) +#endif static void sighandler(int signal); static int usage(void); - static uint8_t *state_data[_STATE_MAX] = {NULL}; static size_t state_len[_STATE_MAX] = {0}; static volatile int do_signal = 0; - +static int urandom_fd = -1, allow_slaac_only = 0; +static bool bound = false, release = true; +static time_t last_update = 0; +static char *ifname = NULL; 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"; @@ -52,27 +67,56 @@ int main(_unused int argc, char* const argv[]) char *optpos; uint16_t opttype; enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY; + enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_TRY; + static struct in6_addr ifid = IN6ADDR_ANY_INIT; + int sol_timeout = DHCPV6_SOL_MAX_RT; + +#ifdef EXT_BFD_PING + int bfd_interval = 0, bfd_loss = 3; +#endif bool help = false, daemonize = false; - int c, request_pd = 0, timeout = 0; - while ((c = getopt(argc, argv, "N:P:c:r:s:t:hdp:")) != -1) { + int logopt = LOG_PID; + int c, request_pd = 0; + while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) { switch (c) { + case 'S': + allow_slaac_only = (optarg) ? atoi(optarg) : -1; + break; + case 'N': - if (!strcmp(optarg, "force")) + if (!strcmp(optarg, "force")) { ia_na_mode = IA_MODE_FORCE; - else if (!strcmp(optarg, "none")) + allow_slaac_only = -1; + } 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 '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; + + break; + + case 'F': + allow_slaac_only = -1; + ia_pd_mode = IA_MODE_FORCE; + break; + +#ifdef EXT_BFD_PING + case 'B': + bfd_interval = atoi(optarg); break; +#endif case 'c': l = script_unhexlify(&buf[4], sizeof(buf) - 4, optarg); @@ -80,13 +124,18 @@ int main(_unused int argc, char* const argv[]) 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]) { @@ -103,8 +152,16 @@ int main(_unused int argc, char* const argv[]) script = optarg; break; + case 'k': + release = false; + break; + case 't': - timeout = strtoul(optarg, NULL, 10); + sol_timeout = atoi(optarg); + break; + + case 'e': + logopt |= LOG_PERROR; break; case 'd': @@ -121,25 +178,27 @@ int main(_unused int argc, char* const argv[]) } } - const char *ifname = argv[optind]; + openlog("odhcp6c", logopt, LOG_DAEMON); + ifname = argv[optind]; if (help || !ifname) return usage(); - if (init_dhcpv6(ifname, request_pd) || init_rtnetlink() || - 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(SIGALRM, sighandler); signal(SIGCHLD, sighandler); signal(SIGTERM, sighandler); signal(SIGUSR1, sighandler); signal(SIGUSR2, sighandler); + if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 || + init_dhcpv6(ifname, request_pd, sol_timeout) || + 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)) { @@ -164,118 +223,148 @@ int main(_unused int argc, char* const argv[]) } } + script_call("started"); + 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_IA_PD_LOST); - dhcpv6_set_ia_na_mode(ia_na_mode); + odhcp6c_clear_state(STATE_SNTP_IP); + odhcp6c_clear_state(STATE_SNTP_FQDN); + odhcp6c_clear_state(STATE_SIP_IP); + odhcp6c_clear_state(STATE_SIP_FQDN); + dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode); + bound = false; + + syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname); - alarm(timeout); do_signal = 0; - int res = dhcpv6_request(DHCPV6_MSG_SOLICIT); + int mode = dhcpv6_request(DHCPV6_MSG_SOLICIT); + odhcp6c_signal_process(); + + if (mode < 0) + continue; + + do { + int res = dhcpv6_request(mode == DHCPV6_STATELESS ? + DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST); + + odhcp6c_signal_process(); + if (res > 0) + break; + else if (do_signal > 0) { + mode = -1; + break; + } + + mode = dhcpv6_promote_server_cand(); + } while (mode > DHCPV6_UNKNOWN); + + if (mode < 0) + continue; + + switch (mode) { + case DHCPV6_STATELESS: + bound = true; + syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname); - if (res < 0) { - continue; // Might happen if we got a signal - } else if (res == DHCPV6_STATELESS) { // Stateless mode while (do_signal == 0 || do_signal == SIGUSR1) { do_signal = 0; + script_call("informed"); + + int res = dhcpv6_poll_reconfigure(); + odhcp6c_signal_process(); + + if (res > 0) + continue; + + if (do_signal == SIGUSR1) { + do_signal = 0; // Acknowledged + continue; + } else if (do_signal > 0) + break; res = dhcpv6_request(DHCPV6_MSG_INFO_REQ); + odhcp6c_signal_process(); if (do_signal == SIGUSR1) continue; else if (res < 0) break; - else if (res > 0) - script_call("informed"); - - alarm(0); - if (dhcpv6_poll_reconfigure() > 0) - script_call("informed"); } + break; - if (do_signal == SIGALRM) - script_call("timeout"); + case DHCPV6_STATEFUL: + script_call("bound"); + bound = true; + syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname); +#ifdef EXT_BFD_PING + if (bfd_interval > 0) + bfd_start(ifname, bfd_loss, bfd_interval); +#endif - continue; - } + 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) { + script_call("updated"); + continue; + } - // Stateful mode - if (dhcpv6_request(DHCPV6_MSG_REQUEST) < 0) - continue; + // Handle signal, if necessary + if (do_signal == SIGUSR1) + do_signal = 0; // Acknowledged + else if (do_signal > 0) + 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"); + continue; // Renew was successful + } + + odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding - script_call("bound"); - alarm(0); + // If we have IAs, try rebind otherwise restart + res = dhcpv6_request(DHCPV6_MSG_REBIND); + odhcp6c_signal_process(); - 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(); - if (res >= 0) { if (res > 0) - script_call("updated"); - - continue; + script_call("rebound"); + else { +#ifdef EXT_BFD_PING + bfd_stop(); +#endif + break; + } } + break; - // Handle signal, if necessary - if (do_signal == SIGUSR1) - do_signal = 0; // Acknowledged - else if (do_signal > 0) - break; // Other signal type - - size_t ia_pd_len, ia_na_len, ia_pd_new, ia_na_new; - odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); - odhcp6c_get_state(STATE_IA_NA, &ia_na_len); - - // If we have any IAs, send renew, otherwise request - int r; - if (ia_pd_len == 0 && ia_na_len == 0) - r = dhcpv6_request(DHCPV6_MSG_REQUEST); - else - r = dhcpv6_request(DHCPV6_MSG_RENEW); - if (r > 0) // Publish updates - script_call("updated"); - if (r >= 0) - continue; // Renew was successful - - odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding - - // If we have IAs, try rebind otherwise restart - res = dhcpv6_request(DHCPV6_MSG_REBIND); - - odhcp6c_get_state(STATE_IA_PD, &ia_pd_new); - odhcp6c_get_state(STATE_IA_NA, &ia_na_new); - if (res < 0 || (ia_pd_new == 0 && ia_pd_len) || - (ia_na_new == 0 && ia_na_len)) - break; // We lost all our IAs, restart - else if (res > 0) - script_call("rebound"); + default: + break; } - size_t ia_pd_len, ia_na_len, server_id_len; - uint8_t *ia_pd = odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); + odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); odhcp6c_get_state(STATE_IA_NA, &ia_na_len); odhcp6c_get_state(STATE_SERVER_ID, &server_id_len); // Add all prefixes to lost prefixes - odhcp6c_add_state(STATE_IA_PD_LOST, ia_pd, ia_pd_len); - odhcp6c_clear_state(STATE_IA_PD); + bound = false; + script_call("unbound"); - if (do_signal == SIGALRM) - script_call("timeout"); - else - script_call("unbound"); - - // Remove assigned addresses - if (ia_na_len > 0) - dhcpv6_remove_addrs(); - - 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); + odhcp6c_clear_state(STATE_IA_PD); } + script_call("stopped"); return 0; } @@ -285,15 +374,23 @@ static int usage(void) const char buf[] = "Usage: odhcp6c [options] \n" "\nFeature options:\n" + " -S