Changeset 45700


Ignore:
Timestamp:
2015-05-19T09:53:08+02:00 (3 years ago)
Author:
cyrus
Message:

ipv6: remove now unneeded source-dest-routing workarounds

Signed-off-by: Steven Barth <steven@…>

Location:
trunk/package/network/ipv6
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/ipv6/6in4/Makefile

    r44635 r45700  
    1010PKG_NAME:=6in4 
    1111PKG_VERSION:=21 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313PKG_LICENSE:=GPL-2.0 
    1414 
  • trunk/package/network/ipv6/6in4/files/6in4.sh

    r44635 r45700  
    2828        local link="6in4-$cfg" 
    2929 
    30         local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting 
    31         json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting 
     30        local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey 
     31        json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey 
    3232 
    3333        [ -z "$peeraddr" ] && { 
     
    4949        proto_init_update "$link" 1 
    5050 
    51         local source="" 
    52         [ "$sourcerouting" != "0" ] && source="::/128" 
    53         proto_add_ipv6_route "::" 0 "" "" "" "$source" 
    54  
    5551        [ -n "$ip6addr" ] && { 
    5652                local local6="${ip6addr%%/*}" 
     
    5854                [[ "$local6" = "$mask6" ]] && mask6= 
    5955                proto_add_ipv6_address "$local6" "$mask6" 
    60                 [ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" 
     56                proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" 
    6157        } 
    6258 
    6359        [ -n "$ip6prefix" ] && { 
    6460                proto_add_ipv6_prefix "$ip6prefix" 
    65                 [ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix" 
     61                proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix" 
    6662        } 
    6763 
     
    147143        proto_config_add_int "ttl" 
    148144        proto_config_add_string "tos" 
    149         proto_config_add_boolean "sourcerouting" 
    150145} 
    151146 
  • trunk/package/network/ipv6/6rd/Makefile

    r44636 r45700  
    1010PKG_NAME:=6rd 
    1111PKG_VERSION:=9 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313PKG_LICENSE:=GPL-2.0 
    1414 
  • trunk/package/network/ipv6/6rd/files/6rd.sh

    r44636 r45700  
    1515        local link="6rd-$cfg" 
    1616 
    17         local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone 
    18         json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone 
     17        local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone 
     18        json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone 
    1919 
    2020        [ -z "$ip6prefix" -o -z "$peeraddr" ] && { 
     
    5555        proto_add_ipv6_prefix "$ip6lanprefix" 
    5656 
    57         if [ "$sourcerouting" != "0" ]; then 
    58                 proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "::/128" 
    59                 proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen" 
    60                 proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix" 
    61         else 
    62                 proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 
    63         fi 
     57        proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen" 
     58        proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix" 
    6459 
    6560        proto_add_tunnel 
  • trunk/package/network/ipv6/6to4/Makefile

    r43167 r45700  
    1010PKG_NAME:=6to4 
    1111PKG_VERSION:=12 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313PKG_LICENSE:=GPL-2.0 
    1414 
  • trunk/package/network/ipv6/6to4/files/6to4.sh

    r42748 r45700  
    3535        local link="6to4-$cfg" 
    3636 
    37         local mtu ttl tos ipaddr sourcerouting 
    38         json_get_vars mtu ttl tos ipaddr sourcerouting 
     37        local mtu ttl tos ipaddr 
     38        json_get_vars mtu ttl tos ipaddr 
    3939 
    4040        ( proto_add_host_dependency "$cfg" 0.0.0.0 ) 
     
    6666        proto_add_ipv6_prefix "$prefix6::/48" 
    6767 
    68         if [ "$sourcerouting" != "0" ]; then 
    69                 proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "::/128" 
    70                 proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16" 
    71                 proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48" 
    72         else 
    73                 proto_add_ipv6_route "::" 0 "::192.88.99.1" 
    74         fi 
     68        proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16" 
     69        proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48" 
    7570 
    7671        proto_add_tunnel 
  • trunk/package/network/ipv6/odhcp6c/Makefile

    r45688 r45700  
    99 
    1010PKG_NAME:=odhcp6c 
    11 PKG_VERSION:=2015-05-16 
     11PKG_VERSION:=2015-05-19 
    1212PKG_RELEASE=$(PKG_SOURCE_VERSION) 
    1313 
  • trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script

    r45585 r45700  
    8787                local metric="${entry%%,*}" 
    8888 
    89                 if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then 
     89                if [ -z "$gw" ]; then 
    9090                        proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" 
    9191                else 
    92                         proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128" 
    9392                        for prefix in $PREFIXES $ADDRESSES; do 
    9493                                local paddr="${prefix%%,*}" 
  • trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh

    r45323 r45700  
    2424        proto_config_add_string zone 
    2525        proto_config_add_string 'ifaceid:ip6addr' 
    26         proto_config_add_string 'sourcerouting:bool' 
    2726        proto_config_add_string "userclass" 
    2827        proto_config_add_string "vendorclass" 
     
    3635        local iface="$2" 
    3736 
    38         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 
    39         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 
     37        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 
     38        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 
    4039 
    4140 
     
    7170        [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" 
    7271        [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat" 
    73         [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1" 
    7472        [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0" 
    7573        [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0" 
Note: See TracChangeset for help on using the changeset viewer.