aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2012-12-11 16:56:37 +0000
committerSteven Barth <cyrus@openwrt.org>2012-12-11 16:56:37 +0000
commit8d9564af1b34362f7392515515153dc3dc4a56e7 (patch)
tree4bda514ef8bed151edb7037e0e1b3adcde260b47
parent8546f8a40100c64289bdfe022849d7978edd55b4 (diff)
downloadupstream-8d9564af1b34362f7392515515153dc3dc4a56e7.tar.gz
upstream-8d9564af1b34362f7392515515153dc3dc4a56e7.tar.bz2
upstream-8d9564af1b34362f7392515515153dc3dc4a56e7.zip
ipv6-support: Make ULA addresses secondary * Deprecates ULA prefixes when there are other public prefixes * Fixes issues with clients using incorrect source addresses
SVN-Revision: 34630
-rw-r--r--package/network/ipv6/ipv6-support/Makefile2
-rw-r--r--package/network/ipv6/ipv6-support/files/support.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile
index a814b52fb6..d570e54fc4 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-10
+PKG_VERSION:=2012-12-11
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 8e8458b888..f723e6e5a0 100644
--- a/package/network/ipv6/ipv6-support/files/support.sh
+++ b/package/network/ipv6/ipv6-support/files/support.sh
@@ -111,6 +111,7 @@ announce_prefix() {
local prefix="$1"
local network="$2"
local cmd="$3"
+ local type="$4"
local addr=$(echo "$prefix" | cut -d/ -f1)
local rem=$(echo "$prefix" | cut -d/ -f2)
@@ -140,6 +141,7 @@ announce_prefix() {
[ -z "$cmd" ] && cmd=newprefix
[ "$prefix_action" == "npt" ] && msg="$msg"', "npt": 1'
+ [ "$type" == "secondary" ] && msg="$msg"', "secondary": 1'
ubus call 6distributed "$cmd" "$msg}"
}
@@ -381,7 +383,7 @@ enable_ula_prefix() {
}
# Announce ULA
- [ -n "$ula_prefix" ] && announce_prefix "$ula_prefix" "$network"
+ [ -n "$ula_prefix" ] && announce_prefix "$ula_prefix" "$network" newprefix secondary
}