X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=6e83c40c712a10b342434531ce34d575e31167ea;hb=4160c0e1f69910409a119322ca8a0ce719331214;hp=133ade707a788efa57e9431d5c094f59728b3ca2;hpb=dc186d6d2b0dd4ad23ca5fc69c00e81f796ff6d9;p=project%2Fodhcp6c.git diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 133ade7..6e83c40 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -1,5 +1,6 @@ /** * Copyright (C) 2012-2014 Steven Barth + * Copyright (C) 2017 Hans Dedecker * * 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,6 +15,7 @@ #include #include +#include #include #include #include @@ -22,16 +24,22 @@ #include #include #include +#include #include #include #include #include +#include #include "odhcp6c.h" #include "ra.h" - +#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); @@ -47,6 +55,7 @@ static volatile bool signal_term = false; static int urandom_fd = -1, allow_slaac_only = 0; static bool bound = false, release = true, ra = false; static time_t last_update = 0; +static char *ifname = NULL; static unsigned int min_update_interval = DEFAULT_MIN_UPDATE_INTERVAL; static unsigned int script_sync_delay = 10; @@ -54,7 +63,8 @@ static unsigned int script_accu_delay = 1; int main(_unused int argc, char* const argv[]) { - // Allocate ressources + static struct in6_addr ifid = IN6ADDR_ANY_INIT; + // Allocate resources const char *pidfile = NULL; const char *script = "/usr/sbin/odhcp6c-update"; ssize_t l; @@ -65,17 +75,15 @@ int main(_unused int argc, char* const argv[]) enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY; enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE; int ia_pd_iaid_index = 0; - static struct in6_addr ifid = IN6ADDR_ANY_INIT; int sol_timeout = DHCPV6_SOL_MAX_RT; int verbosity = 0; - - bool help = false, daemonize = false; int logopt = LOG_PID; int c; unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE; + unsigned int ra_options = RA_RDNSS_DEFAULT_LIFETIME; - while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) { + while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:Lhedp:fav")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -85,23 +93,22 @@ int main(_unused int argc, char* const argv[]) if (!strcmp(optarg, "force")) { ia_na_mode = IA_MODE_FORCE; allow_slaac_only = -1; - } else if (!strcmp(optarg, "none")) { + } 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 'V': l = script_unhexlify(buf, sizeof(buf), optarg); if (!l) - help=true; + help = true; odhcp6c_add_state(STATE_VENDORCLASS, buf, l); - break; + case 'P': if (ia_pd_mode == IA_MODE_NONE) ia_pd_mode = IA_MODE_TRY; @@ -111,7 +118,6 @@ int main(_unused int argc, char* const argv[]) char *iaid_begin; int iaid_len = 0; - int prefix_length = strtoul(optarg, &iaid_begin, 10); if (*iaid_begin != '\0' && *iaid_begin != ',' && *iaid_begin != ':') { @@ -129,7 +135,6 @@ int main(_unused int argc, char* const argv[]) prefix.iaid = htonl(++ia_pd_iaid_index); odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix)); - break; case 'F': @@ -145,9 +150,8 @@ int main(_unused int argc, char* const argv[]) buf[2] = 0; buf[3] = l; odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4); - } else { + } else help = true; - } break; case 'i': @@ -163,6 +167,7 @@ int main(_unused int argc, char* const argv[]) break; else if (optpos[0]) optarg = &optpos[1]; + odhcp6c_add_state(STATE_ORO, &opttype, 2); } break; @@ -193,6 +198,10 @@ int main(_unused int argc, char* const argv[]) min_update_interval = atoi(optarg); break; + case 'L': + ra_options &= ~RA_RDNSS_DEFAULT_LIFETIME; + break; + case 'e': logopt |= LOG_PERROR; break; @@ -230,7 +239,7 @@ int main(_unused int argc, char* const argv[]) if (!verbosity) setlogmask(LOG_UPTO(LOG_WARNING)); - const char *ifname = argv[optind]; + ifname = argv[optind]; if (help || !ifname) return usage(); @@ -244,7 +253,8 @@ int main(_unused int argc, char* const argv[]) if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 || init_dhcpv6(ifname, client_options, sol_timeout) || - ra_init(ifname, &ifid) || script_init(script, ifname)) { + ra_init(ifname, &ifid, ra_options) || + script_init(script, ifname)) { syslog(LOG_ERR, "failed to initialize: %s", strerror(errno)); return 3; } @@ -289,6 +299,7 @@ int main(_unused int argc, char* const argv[]) int mode = dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode); if (mode != DHCPV6_STATELESS) mode = dhcpv6_request(DHCPV6_MSG_SOLICIT); + odhcp6c_signal_process(); if (mode < 0) @@ -331,11 +342,13 @@ int main(_unused int argc, char* const argv[]) signal_usr1 = false; // Acknowledged continue; } + if (signal_usr2 || signal_term) break; res = dhcpv6_request(DHCPV6_MSG_INFO_REQ); odhcp6c_signal_process(); + if (signal_usr1) continue; else if (res < 0) @@ -361,12 +374,14 @@ int main(_unused int argc, char* const argv[]) // Handle signal, if necessary if (signal_usr1) signal_usr1 = false; // Acknowledged + if (signal_usr2 || signal_term) 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", 0, false); @@ -389,9 +404,8 @@ int main(_unused int argc, char* const argv[]) if (res > 0) script_call("rebound", 0, true); - else { + else break; - } } break; @@ -418,10 +432,10 @@ int main(_unused int argc, char* const argv[]) } script_call("stopped", 0, true); + return 0; } - static int usage(void) { const char buf[] = @@ -443,6 +457,7 @@ static int usage(void) " -k Don't send a RELEASE when stopping\n" " -t Maximum timeout for DHCPv6-SOLICIT (120)\n" " -m Minimum time between accepting updates (30)\n" + " -L Ignore default lifetime for RDNSS records\n" "\nInvocation options:\n" " -p Set pidfile (/var/run/odhcp6c.pid)\n" " -d Daemonize\n" @@ -450,19 +465,19 @@ static int usage(void) " -v Increase logging verbosity\n" " -h Show this help\n\n"; fputs(buf, stderr); + return 1; } - // Don't want to pull-in librt and libpthread just for a monotonic clock... uint64_t odhcp6c_get_milli_time(void) { struct timespec t = {0, 0}; syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t); + return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000; } - static uint8_t* odhcp6c_resize_state(enum odhcp6c_state state, ssize_t len) { if (len == 0) @@ -471,15 +486,16 @@ static uint8_t* odhcp6c_resize_state(enum odhcp6c_state state, ssize_t len) return NULL; uint8_t *n = realloc(state_data[state], state_len[state] + len); + if (n || state_len[state] + len == 0) { state_data[state] = n; n += state_len[state]; state_len[state] += len; } + return n; } - bool odhcp6c_signal_process(void) { while (signal_io) { @@ -502,47 +518,50 @@ bool odhcp6c_signal_process(void) return signal_usr1 || signal_usr2 || signal_term; } - void odhcp6c_clear_state(enum odhcp6c_state state) { state_len[state] = 0; } - void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len) { uint8_t *n = odhcp6c_resize_state(state, len); + if (n) memcpy(n, data, len); } -void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len) +int odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len) { ssize_t len_after = state_len[state] - offset; if (len_after < 0) - return; + return -1; uint8_t *n = odhcp6c_resize_state(state, len); + if (n) { uint8_t *sdata = state_data[state]; memmove(sdata + offset + len, sdata + offset, len_after); memcpy(sdata + offset, data, len); } + + return 0; } size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len) { uint8_t *data = state_data[state]; ssize_t len_after = state_len[state] - (offset + len); + if (len_after < 0) return state_len[state]; memmove(data + offset, data + offset + len, len_after); + return state_len[state] -= len; } - void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len) { *len = state_len[state]; @@ -554,29 +573,29 @@ void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len) return data; } - void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len) { *len = state_len[state]; + return state_data[state]; } - static struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new) { size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + ((new->length + 7) / 8); uint8_t *start = odhcp6c_get_state(state, &len); for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start; - (uint8_t*)c < &start[len] && &c->auxtarget[c->auxlen] <= &start[len]; - c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen])) + (uint8_t*)c < &start[len] && + (uint8_t*)odhcp6c_next_entry(c) <= &start[len]; + c = odhcp6c_next_entry(c)) { if (!memcmp(c, new, cmplen) && !memcmp(c->auxtarget, new->auxtarget, new->auxlen)) return c; + } return NULL; } - bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe, bool filterexcess) { @@ -596,28 +615,29 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, new->preferred != UINT32_MAX && new->preferred - x->preferred < min_update_interval) return false; + x->valid = new->valid; x->preferred = new->preferred; x->t1 = new->t1; x->t2 = new->t2; x->iaid = new->iaid; - } else { - odhcp6c_add_state(state, new, sizeof(*new) + new->auxlen); - } - } else if (x) { - odhcp6c_remove_state(state, ((uint8_t*)x) - start, sizeof(*x) + x->auxlen); - } + } else + odhcp6c_add_state(state, new, odhcp6c_entry_size(new)); + } else if (x) + odhcp6c_remove_state(state, ((uint8_t*)x) - start, odhcp6c_entry_size(x)); + return true; } - static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) { size_t len; uint8_t *start = odhcp6c_get_state(state, &len); + for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start; - (uint8_t*)c < &start[len] && &c->auxtarget[c->auxlen] <= &start[len]; - c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen])) { + (uint8_t*)c < &start[len] && + (uint8_t*)odhcp6c_next_entry(c) <= &start[len]; + ) { if (c->t1 < elapsed) c->t1 = 0; else if (c->t1 != UINT32_MAX) @@ -638,16 +658,19 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) else if (c->valid != UINT32_MAX) c->valid -= elapsed; - if (!c->valid) - odhcp6c_remove_state(state, ((uint8_t*)c) - start, sizeof(*c) + c->auxlen); + if (!c->valid) { + odhcp6c_remove_state(state, ((uint8_t*)c) - start, odhcp6c_entry_size(c)); + start = odhcp6c_get_state(state, &len); + } else + c = odhcp6c_next_entry(c); } } - void odhcp6c_expire(void) { time_t now = odhcp6c_get_milli_time() / 1000; uint32_t elapsed = (last_update > 0) ? now - last_update : 0; + last_update = now; odhcp6c_expire_list(STATE_RA_PREFIX, elapsed); @@ -658,13 +681,11 @@ void odhcp6c_expire(void) odhcp6c_expire_list(STATE_IA_PD, elapsed); } - uint32_t odhcp6c_elapsed(void) { return odhcp6c_get_milli_time() / 1000 - last_update; } - int odhcp6c_random(void *buf, size_t len) { return read(urandom_fd, buf, len); @@ -675,6 +696,58 @@ 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[IF_NAMESIZE], addr_buf[33]; + + 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 < strlen(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 < (strlen(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 == SIGUSR1)