From: Francis Dupont <fdupont@isc.org>
Date: Wed, 30 Sep 2020 12:52:40 +0000 (+0200)
Subject: Added option definition
X-Git-Tag: list~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=792db388fd7a50e718fd52ba2c1458783be7e6ec;p=thirdparty%2Fdhcp.git

Added option definition
---

diff --git a/common/tables.c b/common/tables.c
index 50d9cf10d..0d7350049 100644
--- a/common/tables.c
+++ b/common/tables.c
@@ -208,6 +208,9 @@ static struct option dhcp_options[] = {
 #if defined(RFC4833_OPTIONS)
 	{ "pcode", "t",				&dhcp_universe, 100, 1 },
 	{ "tcode", "t",				&dhcp_universe, 101, 1 },
+#endif
+#if defined(RFC8925_OPTIONS)
+	{ "v6-only-preferred", "L",		&dhcp_universe, 108, 1 },
 #endif
 	{ "netinfo-server-address", "Ia",	&dhcp_universe, 112, 1 },
 	{ "netinfo-server-tag", "t",		&dhcp_universe, 113, 1 },
diff --git a/includes/dhcp.h b/includes/dhcp.h
index 0a74137e0..843169240 100644
--- a/includes/dhcp.h
+++ b/includes/dhcp.h
@@ -156,6 +156,7 @@ struct dhcp_packet {
 #define DHO_AUTHENTICATE			90  /* RFC3118, was 210 */
 #define DHO_CLIENT_LAST_TRANSACTION_TIME	91
 #define DHO_ASSOCIATED_IP			92
+#define DHO_V6_ONLY_PREFERRED			108 /* RFC8925 */
 #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
 #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
 #define DHO_VIVCO_SUBOPTIONS			124
diff --git a/includes/site.h b/includes/site.h
index 2ef69e415..533e762bd 100644
--- a/includes/site.h
+++ b/includes/site.h
@@ -374,3 +374,4 @@
 #define RFC7341_OPTIONS
 #define RFC7618_OPTIONS
 #define RFC7710_OPTIONS
+#define RFC8925_OPTIONS
diff --git a/keama/options.c b/keama/options.c
index 3f714108f..7d1e66ea0 100644
--- a/keama/options.c
+++ b/keama/options.c
@@ -170,6 +170,7 @@ struct option_def options4[] = {
         { "geoconf-civic", "X",                 "dhcp",  99, 2},
 	{ "pcode", "t",				"dhcp", 100, 2},
 	{ "tcode", "t",				"dhcp", 101, 2},
+	{ "v6-only-preferred", "L",		"dhcp", 108, 2},
 	{ "netinfo-server-address", "Ia",	"dhcp", 112, 2},
 	{ "netinfo-server-tag", "t",		"dhcp", 113, 2},
 	{ "default-url", "t",			"dhcp", 114, 2},
diff --git a/util/bind.sh b/util/bind.sh
index 260783b26..ce350cd84 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -154,11 +154,11 @@ else
 	# Get the bind release kit shell script
 	if type wget
 	then
-		wget https://$repo_host/$repo_path/raw/main/util/kit.sh ||
+		wget https://$repo_host/$repo_path/raw/master/util/kit.sh ||
 		{ echo "Fetch of kit.sh file failed" ; exit -1; }
 	elif type fetch
 	then
-		fetch https://$repo_host/$repo_path/raw/main/util/kit.sh ||
+		fetch https://$repo_host/$repo_path/raw/master/util/kit.sh ||
 		{ echo "Fetch of kit.sh failed" ; exit -1; }
 	else
 		echo "Fetch of kit.sh failed"