X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fscript.c;h=9089409565c3c2d37c94b81f812a848c35d4e577;hp=3041fe73097b558080466f71fc3c3a4a7821e48b;hb=47fac6f603c236d7b149e0ec593269322572b352;hpb=94eb28a5b61036a21bf794b99de64daa96170f1e

diff --git a/src/script.c b/src/script.c
index 3041fe7..9089409 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2014 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -20,6 +20,7 @@
 #include <syslog.h>
 #include <signal.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
@@ -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)) {
@@ -190,7 +191,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
 
 			if ((type == ENTRY_PREFIX || type == ENTRY_ADDRESS) && e[i].class)
 				buf_len += snprintf(&buf[buf_len], 12, ",class=%u", e[i].class);
-			else if (type == ENTRY_PREFIX)
+			else if (type == ENTRY_PREFIX && ntohl(e[i].iaid) != 1)
 				buf_len += snprintf(&buf[buf_len], 16, ",class=%08x", ntohl(e[i].iaid));
 
 			if (type == ENTRY_PREFIX && e[i].priority) {
@@ -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);