KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

odhcp6c: change sendopts option into list

Browse source 
Commit a26045049b added support for sendopts as a string; since multiple
sendopts values can be specified it makes more sense to model it as a
list of strings.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker 2018-02-05 09:57:48 +01:00
parent 112f0469c4
commit d8acbb86a1
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/ipv6/odhcp6c/Makefile
View file

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

14
package/network/ipv6/odhcp6c/files/dhcpv6.sh
View file

@ -27,7 +27,7 @@ proto_dhcpv6_init_config() {
proto_config_add_string 'ifaceid:ip6addr' proto_config_add_string 'ifaceid:ip6addr'
proto_config_add_string "userclass" proto_config_add_string "userclass"
proto_config_add_string "vendorclass" proto_config_add_string "vendorclass"
proto_config_add_string "sendopts" proto_config_add_array "sendopts:list(string)"
proto_config_add_boolean delegate proto_config_add_boolean delegate
proto_config_add_int "soltimeout" proto_config_add_int "soltimeout"
proto_config_add_boolean fakeroutes proto_config_add_boolean fakeroutes
@ -41,8 +41,7 @@ proto_dhcpv6_setup() {
local iface="$2" local iface="$2"
local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
# Configure # Configure
local opts="" local opts=""
@ -76,9 +75,12 @@ proto_dhcpv6_setup() {
append opts "-r$opt" append opts "-r$opt"
done done
for opt in $sendopts; do sendopts_cb() {
append opts "-x$opt" local val="$1"
done append opts "-x$val"
}
json_for_each_item sendopts_cb sendopts
append opts "-t${soltimeout:-120}" append opts "-t${soltimeout:-120}"