ltq-tapi is not xway specific

[openwrt.git] / package / 6to4 / files / 6to4.sh

diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index cb4a463..b8baa15 100755 (executable)
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -1,5 +1,5 @@
 # 6to4.sh - IPv6-in-IPv4 tunnel backend
 # 6to4.sh - IPv6-in-IPv4 tunnel backend

-# Copyright (c) 2010 OpenWrt.org
+# Copyright (c) 2010-2011 OpenWrt.org

 
 find_6to4_wanif() {
        local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}"
 
 find_6to4_wanif() {
        local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}"


@@ -18,9 +18,19 @@ find_6to4_prefix() {
        printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4
 }
 
        printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4
 }
 

+test_6to4_rfc1918()
+{
+       local oIFS="$IFS"; IFS="."; set -- $1; IFS="$oIFS"
+       [ $1 -eq  10 ] && return 0
+       [ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0
+       [ $1 -eq 172 ] && [ $2 -ge  16 ] && [ $2 -le  31 ] && return 0
+       return 1
+}
+

 set_6to4_radvd_interface() {
        local cfgid="$1"
        local lanif="${2:-lan}"
 set_6to4_radvd_interface() {
        local cfgid="$1"
        local lanif="${2:-lan}"

+       local ifmtu="${3:-1280}"

        local ifsection=""
 
        find_ifsection() {
        local ifsection=""
 
        find_ifsection() {


@@ -46,6 +56,7 @@ set_6to4_radvd_interface() {
        uci_set_state radvd "$ifsection" IgnoreIfMissing   1
        uci_set_state radvd "$ifsection" AdvSendAdvert     1
        uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30
        uci_set_state radvd "$ifsection" IgnoreIfMissing   1
        uci_set_state radvd "$ifsection" AdvSendAdvert     1
        uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30

+       uci_set_state radvd "$ifsection" AdvLinkMTU        "$ifmtu"

 }
 
 set_6to4_radvd_prefix() {
 }
 
 set_6to4_radvd_prefix() {


@@ -136,6 +147,11 @@ setup_interface_6to4() {
                }
        }
 
                }
        }
 

+       test_6to4_rfc1918 "$local4" && {
+               logger -t "$link" "Local wan ip $local4 is private - aborting"
+               return
+       }
+

        [ -n "$local4" ] && {
                logger -t "$link" "Starting ..."
 
        [ -n "$local4" ] && {
                logger -t "$link" "Starting ..."
 


@@ -160,7 +176,7 @@ setup_interface_6to4() {
 
                [ "$defaultroute" = 1 ] && {
                        logger -t "$link" " * Adding default route"
 
                [ "$defaultroute" = 1 ] && {
                        logger -t "$link" " * Adding default route"

-                       ip -6 route add 2000::/3 via ::192.88.99.1 metric ${metric:-1} dev $link
+                       ip -6 route add ::/0 via ::192.88.99.1 metric ${metric:-1} dev $link

                        uci_set_state network "$cfg" defaultroute 1
                }
 
                        uci_set_state network "$cfg" defaultroute 1
                }
 


@@ -189,7 +205,7 @@ setup_interface_6to4() {
                                        logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
                                        ip -6 addr add $subnet6 dev $adv_ifname
 
                                        logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
                                        ip -6 addr add $subnet6 dev $adv_ifname
 

-                                       set_6to4_radvd_interface "$sid" "$adv_interface"
+                                       set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu"

                                        set_6to4_radvd_prefix    "$sid" "$adv_interface" \
                                                "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
 
                                        set_6to4_radvd_prefix    "$sid" "$adv_interface" \
                                                "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
 


@@ -238,9 +254,8 @@ stop_interface_6to4() {
                        done
                }
 
                        done
                }
 

-               [ "$defaultroute" = "1" ] && {
-                       ip -6 route del 2000::/3 via ::192.88.99.1 dev $link metric 1
-               }
+               [ "$defaultroute" = "1" ] && \
+                       ip -6 route del ::/0 via ::192.88.99.1 dev $link

 
                ip addr del $local6 dev $link
                ip link set $link down
 
                ip addr del $local6 dev $link
                ip link set $link down