X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fscript.c;h=9d88daf43676054a4c415b917b8f8a7931d38452;hp=2a34ea00191e62779d58a91aa5d7aa7cdd80b93b;hb=aeb7c37224051811553c898b2a784944f26276b0;hpb=0b77e6065dc833da19ddff6e04e4f09c805c6883 diff --git a/src/script.c b/src/script.c index 2a34ea0..9d88daf 100644 --- a/src/script.c +++ b/src/script.c @@ -1,5 +1,5 @@ /** - * Copyright (C) 2012 Steven Barth + * Copyright (C) 2012-2013 Steven Barth * * 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 @@ -13,9 +13,12 @@ */ #include +#include #include #include #include +#include +#include #include #include #include @@ -23,7 +26,7 @@ #include "odhcp6c.h" static const char hexdigits[] = "0123456789abcdef"; -static const char hexvals[] = { +static const int8_t hexvals[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -1, -1, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -37,6 +40,7 @@ static const char hexvals[] = { static char *argv[4] = {NULL, NULL, NULL, NULL}; +static volatile char *delayed_call = NULL; int script_init(const char *path, const char *ifname) @@ -57,7 +61,8 @@ ssize_t script_unhexlify(uint8_t *dst, size_t len, const char *src) || y < 0 || (y = hexvals[y]) < 0) return -1; dst[c] = x << 4 | y; - while (*src < 0 || (*src && hexvals[(uint8_t)*src] < 0)) + while (((int8_t)*src) < 0 || + (*src && hexvals[(uint8_t)*src] < 0)) src++; } @@ -65,7 +70,7 @@ ssize_t script_unhexlify(uint8_t *dst, size_t len, const char *src) } -void script_hexlify(char *dst, const uint8_t *src, size_t len) { +static void script_hexlify(char *dst, const uint8_t *src, size_t len) { for (size_t i = 0; i < len; ++i) { *dst++ = hexdigits[src[i] >> 4]; *dst++ = hexdigits[src[i] & 0x0f]; @@ -94,13 +99,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++] = ' '; @@ -110,6 +116,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; @@ -126,52 +155,112 @@ static void bin_to_env(uint8_t *opts, size_t len) } } +enum entry_type { + ENTRY_ADDRESS, + ENTRY_HOST, + ENTRY_ROUTE, + ENTRY_PREFIX +}; -static void prefix_to_env(const char *name, const uint8_t *fqdn, size_t len) +static void entry_to_env(const char *name, const void *data, size_t len, enum entry_type type) { size_t buf_len = strlen(name); - struct dhcpv6_ia_prefix *p = NULL; - char *buf = realloc(NULL, buf_len + 2 + - (len / sizeof(*p)) * (INET6_ADDRSTRLEN + 32)); + const struct odhcp6c_entry *e = data; + char *buf = realloc(NULL, buf_len + 2 + (len / sizeof(*e)) * 144); memcpy(buf, name, buf_len); buf[buf_len++] = '='; - uint16_t otype, olen; - uint8_t *odata; - dhcpv6_for_each_option(fqdn, &fqdn[len], otype, olen, odata) { - if (otype != DHCPV6_OPT_IA_PREFIX || olen + 4U < sizeof(*p)) - continue; - - p = (struct dhcpv6_ia_prefix*)&odata[-4]; - inet_ntop(AF_INET6, &p->addr, &buf[buf_len], INET6_ADDRSTRLEN); + 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]); - buf_len += snprintf(&buf[buf_len], 32, "/%hhu,%u,%u ", - p->prefix, ntohl(p->preferred), - ntohl(p->valid)); + if (type != ENTRY_HOST) { + buf_len += snprintf(&buf[buf_len], 6, "/%hhu", e[i].length); + 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); + buf_len += strlen(&buf[buf_len]); + } + buf_len += snprintf(&buf[buf_len], 24, ",%u", e[i].valid); + buf_len += snprintf(&buf[buf_len], 12, ",%u", e[i].priority); + } else { + buf_len += snprintf(&buf[buf_len], 24, ",%u,%u", e[i].preferred, e[i].valid); + } + + 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++] = ' '; } + buf[buf_len - 1] = '\0'; putenv(buf); } +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 (!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; + size_t dns_len, search_len, custom_len, sntp_ip_len, sntp_dns_len; + size_t sip_ip_len, sip_fqdn_len, aftr_name_len; + + odhcp6c_expire(); + if (delayed_call) + alarm(0); + 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 *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, lost_pd_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); - uint8_t *lost_pd = odhcp6c_get_state(STATE_IA_PD_LOST, &lost_pd_len); + uint8_t *address = odhcp6c_get_state(STATE_IA_NA, &address_len); + uint8_t *ra_pref = odhcp6c_get_state(STATE_RA_PREFIX, &ra_pref_len); + uint8_t *ra_route = odhcp6c_get_state(STATE_RA_ROUTE, &ra_route_len); + uint8_t *ra_dns = odhcp6c_get_state(STATE_RA_DNS, &ra_dns_len); // Don't set environment before forking, because env is leaky. 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("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); - prefix_to_env("PREFIXES", prefix, prefix_len); - prefix_to_env("PREFIXES_LOST", lost_pd, lost_pd_len); + 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); @@ -179,6 +268,5 @@ void script_call(const char *status) } // Delete lost prefixes and user opts - odhcp6c_clear_state(STATE_IA_PD_LOST); odhcp6c_clear_state(STATE_CUSTOM_OPTS); }