Export DHCPv6 server address to env

[odhcp6c.git] / src / script.c

diff --git a/src/script.c b/src/script.c
index 389dc3708b05c1bb97d1597dfa4c67ef4502a937..e389cc933640afe364b379b0ffbef15ee62d91de 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -209,7 +209,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
        putenv(buf);
 }
 
-#ifdef EXT_S46
+
 static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp)
 {
        uint8_t *odata;
@@ -223,7 +223,7 @@ 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)
 {
@@ -237,7 +237,6 @@ 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";
 
@@ -327,9 +326,6 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 
                fputc(' ', fp);
        }
-#else
-       if (data && len) {}
-#endif
 
        fclose(fp);
        putenv(str);
@@ -358,7 +354,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, cer_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();
@@ -367,6 +363,7 @@ void script_call(const char *status)
                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);
@@ -391,6 +388,7 @@ void script_call(const char *status)
 
        // 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));