summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorcyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-10 16:46:59 +0000
committercyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-10 16:46:59 +0000
commit7e7f7d88cf772f529a3c56c816d2d3b11a7df398 (patch)
tree2a34232b3de5f48fa485eded09796ac4f5b8e215 /package
parent756e51eb0385334c1b0a8c17f516ab6690651b06 (diff)
ipv6-support: Add support for NPT status tracking
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34609 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/network/ipv6/ipv6-support/Makefile2
-rw-r--r--package/network/ipv6/ipv6-support/files/support.sh5
2 files changed, 4 insertions, 3 deletions
diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile
index 97bff4d08..a814b52fb 100644
--- a/package/network/ipv6/ipv6-support/Makefile
+++ b/package/network/ipv6/ipv6-support/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ipv6-support
-PKG_VERSION:=2012-12-08
+PKG_VERSION:=2012-12-10
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/ipv6-support/files/support.sh b/package/network/ipv6/ipv6-support/files/support.sh
index 8a0e54043..8e8458b88 100644
--- a/package/network/ipv6/ipv6-support/files/support.sh
+++ b/package/network/ipv6/ipv6-support/files/support.sh
@@ -134,11 +134,12 @@ announce_prefix() {
# Always announce the ULA when doing NPT
[ "$prefix" == "$ula" -a "$prefix_action" == "npt" ] && prefix_action="distribute"
- [ "$prefix_action" == "distribute" ] && {
+ [ "$prefix_action" == "distribute" -o "$prefix_action" == "npt" ] && {
local msg='{"network": "'"$network"'", "prefix": "'"$addr"'", "length": '"$length"
[ -n "$valid" ] && msg="$msg"', "valid": '"$valid"', "preferred": '"$prefer"
[ -z "$cmd" ] && cmd=newprefix
-
+
+ [ "$prefix_action" == "npt" ] && msg="$msg"', "npt": 1'
ubus call 6distributed "$cmd" "$msg}"
}