Просмотр исходного кода

ipv6-support: Add support for NPT status tracking

SVN-Revision: 34609
Steven Barth 13 лет назад
Родитель
Сommit
faba477274

+ 1 - 1
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

+ 3 - 2
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}"
 	}