X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=dce1e0ee7494a3893df9ebef0625d75b7c042bcb;hp=f1286e5e93b70f2c2f7a56471e898abe70480267;hb=ec864c44e9959a5d65cc564182f4e960e47c6e9e;hpb=6bbd2b0208fc17b6566595bfdfef2ff1d012d143 diff --git a/src/odhcp6c.c b/src/odhcp6c.c index f1286e5..dce1e0e 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -32,9 +32,6 @@ #include "odhcp6c.h" #include "ra.h" -#ifdef EXT_BFD_PING -#include "bfd.h" -#endif static void sighandler(int signal); @@ -69,17 +66,15 @@ int main(_unused int argc, char* const argv[]) int ia_pd_iaid_index = 0; static struct in6_addr ifid = IN6ADDR_ANY_INIT; int sol_timeout = DHCPV6_SOL_MAX_RT; + int verbosity = 0; -#ifdef EXT_BFD_PING - int bfd_interval = 0, bfd_loss = 3; -#endif bool help = false, daemonize = false; int logopt = LOG_PID; int c; unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE; - while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fa")) != -1) { + while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -141,12 +136,6 @@ 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) { @@ -223,6 +212,10 @@ int main(_unused int argc, char* const argv[]) client_options &= ~DHCPV6_ACCEPT_RECONFIGURE; break; + case 'v': + ++verbosity; + break; + default: help = true; break; @@ -230,6 +223,9 @@ int main(_unused int argc, char* const argv[]) } openlog("odhcp6c", logopt, LOG_DAEMON); + if (!verbosity) + setlogmask(LOG_UPTO(LOG_WARNING)); + const char *ifname = argv[optind]; if (help || !ifname) @@ -258,19 +254,15 @@ int main(_unused int argc, char* const argv[]) return 4; } - char pidbuf[128]; if (!pidfile) { - snprintf(pidbuf, sizeof(pidbuf), - "/var/run/odhcp6c.%s.pid", ifname); - pidfile = pidbuf; + snprintf((char*)buf, sizeof(buf), "/var/run/odhcp6c.%s.pid", ifname); + pidfile = (char*)buf; } - int fd = open(pidfile, O_WRONLY | O_CREAT, 0644); - if (fd >= 0) { - char buf[8]; - int len = snprintf(buf, sizeof(buf), "%i\n", getpid()); - write(fd, buf, len); - close(fd); + FILE *fp = fopen(pidfile, "w"); + if (fp) { + fprintf(fp, "%i\n", getpid()); + fclose(fp); } } @@ -278,6 +270,7 @@ int main(_unused int argc, char* const argv[]) while (!signal_term) { // Main logic odhcp6c_clear_state(STATE_SERVER_ID); + odhcp6c_clear_state(STATE_SERVER_ADDR); odhcp6c_clear_state(STATE_IA_NA); odhcp6c_clear_state(STATE_IA_PD); odhcp6c_clear_state(STATE_SNTP_IP); @@ -347,13 +340,9 @@ int main(_unused int argc, char* const argv[]) break; case DHCPV6_STATEFUL: - script_call("bound"); bound = true; + script_call("bound"); 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 (!signal_usr2 && !signal_term) { // Renew Cycle @@ -381,6 +370,7 @@ int main(_unused int argc, char* const argv[]) } odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding + odhcp6c_clear_state(STATE_SERVER_ADDR); size_t ia_pd_len, ia_na_len; odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); @@ -396,9 +386,6 @@ int main(_unused int argc, char* const argv[]) if (res > 0) script_call("rebound"); else { -#ifdef EXT_BFD_PING - bfd_stop(); -#endif break; } } @@ -408,6 +395,8 @@ int main(_unused int argc, char* const argv[]) break; } + odhcp6c_expire(); + size_t ia_pd_len, ia_na_len, server_id_len; odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); odhcp6c_get_state(STATE_IA_NA, &ia_na_len); @@ -439,11 +428,8 @@ static int usage(void) " -P Request IPv6-Prefix (0 = auto)\n" " -F Force IPv6-Prefix\n" " -V Set vendor-class option (base-16 encoded)\n" -#ifdef EXT_BFD_PING - " -B Enable BFD ping check\n" -#endif " -u Set user-class option string\n" - " -c Override client-ID (base-16 encoded)\n" + " -c Override client-ID (base-16 encoded 16-bit type + value)\n" " -i Use a custom interface identifier for RA handling\n" " -r Options to be requested (comma-separated)\n" " -R Do not request any options except those specified with -r\n" @@ -457,9 +443,9 @@ static int usage(void) " -p Set pidfile (/var/run/odhcp6c.pid)\n" " -d Daemonize\n" " -e Write logmessages to stderr\n" - //" -v Increase logging verbosity\n" + " -v Increase logging verbosity\n" " -h Show this help\n\n"; - write(STDERR_FILENO, buf, sizeof(buf)); + fputs(buf, stderr); return 1; } @@ -500,14 +486,8 @@ bool odhcp6c_signal_process(void) if (ra_link_up()) signal_usr2 = true; - if (ra_updated && (bound || allow_slaac_only == 0)) + 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 signal_usr1 || signal_usr2 || signal_term; @@ -587,7 +567,8 @@ struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct } -bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe) +bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, + uint32_t safe, bool filterexcess) { size_t len; struct odhcp6c_entry *x = odhcp6c_find_entry(state, new); @@ -598,7 +579,8 @@ bool 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 != UINT32_MAX && + if (filterexcess && new->valid >= x->valid && + new->valid != UINT32_MAX && new->valid - x->valid < min_update_interval && new->preferred >= x->preferred && new->preferred != UINT32_MAX && @@ -621,12 +603,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n } -bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new) -{ - return odhcp6c_update_entry_safe(state, new, 0); -} - - static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) { size_t len; @@ -678,9 +654,9 @@ uint32_t odhcp6c_elapsed(void) } -void odhcp6c_random(void *buf, size_t len) +int odhcp6c_random(void *buf, size_t len) { - read(urandom_fd, buf, len); + return read(urandom_fd, buf, len); } bool odhcp6c_is_bound(void)