From 08f057c703fca370fd2f212eef6e0122028be023 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 19 May 2015 07:53:08 +0000 Subject: ipv6: remove now unneeded source-dest-routing workarounds Signed-off-by: Steven Barth SVN-Revision: 45700 --- package/network/ipv6/odhcp6c/files/dhcpv6.script | 3 +-- package/network/ipv6/odhcp6c/files/dhcpv6.sh | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'package/network/ipv6/odhcp6c/files') diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script index 5e5b9a9cea..a2adf39ad1 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script @@ -86,10 +86,9 @@ setup_interface () { entry="${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" else - proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128" for prefix in $PREFIXES $ADDRESSES; do local paddr="${prefix%%,*}" proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr" diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 9fb6fa342f..adcb1007a9 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -23,7 +23,6 @@ proto_dhcpv6_init_config() { proto_config_add_string zone_464xlat proto_config_add_string zone proto_config_add_string 'ifaceid:ip6addr' - proto_config_add_string 'sourcerouting:bool' proto_config_add_string "userclass" proto_config_add_string "vendorclass" proto_config_add_boolean delegate @@ -35,8 +34,8 @@ proto_dhcpv6_setup() { local config="$1" 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 - 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 + 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 userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes # Configure @@ -70,7 +69,6 @@ proto_dhcpv6_setup() { [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" [ -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_MAP_DELEGATE=0" [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite" -- cgit v1.2.3