KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

odhcp6c: Revert to slightly modified version of old behaviour

Browse source 
Latest changes broke source-restriction of on-link routes. Restoring
old-behaviour but adding correct source-restrictions which prevents
the offlink handler to remove the on-link route.

SVN-Revision: 39454
This commit is contained in:
Steven Barth 2014-02-03 09:06:25 +00:00
parent 196f434c96
commit 02c763c4ab
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/network/ipv6/odhcp6c/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_VERSION:=2014-02-02 PKG_VERSION:=2014-01-31
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=9817e4983c7d4e28f53b78d4fc6ea1eabed8affe PKG_SOURCE_VERSION:=b4a0f3d74b04074eae21e88fbf5b8f2ddc150f86
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

5
package/network/ipv6/odhcp6c/files/dhcpv6.script
View file

@ -50,7 +50,7 @@ setup_interface () {
entry="${entry#*,}" entry="${entry#*,}"
local valid="${entry%%,*}" local valid="${entry%%,*}"
proto_add_ipv6_address "$addr" "$mask" "$preferred" "$valid" proto_add_ipv6_address "$addr" "$mask" "$preferred" "$valid" 1
done done
for entry in $RA_ROUTES; do for entry in $RA_ROUTES; do
@ -65,7 +65,8 @@ setup_interface () {
local metric="${entry%%,*}" local metric="${entry%%,*}"
if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$addr/$mask"
else else
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128" proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
for prefix in $PREFIXES $ADDRESSES; do for prefix in $PREFIXES $ADDRESSES; do