diff options
| author | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-11 16:56:37 +0000 |
|---|---|---|
| committer | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-11 16:56:37 +0000 |
| commit | 95a399ee5c2559917ec6d517316dbfdd93850eac (patch) | |
| tree | 3e36de8c28e899cf14becb50b926f90f953ff228 /package/network | |
| parent | c59687e88f4a2cde313e1b5102dca1b74a41c573 (diff) | |
ipv6-support: Make ULA addresses secondary
* Deprecates ULA prefixes when there are other public prefixes
* Fixes issues with clients using incorrect source addresses
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34630 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/ipv6/ipv6-support/Makefile | 2 | ||||
| -rw-r--r-- | package/network/ipv6/ipv6-support/files/support.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile index a814b52fb..d570e54fc 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 8e8458b88..f723e6e5a 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 } |