odhcp6c: add client fqdn and reconfigure options

Allowing DHCPV6_CLIENT_FQDN and DHCPV6_ACCEPT_RECONFIGURE to be turned off.
Defaulting to false, former behavior remains unchanged.

Signed-off-by: pacien <pacien.trangirard@pacien.net>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]
This commit is contained in:
pacien 2018-09-06 15:56:17 +02:00 committed by Hans Dedecker
parent 42f158314e
commit ef01c1d308
2 changed files with 9 additions and 3 deletions

View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_RELEASE:=15 PKG_RELEASE:=16
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git

View file

@ -17,6 +17,8 @@ proto_dhcpv6_init_config() {
proto_config_add_string 'extendprefix:bool' proto_config_add_string 'extendprefix:bool'
proto_config_add_string 'norelease:bool' proto_config_add_string 'norelease:bool'
proto_config_add_string 'noserverunicast:bool' proto_config_add_string 'noserverunicast:bool'
proto_config_add_string 'noclientfqdn:bool'
proto_config_add_string 'noacceptreconfig:bool'
proto_config_add_array 'ip6prefix:list(ip6addr)' proto_config_add_array 'ip6prefix:list(ip6addr)'
proto_config_add_string iface_dslite proto_config_add_string iface_dslite
proto_config_add_string zone_dslite proto_config_add_string zone_dslite
@ -51,8 +53,8 @@ proto_dhcpv6_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast ip6prefix ip6prefixes iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast noclientfqdn noacceptreconfig ip6prefix ip6prefixes iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast noclientfqdn noacceptreconfig iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
json_for_each_item proto_dhcpv6_add_prefix ip6prefix ip6prefixes json_for_each_item proto_dhcpv6_add_prefix ip6prefix ip6prefixes
# Configure # Configure
@ -74,6 +76,10 @@ proto_dhcpv6_setup() {
[ "$noserverunicast" = "1" ] && append opts "-U" [ "$noserverunicast" = "1" ] && append opts "-U"
[ "$noclientfqdn" = "1" ] && append opts "-f"
[ "$noacceptreconfig" = "1" ] && append opts "-a"
[ -n "$ifaceid" ] && append opts "-i$ifaceid" [ -n "$ifaceid" ] && append opts "-i$ifaceid"
[ -n "$vendorclass" ] && append opts "-V$vendorclass" [ -n "$vendorclass" ] && append opts "-V$vendorclass"