X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=460f230fb3811cac66305ce6467455f40bd313bd;hb=1234ab04386fd63eafb19ecf245b730d6461e869;hp=5c433af31e7c90b1fcad9746be36d29734cc6aab;hpb=2037bd1f310239f1982f3bd2f541ba409ee16b6a;p=odhcp6c.git diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 5c433af..460f230 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -22,21 +23,31 @@ #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}; @@ -44,7 +55,7 @@ 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[]) { @@ -60,10 +71,14 @@ int main(_unused int argc, char* const argv[]) static struct in6_addr ifid = IN6ADDR_ANY_INIT; int sol_timeout = 120; +#ifdef EXT_BFD_PING + int bfd_interval = 0, bfd_loss = 3; +#endif + bool help = false, daemonize = false; int logopt = LOG_PID; int c, request_pd = 0; - while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:kt:hedp:")) != -1) { + 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; @@ -90,7 +105,6 @@ int main(_unused int argc, char* const argv[]) if (request_pd == 0) request_pd = -1; - ia_pd_mode = IA_MODE_TRY; break; case 'F': @@ -98,6 +112,12 @@ int main(_unused int argc, char* const argv[]) 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); if (l > 0) { @@ -159,7 +179,7 @@ int main(_unused int argc, char* const argv[]) } openlog("odhcp6c", logopt, LOG_DAEMON); - const char *ifname = argv[optind]; + ifname = argv[optind]; if (help || !ifname) return usage(); @@ -231,7 +251,7 @@ int main(_unused int argc, char* const argv[]) int res = dhcpv6_request(DHCPV6_MSG_SOLICIT); odhcp6c_signal_process(); - if (res < 0) { + 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) { @@ -257,23 +277,25 @@ int main(_unused int argc, char* const argv[]) } // Stateful mode - if (dhcpv6_request(DHCPV6_MSG_REQUEST) < 0) + 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); +#ifdef EXT_BFD_PING + if (bfd_interval > 0) + bfd_start(ifname, bfd_loss, bfd_interval); +#endif 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"); - + if (res > 0) { + script_call("updated"); continue; } @@ -294,10 +316,11 @@ int main(_unused int argc, char* const argv[]) else r = dhcpv6_request(DHCPV6_MSG_RENEW); odhcp6c_signal_process(); - if (r > 0) // Publish updates + if (r > 0) { // Renew was succesfull + // Publish updates script_call("updated"); - if (r >= 0) continue; // Renew was successful + } odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding @@ -307,13 +330,17 @@ int main(_unused int argc, char* const argv[]) 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) || + 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"); } +#ifdef EXT_BFD_PING + bfd_stop(); +#endif + size_t ia_pd_len, ia_na_len, server_id_len; odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); @@ -345,6 +372,9 @@ static int usage(void) " -N Mode for requesting addresses [try|force|none]\n" " -P Request IPv6-Prefix (0 = auto)\n" " -F Force IPv6-Prefix\n" +#ifdef EXT_BFD_PING + " -B Enable BFD ping check\n" +#endif " -c Override client-ID (base-16 encoded)\n" " -i Use a custom interface identifier for RA handling\n" " -r Options to be requested (comma-separated)\n" @@ -394,10 +424,17 @@ bool odhcp6c_signal_process(void) do_signal = 0; bool ra_updated = ra_process(); + if (ra_link_up()) + do_signal = SIGUSR2; + 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); + +#ifdef EXT_BFD_PING + bfd_receive(); +#endif } return do_signal != 0; @@ -463,7 +500,7 @@ struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct } -void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe) +bool 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); @@ -474,8 +511,15 @@ void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n if (new->valid > 0) { if (x) { + if (new->valid >= x->valid && new->valid - x->valid < 60 && + new->preferred >= x->preferred && + new->preferred - x->preferred < 60 && + x->class == new->class) + return false; x->valid = new->valid; x->preferred = new->preferred; + x->t1 = new->t1; + x->t2 = new->t2; x->class = new->class; } else { odhcp6c_add_state(state, new, sizeof(*new)); @@ -483,12 +527,13 @@ void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n } else if (x) { odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x)); } + return true; } -void odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new) +bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new) { - odhcp6c_update_entry_safe(state, new, 0); + return odhcp6c_update_entry_safe(state, new, 0); } @@ -497,6 +542,16 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) size_t len; struct odhcp6c_entry *start = odhcp6c_get_state(state, &len); for (struct odhcp6c_entry *c = start; c < &start[len / sizeof(*c)]; ++c) { + if (c->t1 < elapsed) + c->t1 = 0; + else if (c->t1 != UINT32_MAX) + c->t1 -= elapsed; + + if (c->t2 < elapsed) + c->t2 = 0; + else if (c->t2 != UINT32_MAX) + c->t2 -= elapsed; + if (c->preferred < elapsed) c->preferred = 0; else if (c->preferred != UINT32_MAX) @@ -539,6 +594,63 @@ void odhcp6c_random(void *buf, size_t len) } +bool odhcp6c_is_bound(void) +{ + return bound; +} + + +bool odhcp6c_addr_in_scope(const struct in6_addr *addr) +{ + FILE *fd = fopen("/proc/net/if_inet6", "r"); + int len; + char buf[256]; + + if (fd == NULL) + return false; + + while (fgets(buf, sizeof(buf), fd)) { + struct in6_addr inet6_addr; + uint32_t flags, dummy; + unsigned int i; + char name[8], addr_buf[32]; + + len = strlen(buf); + + if ((len <= 0) || buf[len - 1] != '\n') + return false; + + buf[--len] = '\0'; + + if (sscanf(buf, "%s %x %x %x %x %s", + addr_buf, &dummy, &dummy, &dummy, &flags, name) != 6) + return false; + + if (strcmp(name, ifname) || + (flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE | IFA_F_DEPRECATED))) + continue; + + for (i = 0; i < sizeof(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++) { + unsigned char byte; + static const char hex[] = "0123456789abcdef"; + byte = ((index(hex, addr_buf[i * 2]) - hex) << 4) | + (index(hex, addr_buf[i * 2 + 1]) - hex); + inet6_addr.s6_addr[i] = byte; + } + + if ((IN6_IS_ADDR_LINKLOCAL(&inet6_addr) == IN6_IS_ADDR_LINKLOCAL(addr)) && + (IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr))) + return true; + } + return false; +} + static void sighandler(int signal) { if (signal == SIGCHLD)