X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=de03b814f95efa86bde343374a14b6769e04cd02;hp=e81b15f92a5bcfc0a8b54895a336cdf46a8d6ace;hb=be05c0ded0257cbb82857f6d01226ef6de28befe;hpb=e1b11c518aded9136b4f44759c6e2a6be4161ee9 diff --git a/src/odhcp6c.c b/src/odhcp6c.c index e81b15f..de03b81 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -32,11 +32,14 @@ #include "odhcp6c.h" #include "ra.h" +#ifdef EXT_BFD_PING +#include "bfd.h" +#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}; @@ -60,10 +63,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 +97,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 +104,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) { @@ -231,7 +243,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 +269,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 +308,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 +322,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 +364,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 +416,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; @@ -468,7 +497,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n size_t len; struct odhcp6c_entry *x = odhcp6c_find_entry(state, new); struct odhcp6c_entry *start = odhcp6c_get_state(state, &len); - bool changed = true; if (x && x->valid > new->valid && new->valid < safe) new->valid = safe; @@ -479,9 +507,11 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n new->preferred >= x->preferred && new->preferred - x->preferred < 60 && x->class == new->class) - changed = false; + 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)); @@ -489,7 +519,7 @@ bool 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 changed; + return true; } @@ -504,6 +534,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) @@ -545,6 +585,10 @@ void odhcp6c_random(void *buf, size_t len) read(urandom_fd, buf, len); } +bool odhcp6c_is_bound(void) +{ + return bound; +} static void sighandler(int signal) {