X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fscript.c;h=f0d4af2e9ce3e4841aa71277d407cdaa9c9b0ac8;hb=673d079b108815d5eff0547910d3d48189c0a114;hp=2a34ea00191e62779d58a91aa5d7aa7cdd80b93b;hpb=0b77e6065dc833da19ddff6e04e4f09c805c6883;p=odhcp6c.git

diff --git a/src/script.c b/src/script.c
index 2a34ea0..f0d4af2 100644
--- a/src/script.c
+++ b/src/script.c
@@ -16,6 +16,7 @@
 #include <resolv.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -23,7 +24,7 @@
 #include "odhcp6c.h"
 
 static const char hexdigits[] = "0123456789abcdef";
-static const char hexvals[] = {
+static const int8_t hexvals[] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -1, -1, -2, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -57,7 +58,8 @@ ssize_t script_unhexlify(uint8_t *dst, size_t len, const char *src)
 				|| y < 0 || (y = hexvals[y]) < 0)
 			return -1;
 		dst[c] = x << 4 | y;
-		while (*src < 0 || (*src && hexvals[(uint8_t)*src] < 0))
+		while (((int8_t)*src) < 0 ||
+				(*src && hexvals[(uint8_t)*src] < 0))
 			src++;
 	}
 
@@ -156,22 +158,31 @@ static void prefix_to_env(const char *name, const uint8_t *fqdn, size_t len)
 
 void script_call(const char *status)
 {
-	size_t dns_len, search_len, custom_len;
+	syslog(LOG_WARNING, "State for %s changed to %s", argv[1], status);
+	size_t dns_len, search_len, custom_len, sntp_ip_len, sntp_dns_len;
+	size_t sip_ip_len, sip_fqdn_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);
+	struct in6_addr *sntp = odhcp6c_get_state(STATE_SNTP_IP, &sntp_ip_len);
+	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);
 
-	size_t prefix_len, lost_pd_len;
+	size_t prefix_len;
 	uint8_t *prefix = odhcp6c_get_state(STATE_IA_PD, &prefix_len);
-	uint8_t *lost_pd = odhcp6c_get_state(STATE_IA_PD_LOST, &lost_pd_len);
 
 	// Don't set environment before forking, because env is leaky.
 	if (fork() == 0) {
 		ipv6_to_env("RDNSS", dns, dns_len / sizeof(*dns));
+		ipv6_to_env("SNTP_IP", sntp, sntp_ip_len / sizeof(*sntp));
+		ipv6_to_env("SIP_IP", sip, sip_ip_len / sizeof(*sip));
 		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);
 		bin_to_env(custom, custom_len);
 		prefix_to_env("PREFIXES", prefix, prefix_len);
-		prefix_to_env("PREFIXES_LOST", lost_pd, lost_pd_len);
 
 		argv[2] = (char*)status;
 		execv(argv[0], argv);
@@ -179,6 +190,5 @@ void script_call(const char *status)
 	}
 
 	// Delete lost prefixes and user opts
-	odhcp6c_clear_state(STATE_IA_PD_LOST);
 	odhcp6c_clear_state(STATE_CUSTOM_OPTS);
 }