X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fscript.c;h=9089409565c3c2d37c94b81f812a848c35d4e577;hb=dbe066616e7fb2d1845066c471ad619af8ee987c;hp=92bc46481b3bf993992916e32db9bc4785b2aa4c;hpb=68300e0f9f318daf5495b5e5ee7d56ad9cff99cf;p=odhcp6c.git diff --git a/src/script.c b/src/script.c index 92bc464..9089409 100644 --- a/src/script.c +++ b/src/script.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -175,7 +176,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en inet_ntop(AF_INET6, &e[i].target, &buf[buf_len], INET6_ADDRSTRLEN); buf_len += strlen(&buf[buf_len]); if (type != ENTRY_HOST) { - buf_len += snprintf(&buf[buf_len], 6, "/%hhu", e[i].length); + buf_len += snprintf(&buf[buf_len], 6, "/%"PRIu16, e[i].length); if (type == ENTRY_ROUTE) { buf[buf_len++] = ','; if (!IN6_IS_ADDR_UNSPECIFIED(&e[i].router)) { @@ -231,7 +232,7 @@ void script_delay_call(const char *status, int 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; + size_t sip_ip_len, sip_fqdn_len, aftr_name_len, cer_len; odhcp6c_expire(); if (delayed_call) { @@ -248,6 +249,7 @@ void script_call(const char *status) 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); + struct in6_addr *cer = odhcp6c_get_state(STATE_CER, &cer_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); @@ -267,6 +269,7 @@ void script_call(const char *status) 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)); bin_to_env(custom, custom_len); entry_to_env("PREFIXES", prefix, prefix_len, ENTRY_PREFIX); entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS);