X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fscript.c;h=219d034d82f75f75cbcd3da4d1e1ddd238d13d2f;hp=6caaffd7f19e67ed149e0cb9551690c475e2c130;hb=68042ddafe0e1a3498b6c7a57ec8d2d20f25650b;hpb=523cd46be873ce76b67bc2b3b1f26f6491815ca0 diff --git a/src/script.c b/src/script.c index 6caaffd..219d034 100644 --- a/src/script.c +++ b/src/script.c @@ -41,8 +41,6 @@ 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) @@ -117,30 +115,6 @@ static void fqdn_to_env(const char *name, const uint8_t *fqdn, size_t len) putenv(buf); } - -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; @@ -189,9 +163,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en 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); - else if (type == ENTRY_PREFIX && ntohl(e[i].iaid) != 1) + if (type == ENTRY_PREFIX && ntohl(e[i].iaid) != 1) buf_len += snprintf(&buf[buf_len], 16, ",class=%08x", ntohl(e[i].iaid)); if (type == ENTRY_PREFIX && e[i].priority) { @@ -209,7 +181,35 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en putenv(buf); } -#ifdef EXT_S46 + +static void search_to_env(const char *name, const uint8_t *start, size_t len) +{ + size_t buf_len = strlen(name); + char *buf = realloc(NULL, buf_len + 2 + len); + char *c = mempcpy(buf, name, buf_len); + *c++ = '='; + + for (struct odhcp6c_entry *e = (struct odhcp6c_entry*)start; + (uint8_t*)e < &start[len] && &e->auxtarget[e->auxlen] <= &start[len]; + e = (struct odhcp6c_entry*)(&e->auxtarget[e->auxlen])) { + c = mempcpy(c, e->auxtarget, e->auxlen); + *c++ = ' '; + } + + c[-1] = '\0'; + putenv(buf); +} + + +static void int_to_env(const char *name, int value) +{ + size_t len = 12 + strlen(name); + char *buf = realloc(NULL, len); + snprintf(buf, len, "%s=%d", name, value); + putenv(buf); +} + + static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp) { uint8_t *odata; @@ -223,13 +223,16 @@ static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp) } } } -#endif + static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len) { const char *name = (state == STATE_S46_MAPE) ? "MAPE" : (state == STATE_S46_MAPT) ? "MAPT" : "LW4O6"; + if (len == 0) + return; + char *str; size_t strsize; @@ -237,12 +240,13 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len fputs(name, fp); fputc('=', fp); -#ifdef EXT_S46 + const char *type = (state == STATE_S46_MAPE) ? "map-e" : + (state == STATE_S46_MAPT) ? "map-t" : "lw4o6"; + uint8_t *odata; uint16_t otype, olen; dhcpv6_for_each_option(data, &data[len], otype, olen, odata) { struct dhcpv6_s46_rule *rule = (struct dhcpv6_s46_rule*)odata; - struct dhcpv6_s46_dmr *dmr = (struct dhcpv6_s46_dmr*)odata; struct dhcpv6_s46_v4v6bind *bind = (struct dhcpv6_s46_v4v6bind*)odata; if (state != STATE_S46_LW && otype == DHCPV6_OPT_S46_RULE && @@ -265,8 +269,8 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len if (rule->flags & 1) fputs("fmr,", fp); - fprintf(fp, "ealen=%d,prefix4len=%d,prefix6len=%d,ipv4prefix=%s,ipv6prefix=%s,", - rule->ea_len, rule->prefix4_len, rule->prefix6_len, buf4, buf6); + fprintf(fp, "type=%s,ealen=%d,prefix4len=%d,prefix6len=%d,ipv4prefix=%s,ipv6prefix=%s,", + type, rule->ea_len, rule->prefix4_len, rule->prefix6_len, buf4, buf6); s46_to_env_portparams(&rule->ipv6_prefix[prefix6len], olen - sizeof(*rule) - prefix6len, fp); @@ -278,6 +282,7 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len fprintf(fp, "br=%s,", buf6); } else if (state == STATE_S46_MAPT && otype == DHCPV6_OPT_S46_DMR && olen >= sizeof(struct dhcpv6_s46_dmr)) { + struct dhcpv6_s46_dmr *dmr = (struct dhcpv6_s46_dmr*)odata; memset(&in6, 0, sizeof(in6)); size_t prefix6len = dmr->dmr_prefix6_len; prefix6len = (prefix6len % 8 == 0) ? prefix6len / 8 : prefix6len / 8 + 1; @@ -290,6 +295,8 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len fprintf(fp, "dmr=%s/%d,", buf6, dmr->dmr_prefix6_len); } } + + fputc(' ', fp); } else if (state == STATE_S46_LW && otype == DHCPV6_OPT_S46_V4V6BIND && olen >= sizeof(struct dhcpv6_s46_v4v6bind)) { char buf4[INET_ADDRSTRLEN]; @@ -307,8 +314,8 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len inet_ntop(AF_INET, &bind->ipv4_address, buf4, sizeof(buf4)); inet_ntop(AF_INET6, &in6, buf6, sizeof(buf6)); - fprintf(fp, "ipv4address=%s,prefix6len=%d,ipv6prefix=%s,", - buf4, bind->bindprefix6_len, buf6); + fprintf(fp, "type=%s,prefix4len=32,prefix6len=%d,ipv4prefix=%s,ipv6prefix=%s,", + type, bind->bindprefix6_len, buf4, buf6); s46_to_env_portparams(&bind->bind_ipv6_prefix[prefix6len], olen - sizeof(*bind) - prefix6len, fp); @@ -319,50 +326,25 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len fprintf(fp, "br=%s,", buf6); } } - } - fputc(' ', fp); + fputc(' ', fp); + } } -#else - if (data && len) {} -#endif fclose(fp); putenv(str); } -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, ntp_ip_len, ntp_dns_len; - size_t sip_ip_len, sip_fqdn_len, aftr_name_len, cer_len; - size_t s46_mapt_len, s46_mape_len, s46_lw_len; + size_t sip_ip_len, sip_fqdn_len, aftr_name_len, cer_len, addr_len; + size_t s46_mapt_len, s46_mape_len, s46_lw_len, passthru_len; odhcp6c_expire(); - if (delayed_call) { - alarm(0); - dont_delay = true; - } + struct in6_addr *addr = odhcp6c_get_state(STATE_SERVER_ADDR, &addr_len); 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); @@ -376,16 +358,20 @@ void script_call(const char *status) uint8_t *s46_mapt = odhcp6c_get_state(STATE_S46_MAPT, &s46_mapt_len); uint8_t *s46_mape = odhcp6c_get_state(STATE_S46_MAPE, &s46_mape_len); uint8_t *s46_lw = odhcp6c_get_state(STATE_S46_LW, &s46_lw_len); + uint8_t *passthru = odhcp6c_get_state(STATE_PASSTHRU, &passthru_len); - size_t prefix_len, address_len, ra_pref_len, ra_route_len, ra_dns_len; + size_t prefix_len, address_len, ra_pref_len, + ra_route_len, ra_dns_len, ra_search_len; uint8_t *prefix = odhcp6c_get_state(STATE_IA_PD, &prefix_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); + uint8_t *ra_search = odhcp6c_get_state(STATE_RA_SEARCH, &ra_search_len); // Don't set environment before forking, because env is leaky. if (fork() == 0) { + ipv6_to_env("SERVER", addr, addr_len / sizeof(*addr)); 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)); @@ -394,17 +380,31 @@ void script_call(const char *status) fqdn_to_env("DOMAINS", search, search_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); ipv6_to_env("CER", cer, cer_len / sizeof(*cer)); s46_to_env(STATE_S46_MAPE, s46_mape, s46_mape_len); s46_to_env(STATE_S46_MAPT, s46_mapt, s46_mapt_len); s46_to_env(STATE_S46_LW, s46_lw, s46_lw_len); bin_to_env(custom, custom_len); - entry_to_env("PREFIXES", prefix, prefix_len, ENTRY_PREFIX); - entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS); + + if (odhcp6c_is_bound()) { + 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); + search_to_env("RA_DOMAINS", ra_search, ra_search_len); + + int_to_env("RA_HOPLIMIT", ra_conf_hoplimit(0)); + int_to_env("RA_MTU", ra_conf_mtu(0)); + int_to_env("RA_REACHABLE", ra_conf_reachable(0)); + int_to_env("RA_RETRANSMIT", ra_conf_retransmit(0)); + + char *buf = malloc(10 + passthru_len * 2); + strncpy(buf, "PASSTHRU=", 10); + script_hexlify(&buf[9], passthru, passthru_len); + putenv(buf); argv[2] = (char*)status; execv(argv[0], argv);