summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2018-05-29 15:18:16 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-06-19 13:25:19 +0200
commit2af5cfe9b748914b49f3a157addb40ad7a200e62 (patch)
treec0b0ef621618fabd99f4bab6af1a0bd95697de7e
parent3c4cf92f1305a94e192a838b9786f54397cca5d8 (diff)
downloadmtk-20170518-2af5cfe9b748914b49f3a157addb40ad7a200e62.zip
mtk-20170518-2af5cfe9b748914b49f3a157addb40ad7a200e62.tar.gz
mtk-20170518-2af5cfe9b748914b49f3a157addb40ad7a200e62.tar.bz2
ds-lite: make tunnel encapsulation limit support configurable (FS#1501)
Be compatible with ISPs which don't support the destination option header containing the tunnel encapsulation limit as reported in FS#1501. Setting the uci parameter encaplimit to ignore; allows to disable the insertion of the destination option header in the ds-lite packets. Otherwise the tunnel encapsulation limit value can be set to a value from 0 till 255 by setting the encaplimit uci parameter accordingly. If no encaplimit value is specified the default value is 4 as before. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/ipv6/ds-lite/Makefile2
-rw-r--r--[-rwxr-xr-x]package/network/ipv6/ds-lite/files/dslite.sh8
2 files changed, 7 insertions, 3 deletions
diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile
index 58e7156..4393d35 100644
--- a/package/network/ipv6/ds-lite/Makefile
+++ b/package/network/ipv6/ds-lite/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ds-lite
PKG_VERSION:=7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/ds-lite/files/dslite.sh b/package/network/ipv6/ds-lite/files/dslite.sh
index 2485a42..7bd3f2e 100755..100644
--- a/package/network/ipv6/ds-lite/files/dslite.sh
+++ b/package/network/ipv6/ds-lite/files/dslite.sh
@@ -15,8 +15,8 @@ proto_dslite_setup() {
local link="ds-$cfg"
local remoteip6
- local mtu ttl peeraddr ip6addr tunlink zone weakif
- json_get_vars mtu ttl peeraddr ip6addr tunlink zone weakif
+ local mtu ttl peeraddr ip6addr tunlink zone weakif encaplimit
+ json_get_vars mtu ttl peeraddr ip6addr tunlink zone weakif encaplimit
[ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS"
@@ -68,6 +68,9 @@ proto_dslite_setup() {
json_add_string local "$ip6addr"
json_add_string remote "$peeraddr"
[ -n "$tunlink" ] && json_add_string link "$tunlink"
+ json_add_object "data"
+ json_add_string encaplimit "${encaplimit:-4}"
+ json_close_object
proto_close_tunnel
proto_add_data
@@ -97,6 +100,7 @@ proto_dslite_init_config() {
proto_config_add_string "tunlink"
proto_config_add_int "mtu"
proto_config_add_int "ttl"
+ proto_config_add_string "encaplimit"
proto_config_add_string "zone"
proto_config_add_string "weakif"
}