Be compatible with ISPs which don't support the destination option header
containing
the tunnel encapsulation limit as reported in FS#1501 for dynamic created
ds-lite
interfaces.
Setting the uci parameter encaplimit_dslite to ignore; allows to disable the
insertion
of the destination option header for the dynamic created ds-lite interface.
Otherwise the tunnel encapsulation limit value can be set to a value from 0
till 255
by setting the encaplimit_dslite uci parameter accordingly.
Signed-off-by: Hans Dedecker <dedec...@gmail.com>
---
package/network/ipv6/odhcp6c/Makefile | 2 +-
package/network/ipv6/odhcp6c/files/dhcpv6.script | 1 +
package/network/ipv6/odhcp6c/files/dhcpv6.sh | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package/network/ipv6/odhcp6c/Makefile
b/package/network/ipv6/odhcp6c/Makefile
index 4ecafc9276..64656dfd77 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_RELEASE:=11
+PKG_RELEASE:=12
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script
b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 3171013966..00393ff6b7 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -183,6 +183,7 @@ setup_interface () {
json_add_string tunlink "$INTERFACE"
[ -n "$ZONE_DSLITE" ] || ZONE_DSLITE=$ZONE
[ -n "$ZONE_DSLITE" ] && json_add_string zone "$ZONE_DSLITE"
+ [ -n "$ENCAPLIMIT_DSLITE" ] && json_add_string encaplimit
"$ENCAPLIMIT_DSLITE"
[ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate
"$IFACE_DSLITE_DELEGATE"
json_close_object
ubus call network add_dynamic "$(json_dump)"
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 919872fe8e..2962dccdaa 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -19,6 +19,7 @@ proto_dhcpv6_init_config() {
proto_config_add_array 'ip6prefix:list(ip6addr)'
proto_config_add_string iface_dslite
proto_config_add_string zone_dslite
+ proto_config_add_string encaplimit_dslite
proto_config_add_string iface_map
proto_config_add_string zone_map
proto_config_add_string iface_464xlat
@@ -48,8 +49,8 @@ proto_dhcpv6_setup() {
local config="$1"
local iface="$2"
- local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly
forceprefix extendprefix norelease ip6prefix ip6prefixes 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 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
+ local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly
forceprefix extendprefix norelease ip6prefix ip6prefixes iface_dslite iface_map
iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite
zone_map zone_464xlat zone encaplimit_dslite soltimeout fakeroutes sourcefilter
keep_ra_dnslifetime ra_holdoff
+ json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts
noslaaconly forceprefix extendprefix norelease iface_dslite iface_map
iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map
zone_464xlat zone encaplimit_dslite soltimeout fakeroutes sourcefilter
keep_ra_dnslifetime ra_holdoff
json_for_each_item proto_dhcpv6_add_prefix ip6prefix ip6prefixes
# Configure
@@ -98,6 +99,7 @@ proto_dhcpv6_setup() {
[ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map"
[ -n "$zone_464xlat" ] && proto_export "ZONE_464XLAT=$zone_464xlat"
[ -n "$zone" ] && proto_export "ZONE=$zone"
+ [ -n "$encaplimit_dslite" ] && proto_export
"ENCAPLIMIT_DSLITE=$encaplimit_dslite"
[ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
[ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1"
[ "$extendprefix" = "1" ] && proto_export "EXTENDPREFIX=1"
--
2.16.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
