domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

odhcp6c: rework sendopts handling

Browse Source 
Bring logic of sendopts handling in line with ip6prefix handling

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker
2018-02-24 20:59:10 +01:00
parent 66222dd92b
commit 1a5863d6d7
2 changed files with 6 additions and 7 deletions
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:=9 PKG_RELEASE:=10
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git

11
package/network/ipv6/odhcp6c/files/dhcpv6.sh
View File

@@ -40,6 +40,10 @@ proto_dhcpv6_add_prefix() {
append "$3" "$1" append "$3" "$1"
} }
proto_dhcpv6_add_sendopts() {
[ -n "$1" ] && append "$3" "-x$1"
}
proto_dhcpv6_setup() { proto_dhcpv6_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
@@ -80,12 +84,7 @@ proto_dhcpv6_setup() {
append opts "-r$opt" append opts "-r$opt"
done done
sendopts_cb() { json_for_each_item proto_dhcpv6_add_sendopts sendopts opts
local val="$1"
[ -n "$val" ] && append opts "-x$val"
}
json_for_each_item sendopts_cb sendopts
append opts "-t${soltimeout:-120}" append opts "-t${soltimeout:-120}"