Author: cyrus Date: 2015-07-18 07:44:50 +0200 (Sat, 18 Jul 2015) New Revision: 46408
Modified: trunk/package/network/ipv6/odhcp6c/Makefile trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh Log: odhcp6c: add option "sourcefilter" to disable source filter Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/ipv6/odhcp6c/Makefile =================================================================== --- trunk/package/network/ipv6/odhcp6c/Makefile 2015-07-17 17:55:17 UTC (rev 46407) +++ trunk/package/network/ipv6/odhcp6c/Makefile 2015-07-18 05:44:50 UTC (rev 46408) @@ -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 Modified: trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script =================================================================== --- trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script 2015-07-17 17:55:17 UTC (rev 46407) +++ trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script 2015-07-18 05:44:50 UTC (rev 46408) @@ -76,7 +76,7 @@ done for entry in $RA_ROUTES; do - local duplicate=0 + local duplicate=$NOSOURCEFILTER local addr="${entry%%/*}" entry="${entry#*/}" local mask="${entry%%,*}" Modified: trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh =================================================================== --- trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh 2015-07-17 17:55:17 UTC (rev 46407) +++ trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh 2015-07-18 05:44:50 UTC (rev 46408) @@ -28,14 +28,15 @@ 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 @@ [ -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 \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
