X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fscript.c;h=9325085c362c3c34a3c03e5b9ababbe866e2220d;hb=19b89e91989e466a6657b07ee33961dbad99cc8e;hp=847e4d7ec3a30a3b216186c7d376b104433f4802;hpb=76c4797e82ec820d488e41ffe37adc107b5d0218;p=odhcp6c.git

diff --git a/src/script.c b/src/script.c
index 847e4d7..9325085 100644
--- a/src/script.c
+++ b/src/script.c
@@ -238,6 +238,9 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 	fputc('=', fp);
 
 #ifdef EXT_S46
+	const char *type = (state == STATE_S46_MAPE) ? "map-e" :
+			(state == STATE_S46_MAPT) ? "map-t" : "lw4o6";
+
 	uint8_t *odata;
 	uint16_t otype, olen;
 	dhcpv6_for_each_option(data, &data[len], otype, olen, odata) {
@@ -246,12 +249,18 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 		struct dhcpv6_s46_v4v6bind *bind = (struct dhcpv6_s46_v4v6bind*)odata;
 
 		if (state != STATE_S46_LW && otype == DHCPV6_OPT_S46_RULE &&
-				olen >= sizeof(struct dhcpv6_s46_rule) && olen >=
-				sizeof(struct dhcpv6_s46_rule) + rule->prefix6_len) {
+				olen >= sizeof(struct dhcpv6_s46_rule)) {
 			char buf4[INET_ADDRSTRLEN];
 			char buf6[INET6_ADDRSTRLEN];
 			struct in6_addr in6 = IN6ADDR_ANY_INIT;
-			memcpy(&in6, rule->ipv6_prefix, rule->prefix6_len);
+
+			size_t prefix6len = rule->prefix6_len;
+			prefix6len = (prefix6len % 8 == 0) ? prefix6len / 8 : prefix6len / 8 + 1;
+
+			if (olen < sizeof(struct dhcpv6_s46_rule) + prefix6len)
+				continue;
+
+			memcpy(&in6, rule->ipv6_prefix, prefix6len);
 
 			inet_ntop(AF_INET, &rule->ipv4_prefix, buf4, sizeof(buf4));
 			inet_ntop(AF_INET6, &in6, buf6, sizeof(buf6));
@@ -259,40 +268,61 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 			if (rule->flags & 1)
 				fputs("fmr,", fp);
 
-			fprintf(fp, "ealen=%d,prefix4len=%d,prefix6len=%d,ipv4prefix=%s,ipv6prefix=%s,",
-					rule->ea_len, rule->prefix4_len, rule->prefix6_len, buf4, buf6);
-
-			s46_to_env_portparams(&rule->ipv6_prefix[rule->prefix6_len],
-					olen - sizeof(*rule) - rule->prefix6_len, fp);
+			fprintf(fp, "type=%s,ealen=%d,prefix4len=%d,prefix6len=%d,ipv4prefix=%s,ipv6prefix=%s,",
+					type, rule->ea_len, rule->prefix4_len, rule->prefix6_len, buf4, buf6);
+
+			s46_to_env_portparams(&rule->ipv6_prefix[prefix6len],
+					olen - sizeof(*rule) - prefix6len, fp);
+
+			dhcpv6_for_each_option(data, &data[len], otype, olen, odata) {
+				if (state != STATE_S46_MAPT && otype == DHCPV6_OPT_S46_BR &&
+						olen == sizeof(struct in6_addr)) {
+					inet_ntop(AF_INET6, odata, buf6, sizeof(buf6));
+					fprintf(fp, "br=%s,", buf6);
+				} else if (state == STATE_S46_MAPT && otype == DHCPV6_OPT_S46_DMR &&
+						olen >= sizeof(struct dhcpv6_s46_dmr)) {
+					dmr = (struct dhcpv6_s46_dmr*)odata;
+					memset(&in6, 0, sizeof(in6));
+					size_t prefix6len = dmr->dmr_prefix6_len;
+					prefix6len = (prefix6len % 8 == 0) ? prefix6len / 8 : prefix6len / 8 + 1;
+
+					if (olen < sizeof(struct dhcpv6_s46_dmr) + prefix6len)
+						continue;
+
+					memcpy(&in6, dmr->dmr_ipv6_prefix, prefix6len);
+					inet_ntop(AF_INET6, &in6, buf6, sizeof(buf6));
+					fprintf(fp, "dmr=%s/%d,", buf6, dmr->dmr_prefix6_len);
+				}
+			}
 		} else if (state == STATE_S46_LW && otype == DHCPV6_OPT_S46_V4V6BIND &&
-				olen >= sizeof(struct dhcpv6_s46_v4v6bind) && olen >=
-				sizeof(struct dhcpv6_s46_v4v6bind) + bind->bindprefix6_len) {
+				olen >= sizeof(struct dhcpv6_s46_v4v6bind)) {
 			char buf4[INET_ADDRSTRLEN];
 			char buf6[INET6_ADDRSTRLEN];
 			struct in6_addr in6 = IN6ADDR_ANY_INIT;
-			memcpy(&in6, bind->bind_ipv6_prefix, bind->bindprefix6_len);
+
+			size_t prefix6len = bind->bindprefix6_len;
+			prefix6len = (prefix6len % 8 == 0) ? prefix6len / 8 : prefix6len / 8 + 1;
+
+			if (olen < sizeof(struct dhcpv6_s46_v4v6bind) + prefix6len)
+				continue;
+
+			memcpy(&in6, bind->bind_ipv6_prefix, prefix6len);
 
 			inet_ntop(AF_INET, &bind->ipv4_address, buf4, sizeof(buf4));
 			inet_ntop(AF_INET6, &in6, buf6, sizeof(buf6));
 
-			fprintf(fp, "ipv4address=%s,prefix6len=%d,ipv6prefix=%s,",
-					buf4, bind->bindprefix6_len, buf6);
+			fprintf(fp, "type=%s,ipv4address=%s,prefix6len=%d,ipv6prefix=%s,",
+					type, buf4, bind->bindprefix6_len, buf6);
 
-			s46_to_env_portparams(&bind->bind_ipv6_prefix[bind->bindprefix6_len],
-					olen - sizeof(*bind) - bind->bindprefix6_len, fp);
-		} else if (state != STATE_S46_MAPT && otype == DHCPV6_OPT_S46_BR
-				&& olen == sizeof(struct in6_addr)) {
-			char buf6[INET6_ADDRSTRLEN];
-			inet_ntop(AF_INET6, odata, buf6, sizeof(buf6));
-			fprintf(fp, "br=%s,", buf6);
-		} else if (state == STATE_S46_MAPT && otype == DHCPV6_OPT_S46_DMR &&
-				olen >= sizeof(struct dhcpv6_s46_dmr) && olen >=
-				sizeof(struct dhcpv6_s46_dmr) + dmr->dmr_prefix6_len) {
-			struct in6_addr in6 = IN6ADDR_ANY_INIT;
-			memcpy(&in6, dmr->dmr_ipv6_prefix, dmr->dmr_prefix6_len);
-			char buf6[INET6_ADDRSTRLEN];
-			inet_ntop(AF_INET6, &in6, buf6, sizeof(buf6));
-			fprintf(fp, "dmr=%s/%d,", buf6, dmr->dmr_prefix6_len);
+			s46_to_env_portparams(&bind->bind_ipv6_prefix[prefix6len],
+					olen - sizeof(*bind) - prefix6len, fp);
+
+			dhcpv6_for_each_option(data, &data[len], otype, olen, odata) {
+				if (otype == DHCPV6_OPT_S46_BR && olen == sizeof(struct in6_addr)) {
+					inet_ntop(AF_INET6, odata, buf6, sizeof(buf6));
+					fprintf(fp, "br=%s,", buf6);
+				}
+			}
 		}
 
 		fputc(' ', fp);