X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fscript.c;h=5a021dff5a2297b44978572f975e5909ad0748fb;hp=b94b25e9803acf8c0ce2cbc832a7d138c3ed661e;hb=62ea2821e389332d13cc05eb1ac6e77a7787f2db;hpb=a300c7335c5ad78fb053e7c73b45e95e1f3c2ad1 diff --git a/src/script.c b/src/script.c index b94b25e..5a021df 100644 --- a/src/script.c +++ b/src/script.c @@ -13,10 +13,12 @@ */ #include +#include #include #include #include #include +#include #include #include #include @@ -38,6 +40,8 @@ static const int8_t hexvals[] = { static char *argv[4] = {NULL, NULL, NULL, NULL}; +static volatile char *delayed_call = NULL; +static bool dont_delay = false; int script_init(const char *path, const char *ifname) @@ -96,13 +100,14 @@ static void ipv6_to_env(const char *name, static void fqdn_to_env(const char *name, const uint8_t *fqdn, size_t len) { size_t buf_len = strlen(name); + size_t buf_size = len + buf_len + 2; const uint8_t *fqdn_end = fqdn + len; char *buf = realloc(NULL, len + buf_len + 2); memcpy(buf, name, buf_len); buf[buf_len++] = '='; int l = 1; while (l > 0 && fqdn < fqdn_end) { - l = dn_expand(fqdn, &fqdn[len], fqdn, &buf[buf_len], len); + l = dn_expand(fqdn, fqdn_end, fqdn, &buf[buf_len], buf_size - buf_len); fqdn += l; buf_len += strlen(&buf[buf_len]); buf[buf_len++] = ' '; @@ -112,6 +117,29 @@ static void fqdn_to_env(const char *name, const uint8_t *fqdn, size_t len) } +static void fqdn_to_ip_env(const char *name, const uint8_t *fqdn, size_t len) +{ + size_t buf_len = strlen(name); + char *buf = realloc(NULL, INET6_ADDRSTRLEN + buf_len + 3); + memcpy(buf, name, buf_len); + buf[buf_len++] = '='; + + char namebuf[256]; + if (dn_expand(fqdn, fqdn + len, fqdn, namebuf, sizeof(namebuf)) <= 0) + return; + + struct addrinfo hints = {.ai_family = AF_INET6}, *r; + if (getaddrinfo(namebuf, NULL, &hints, &r)) + return; + + struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)r->ai_addr; + inet_ntop(AF_INET6, &sin6->sin6_addr, &buf[buf_len], INET6_ADDRSTRLEN); + + freeaddrinfo(r); + putenv(buf); +} + + static void bin_to_env(uint8_t *opts, size_t len) { uint8_t *oend = opts + len, *odata; @@ -128,8 +156,14 @@ static void bin_to_env(uint8_t *opts, size_t len) } } +enum entry_type { + ENTRY_ADDRESS, + ENTRY_HOST, + ENTRY_ROUTE, + ENTRY_PREFIX +}; -static void entry_to_env(const char *name, const void *data, size_t len, bool host, bool route) +static void entry_to_env(const char *name, const void *data, size_t len, enum entry_type type) { size_t buf_len = strlen(name); const struct odhcp6c_entry *e = data; @@ -140,9 +174,9 @@ static void entry_to_env(const char *name, const void *data, size_t len, bool ho for (size_t i = 0; i < len / sizeof(*e); ++i) { inet_ntop(AF_INET6, &e[i].target, &buf[buf_len], INET6_ADDRSTRLEN); buf_len += strlen(&buf[buf_len]); - if (!host) { + if (type != ENTRY_HOST) { buf_len += snprintf(&buf[buf_len], 6, "/%hhu", e[i].length); - if (route) { + if (type == ENTRY_ROUTE) { buf[buf_len++] = ','; if (!IN6_IS_ADDR_UNSPECIFIED(&e[i].router)) { inet_ntop(AF_INET6, &e[i].router, &buf[buf_len], INET6_ADDRSTRLEN); @@ -153,6 +187,17 @@ static void entry_to_env(const char *name, const void *data, size_t len, bool ho } else { buf_len += snprintf(&buf[buf_len], 24, ",%u,%u", e[i].preferred, e[i].valid); } + + if ((type == ENTRY_PREFIX || type == ENTRY_ADDRESS) && e[i].class) + buf_len += snprintf(&buf[buf_len], 12, ",class=%u", e[i].class); + + if (type == ENTRY_PREFIX && e[i].priority) { + // priority and router are abused for prefix exclusion + buf_len += snprintf(&buf[buf_len], 12, ",excluded="); + inet_ntop(AF_INET6, &e[i].router, &buf[buf_len], INET6_ADDRSTRLEN); + buf_len += strlen(&buf[buf_len]); + buf_len += snprintf(&buf[buf_len], 24, "/%u", e[i].priority); + } } buf[buf_len++] = ' '; } @@ -162,18 +207,45 @@ static void entry_to_env(const char *name, const void *data, size_t len, bool ho } +static void script_call_delayed(int signal __attribute__((unused))) +{ + if (delayed_call) + script_call((char*)delayed_call); +} + + +void script_delay_call(const char *status, int timeout) +{ + if (dont_delay) { + script_call(status); + } else if (!delayed_call) { + delayed_call = strdup(status); + signal(SIGALRM, script_call_delayed); + alarm(timeout); + } +} + + void script_call(const char *status) { - size_t dns_len, search_len, custom_len, sntp_ip_len, sntp_dns_len; - size_t sip_ip_len, sip_fqdn_len; + size_t dns_len, search_len, custom_len, sntp_ip_len, ntp_ip_len, ntp_dns_len; + size_t sip_ip_len, sip_fqdn_len, aftr_name_len; + + odhcp6c_expire(); + if (delayed_call) { + alarm(0); + dont_delay = true; + } struct in6_addr *dns = odhcp6c_get_state(STATE_DNS, &dns_len); uint8_t *search = odhcp6c_get_state(STATE_SEARCH, &search_len); uint8_t *custom = odhcp6c_get_state(STATE_CUSTOM_OPTS, &custom_len); struct in6_addr *sntp = odhcp6c_get_state(STATE_SNTP_IP, &sntp_ip_len); - uint8_t *sntp_dns = odhcp6c_get_state(STATE_SNTP_FQDN, &sntp_dns_len); + struct in6_addr *ntp = odhcp6c_get_state(STATE_NTP_IP, &ntp_ip_len); + uint8_t *ntp_dns = odhcp6c_get_state(STATE_NTP_FQDN, &ntp_dns_len); struct in6_addr *sip = odhcp6c_get_state(STATE_SIP_IP, &sip_ip_len); uint8_t *sip_fqdn = odhcp6c_get_state(STATE_SIP_FQDN, &sip_fqdn_len); + uint8_t *aftr_name = odhcp6c_get_state(STATE_AFTR_NAME, &aftr_name_len); size_t prefix_len, address_len, ra_pref_len, ra_route_len, ra_dns_len; uint8_t *prefix = odhcp6c_get_state(STATE_IA_PD, &prefix_len); @@ -186,16 +258,19 @@ void script_call(const char *status) if (fork() == 0) { ipv6_to_env("RDNSS", dns, dns_len / sizeof(*dns)); ipv6_to_env("SNTP_IP", sntp, sntp_ip_len / sizeof(*sntp)); + ipv6_to_env("NTP_IP", ntp, ntp_ip_len / sizeof(*ntp)); + fqdn_to_env("NTP_FQDN", ntp_dns, ntp_dns_len); ipv6_to_env("SIP_IP", sip, sip_ip_len / sizeof(*sip)); fqdn_to_env("DOMAINS", search, search_len); - fqdn_to_env("SNTP_FQDN", sntp_dns, sntp_dns_len); fqdn_to_env("SIP_DOMAIN", sip_fqdn, sip_fqdn_len); + fqdn_to_env("AFTR", aftr_name, aftr_name_len); + fqdn_to_ip_env("AFTR_IP", aftr_name, aftr_name_len); bin_to_env(custom, custom_len); - entry_to_env("PREFIXES", prefix, prefix_len, false, false); - entry_to_env("ADDRESSES", address, address_len, false, false); - entry_to_env("RA_ADDRESSES", ra_pref, ra_pref_len, false, false); - entry_to_env("RA_ROUTES", ra_route, ra_route_len, false, true); - entry_to_env("RA_DNS", ra_dns, ra_dns_len, true, false); + entry_to_env("PREFIXES", prefix, prefix_len, ENTRY_PREFIX); + entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS); + entry_to_env("RA_ADDRESSES", ra_pref, ra_pref_len, ENTRY_ADDRESS); + entry_to_env("RA_ROUTES", ra_route, ra_route_len, ENTRY_ROUTE); + entry_to_env("RA_DNS", ra_dns, ra_dns_len, ENTRY_HOST); argv[2] = (char*)status; execv(argv[0], argv);