X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fscript.c;h=2c342163b364f014bd99e1af5fb5bb8b8a7e3ebc;hb=c3bbeced0f204b6b9571148ae84227105baaf179;hp=98fc6e9989bcf3fa3a206cffc998c0ec4d486c46;hpb=fd95ed5604dbee3972e479c5cf85c2afd52ebdd9;p=odhcp6c.git

diff --git a/src/script.c b/src/script.c
index 98fc6e9..2c34216 100644
--- a/src/script.c
+++ b/src/script.c
@@ -115,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;
@@ -208,6 +184,15 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
 }
 
 
+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;
@@ -228,6 +213,9 @@ 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;
 
@@ -372,7 +360,6 @@ 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);
@@ -388,6 +375,11 @@ void script_call(const char *status)
 		entry_to_env("RA_ROUTES", ra_route, ra_route_len, ENTRY_ROUTE);
 		entry_to_env("RA_DNS", ra_dns, ra_dns_len, ENTRY_HOST);
 
+		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);