diff options
| author | Francis Dupont <fdupont@isc.org> | 2020-09-30 14:52:40 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2020-09-30 14:52:40 +0200 |
| commit | 792db388fd7a50e718fd52ba2c1458783be7e6ec (patch) | |
| tree | 5cab531731b413db7a35d5ed47cf2040e12b8021 | |
| parent | 26243975f0c0df85391d05a0c6b81cba56a656cd (diff) | |
Added option definition
| -rw-r--r-- | common/tables.c | 3 | ||||
| -rw-r--r-- | includes/dhcp.h | 1 | ||||
| -rw-r--r-- | includes/site.h | 1 | ||||
| -rw-r--r-- | keama/options.c | 1 | ||||
| -rw-r--r-- | util/bind.sh | 4 |
5 files changed, 8 insertions, 2 deletions
diff --git a/common/tables.c b/common/tables.c index 50d9cf10..0d735004 100644 --- a/common/tables.c +++ b/common/tables.c @@ -209,6 +209,9 @@ static struct option dhcp_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 }, { "default-url", "t", &dhcp_universe, 114, 1 }, diff --git a/includes/dhcp.h b/includes/dhcp.h index 0a74137e..84316924 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 2ef69e41..533e762b 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 3f714108..7d1e66ea 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 260783b2..ce350cd8 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" |