Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ipv6: remove now unneeded source-dest-routing workarounds

Browse source 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 45700
This commit is contained in:
Steven Barth 2015-05-19 07:53:08 +00:00
parent 1296956908
commit 08f057c703
9 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/ipv6/6in4/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=21 PKG_VERSION:=21
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

13
package/network/ipv6/6in4/files/6in4.sh
View file

@ -27,8 +27,8 @@ proto_6in4_setup() {
local iface="$2" local iface="$2"
local link="6in4-$cfg" local link="6in4-$cfg"
local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
[ -z "$peeraddr" ] && { [ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_ADDRESS"
@ -48,21 +48,17 @@ proto_6in4_setup() {
proto_init_update "$link" 1 proto_init_update "$link" 1
local source=""
[ "$sourcerouting" != "0" ] && source="::/128"
proto_add_ipv6_route "::" 0 "" "" "" "$source"
[ -n "$ip6addr" ] && { [ -n "$ip6addr" ] && {
local local6="${ip6addr%%/*}" local local6="${ip6addr%%/*}"
local mask6="${ip6addr##*/}" local mask6="${ip6addr##*/}"
[[ "$local6" = "$mask6" ]] && mask6= [[ "$local6" = "$mask6" ]] && mask6=
proto_add_ipv6_address "$local6" "$mask6" proto_add_ipv6_address "$local6" "$mask6"
[ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
} }
[ -n "$ip6prefix" ] && { [ -n "$ip6prefix" ] && {
proto_add_ipv6_prefix "$ip6prefix" proto_add_ipv6_prefix "$ip6prefix"
[ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix" proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
} }
proto_add_tunnel proto_add_tunnel
@ -146,7 +142,6 @@ proto_6in4_init_config() {
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_int "ttl" proto_config_add_int "ttl"
proto_config_add_string "tos" proto_config_add_string "tos"
proto_config_add_boolean "sourcerouting"
} }
[ -n "$INCLUDE_ONLY" ] || { [ -n "$INCLUDE_ONLY" ] || {

2
package/network/ipv6/6rd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=6rd PKG_NAME:=6rd
PKG_VERSION:=9 PKG_VERSION:=9
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

13
package/network/ipv6/6rd/files/6rd.sh
View file

@ -14,8 +14,8 @@ proto_6rd_setup() {
local iface="$2" local iface="$2"
local link="6rd-$cfg" local link="6rd-$cfg"
local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone
json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone
[ -z "$ip6prefix" -o -z "$peeraddr" ] && { [ -z "$ip6prefix" -o -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_ADDRESS"
@ -54,13 +54,8 @@ proto_6rd_setup() {
proto_add_ipv6_address "$ip6addr" "$ip6prefixlen" proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
proto_add_ipv6_prefix "$ip6lanprefix" proto_add_ipv6_prefix "$ip6lanprefix"
if [ "$sourcerouting" != "0" ]; then proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "::/128" proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
else
proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
fi
proto_add_tunnel proto_add_tunnel
json_add_string mode sit json_add_string mode sit

2
package/network/ipv6/6to4/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=6to4 PKG_NAME:=6to4
PKG_VERSION:=12 PKG_VERSION:=12
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

13
package/network/ipv6/6to4/files/6to4.sh
View file

@ -34,8 +34,8 @@ proto_6to4_setup() {
local iface="$2" local iface="$2"
local link="6to4-$cfg" local link="6to4-$cfg"
local mtu ttl tos ipaddr sourcerouting local mtu ttl tos ipaddr
json_get_vars mtu ttl tos ipaddr sourcerouting json_get_vars mtu ttl tos ipaddr
( proto_add_host_dependency "$cfg" 0.0.0.0 ) ( proto_add_host_dependency "$cfg" 0.0.0.0 )
@ -65,13 +65,8 @@ proto_6to4_setup() {
proto_add_ipv6_address "$local6" 16 proto_add_ipv6_address "$local6" 16
proto_add_ipv6_prefix "$prefix6::/48" proto_add_ipv6_prefix "$prefix6::/48"
if [ "$sourcerouting" != "0" ]; then proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "::/128" proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
else
proto_add_ipv6_route "::" 0 "::192.88.99.1"
fi
proto_add_tunnel proto_add_tunnel
json_add_string mode sit json_add_string mode sit

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

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_VERSION:=2015-05-16 PKG_VERSION:=2015-05-19
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

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

@ -86,10 +86,9 @@ setup_interface () {
entry="${entry#*,}" entry="${entry#*,}"
local metric="${entry%%,*}" local metric="${entry%%,*}"
if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then if [ -z "$gw" ]; then
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
else else
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
for prefix in $PREFIXES $ADDRESSES; do for prefix in $PREFIXES $ADDRESSES; do
local paddr="${prefix%%,*}" local paddr="${prefix%%,*}"
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr" proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"

6
package/network/ipv6/odhcp6c/files/dhcpv6.sh
View file

@ -23,7 +23,6 @@ proto_dhcpv6_init_config() {
proto_config_add_string zone_464xlat proto_config_add_string zone_464xlat
proto_config_add_string zone proto_config_add_string zone
proto_config_add_string 'ifaceid:ip6addr' proto_config_add_string 'ifaceid:ip6addr'
proto_config_add_string 'sourcerouting:bool'
proto_config_add_string "userclass" proto_config_add_string "userclass"
proto_config_add_string "vendorclass" proto_config_add_string "vendorclass"
proto_config_add_boolean delegate proto_config_add_boolean delegate
@ -35,8 +34,8 @@ proto_dhcpv6_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
# Configure # Configure
@ -70,7 +69,6 @@ proto_dhcpv6_setup() {
[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
[ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"
[ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat" [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat"
[ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
[ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0" [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
[ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0" [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
[ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite" [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"