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
owl
Steven Barth 2012-12-11 16:56:37 +00:00
parent 8546f8a401
commit 8d9564af1b
2 changed files with 4 additions and 2 deletions

View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ipv6-support PKG_NAME:=ipv6-support
PKG_VERSION:=2012-12-10 PKG_VERSION:=2012-12-11
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View File

@ -111,6 +111,7 @@ announce_prefix() {
local prefix="$1" local prefix="$1"
local network="$2" local network="$2"
local cmd="$3" local cmd="$3"
local type="$4"
local addr=$(echo "$prefix" | cut -d/ -f1) local addr=$(echo "$prefix" | cut -d/ -f1)
local rem=$(echo "$prefix" | cut -d/ -f2) local rem=$(echo "$prefix" | cut -d/ -f2)
@ -140,6 +141,7 @@ announce_prefix() {
[ -z "$cmd" ] && cmd=newprefix [ -z "$cmd" ] && cmd=newprefix
[ "$prefix_action" == "npt" ] && msg="$msg"', "npt": 1' [ "$prefix_action" == "npt" ] && msg="$msg"', "npt": 1'
[ "$type" == "secondary" ] && msg="$msg"', "secondary": 1'
ubus call 6distributed "$cmd" "$msg}" ubus call 6distributed "$cmd" "$msg}"
} }
@ -381,7 +383,7 @@ enable_ula_prefix() {
} }
# Announce ULA # Announce ULA
[ -n "$ula_prefix" ] && announce_prefix "$ula_prefix" "$network" [ -n "$ula_prefix" ] && announce_prefix "$ula_prefix" "$network" newprefix secondary
} }