diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-05-19 07:53:08 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-05-19 07:53:08 +0000 |
| commit | 08f057c703fca370fd2f212eef6e0122028be023 (patch) | |
| tree | ab36479b9a4bbdc9245af4dcfd80acbac2771c98 /package/network/ipv6/odhcp6c | |
| parent | 12969569086d18bd6ee4235224ea098607e860b9 (diff) | |
| download | upstream-08f057c703fca370fd2f212eef6e0122028be023.tar.gz upstream-08f057c703fca370fd2f212eef6e0122028be023.tar.bz2 upstream-08f057c703fca370fd2f212eef6e0122028be023.zip | |
ipv6: remove now unneeded source-dest-routing workarounds
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45700
Diffstat (limited to 'package/network/ipv6/odhcp6c')
| -rw-r--r-- | package/network/ipv6/odhcp6c/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.script | 3 | ||||
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.sh | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index d5b1700d37..c53a523f68 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-05-16 +PKG_VERSION:=2015-05-19 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 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" |