Signed-off-by: Steven Barth <[email protected]>
Backport of r46408
---
package/network/ipv6/odhcp6c/Makefile | 2 +-
package/network/ipv6/odhcp6c/files/dhcpv6.script | 2 +-
package/network/ipv6/odhcp6c/files/dhcpv6.sh | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/package/network/ipv6/odhcp6c/Makefile
b/package/network/ipv6/odhcp6c/Makefile
index 5bf43bd..75de54c 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c
-PKG_VERSION:=2015-07-13
+PKG_VERSION:=2015-07-18
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script
b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index b8cbddb..33f6d9b 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -76,7 +76,7 @@ setup_interface () {
done
for entry in $RA_ROUTES; do
- local duplicate=0
+ local duplicate=$NOSOURCEFILTER
local addr="${entry%%/*}"
entry="${entry#*/}"
local mask="${entry%%,*}"
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index adcb100..4a453fd 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -28,14 +28,15 @@ proto_dhcpv6_init_config() {
proto_config_add_boolean delegate
proto_config_add_int "soltimeout"
proto_config_add_boolean fakeroutes
+ proto_config_add_boolean sourcefilter
}
proto_dhcpv6_setup() {
local config="$1"
local iface="$2"
- local reqaddress reqprefix clientid reqopts noslaaconly forceprefix
norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass
vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout
fakeroutes
- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly
forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid
userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone
soltimeout fakeroutes
+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix
norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass
vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout
fakeroutes sourcefilter
+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly
forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid
userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone
soltimeout fakeroutes sourcefilter
# Configure
@@ -76,6 +77,7 @@ proto_dhcpv6_setup() {
[ -n "$zone_464xlat" ] && proto_export "ZONE_464XLAT=$zone_464xlat"
[ -n "$zone" ] && proto_export "ZONE=$zone"
[ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
+ [ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1"
proto_export "INTERFACE=$config"
proto_run_command "$config" odhcp6c \
--
2.7.2
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
