Export AFTR-IP as well and update README

[odhcp6c.git] / src / script.c

diff --git a/src/script.c b/src/script.c
index 051718f206ed2e7513fbd9808d09628a2b2d17ae..9d88daf43676054a4c415b917b8f8a7931d38452 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -13,6 +13,7 @@
  */
 
 #include <stdio.h>
+#include <netdb.h>
 #include <resolv.h>
 #include <stdlib.h>
 #include <string.h>
@@ -98,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++] = ' ';
@@ -114,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;
@@ -198,7 +223,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, sntp_dns_len;
-       size_t sip_ip_len, sip_fqdn_len;
+       size_t sip_ip_len, sip_fqdn_len, aftr_name_len;
 
        odhcp6c_expire();
        if (delayed_call)
@@ -211,6 +236,7 @@ void script_call(const char *status)
        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, address_len, ra_pref_len, ra_route_len, ra_dns_len;
        uint8_t *prefix = odhcp6c_get_state(STATE_IA_PD, &prefix_len);
@@ -227,6 +253,8 @@ void script_call(const char *status)
                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, ENTRY_PREFIX);
                entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS);