diff options
author | Steven Barth <steven@midlink.org> | 2015-06-10 15:54:24 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2015-06-10 15:54:24 +0000 |
commit | c894b37c47e01de924b5ef52fb414599fcc42fd6 (patch) | |
tree | f022a7cbf2b518e147fbd2c8304d29f02a9705ac /package/network/ipv6 | |
parent | 274d8e8dcf1f17f0f6d8caff1b7a92495187e00d (diff) | |
download | upstream-c894b37c47e01de924b5ef52fb414599fcc42fd6.tar.gz upstream-c894b37c47e01de924b5ef52fb414599fcc42fd6.tar.bz2 upstream-c894b37c47e01de924b5ef52fb414599fcc42fd6.zip |
odhcp6c: work around RIOs matching PIOs as sent by some apple routers
Thanks to Mikael Abrahamsson for reporting.
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45941 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6')
-rw-r--r-- | package/network/ipv6/odhcp6c/Makefile | 2 | ||||
-rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.script | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index a90f5ce162..d0935eb8b6 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_VERSION:=2015-06-09 +PKG_VERSION:=2015-06-10 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script index 650c9b2e8f..84eb706ebc 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script @@ -88,6 +88,10 @@ setup_interface () { if [ -z "$gw" ]; then proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" + + # work around if there is a PIO matching a RIO + # Linux seems to prefer source-dest over dest-only even if metric is higher + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$addr/$mask" else for prefix in $PREFIXES $ADDRESSES; do local paddr="${prefix%%,*}" |