From: Steven Barth <cyrus@openwrt.org>
Date: Mon, 10 Dec 2012 16:46:59 +0000 (+0000)
Subject: ipv6-support: Add support for NPT status tracking
X-Git-Tag: reboot~12030
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=faba477274075f440866283c88dbd67ff10fbc52;p=openwrt%2Fstaging%2Fchunkeey.git

ipv6-support: Add support for NPT status tracking

SVN-Revision: 34609
---

diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile
index 97bff4d084..a814b52fb6 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 8a0e540431..8e8458b888 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}"
 	}