projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[geos] remove remaining uci-defaults
[openwrt.git] / package / 6to4 / files / 6to4.sh
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 4db924d..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,6 +18,83 @@ 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}"
+       local ifmtu="${3:-1280}"
+       local ifsection=""
+
+       find_ifsection() {
+               local net
+               local cfg="$1"
+               config_get net "$cfg" interface
+
+               [ "$net" = "$lanif" ] && {
+                       ifsection="$cfg"
+                       return 1
+               }
+       }
+
+       config_foreach find_ifsection interface
+
+       [ -z "$ifsection" ] && {
+               ifsection="iface_$sid"
+               uci_set_state radvd "$ifsection" "" interface
+               uci_set_state radvd "$ifsection" interface "$lanif"
+       }
+
+       uci_set_state radvd "$ifsection" ignore            0
+       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() {
+       local cfgid="$1"
+       local lanif="${2:-lan}"
+       local wanif="${3:-wan}"
+       local prefix="${4:-0:0:0:1::/64}"
+       local pfxsection=""
+
+       find_pfxsection() {
+               local net base
+               local cfg="$1"
+               config_get net  "$cfg" interface
+               config_get base "$cfg" Base6to4Interface
+
+               [ "$net" = "$lanif" ] && [ "$base" = "$wanif" ] && {
+                       pfxsection="$cfg"
+                       return 1
+               }
+       }
+
+       config_foreach find_pfxsection prefix
+
+       [ -z "$pfxsection" ] && {
+               pfxsection="prefix_${sid}_${lanif}"
+               uci_set_state radvd "$pfxsection" ""                   prefix
+               uci_set_state radvd "$pfxsection" ignore               0
+               uci_set_state radvd "$pfxsection" interface            "$lanif"
+               uci_set_state radvd "$pfxsection" prefix               "$prefix"
+               uci_set_state radvd "$pfxsection" AdvOnLink            1
+               uci_set_state radvd "$pfxsection" AdvAutonomous        1
+               uci_set_state radvd "$pfxsection" AdvValidLifetime     300
+               uci_set_state radvd "$pfxsection" AdvPreferredLifetime 120
+               uci_set_state radvd "$pfxsection" Base6to4Interface    "$wanif"
+       }
+}
+
+
 # Hook into scan_interfaces() to synthesize a .device option
 # This is needed for /sbin/ifup to properly dispatch control
 # to setup_interface_6to4() even if no .ifname is set in
 # Hook into scan_interfaces() to synthesize a .device option
 # This is needed for /sbin/ifup to properly dispatch control
 # to setup_interface_6to4() even if no .ifname is set in
@@ -37,15 +114,15 @@ setup_interface_6to4() {
 
        local local4=$(uci_get network "$cfg" ipaddr)
 
 
        local local4=$(uci_get network "$cfg" ipaddr)
 
-       local remote4
-       config_get remote4 "$cfg" peeraddr
-
        local mtu
        config_get mtu "$cfg" mtu
 
        local ttl
        config_get ttl "$cfg" ttl
 
        local mtu
        config_get mtu "$cfg" mtu
 
        local ttl
        config_get ttl "$cfg" ttl
 
+       local metric
+       config_get metric "$cfg" metric
+
        local defaultroute
        config_get_bool defaultroute "$cfg" defaultroute 1
 
        local defaultroute
        config_get_bool defaultroute "$cfg" defaultroute 1
 
@@ -70,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 ..."
 
@@ -94,52 +176,47 @@ 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 dev $link metric 1
+                       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
                }
 
-               # find delegation target
-               local adv_interface
-               config_get adv_interface "$cfg" adv_interface
-
-               local adv_ifname
-               config_get adv_ifname "${adv_interface:-lan}" ifname
-
-               local adv_subnet=$(uci_get network "$cfg" adv_subnet)
-
-               grep -qs "^ *$adv_ifname:" /proc/net/dev && {
-                       local subnet6="$prefix6:${adv_subnet:-1}::1/64"
-
-                       logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
-                       ip -6 addr add $subnet6 dev $adv_ifname
-                       uci_set_state network "$cfg" adv_subnet "$subnet6"
-                       uci_set_state network "$cfg" adv_ifname "$adv_ifname"
-
-                       [ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && {
-                               local sid="6to4_$cfg"
-
-                               uci -q batch <<-EOF
-                                       delete radvd.iface_$sid
-                                       delete radvd.prefix_$sid
-                                       set radvd.iface_$sid=interface
-                                       set radvd.iface_$sid.ignore=0
-                                       set radvd.iface_$sid.interface=${adv_interface:-lan}
-                                       set radvd.iface_$sid.IgnoreIfMissing=1
-                                       set radvd.iface_$sid.AdvSendAdvert=1
-                                       set radvd.iface_$sid.MaxRtrAdvInterval=30
-                                       set radvd.prefix_$sid=prefix
-                                       set radvd.prefix_$sid.ignore=0
-                                       set radvd.prefix_$sid.interface=${adv_interface:-lan}
-                                       set radvd.prefix_$sid.prefix=0:0:0:${adv_subnet:-1}::/64
-                                       set radvd.prefix_$sid.AdvOnLink=1
-                                       set radvd.prefix_$sid.AdvAutonomous=1
-                                       set radvd.prefix_$sid.AdvValidLifetime=300
-                                       set radvd.prefix_$sid.AdvPreferredLifetime=120
-                                       set radvd.prefix_$sid.Base6to4Interface=$wancfg
-                               EOF
-
-                               /etc/init.d/radvd restart
-                       }
+               [ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && {
+                       local sid="6to4_$cfg"
+
+                       uci_revert_state radvd
+                       config_load radvd
+
+                       # find delegation target
+                       local adv_interface
+                       config_get adv_interface "$cfg" adv_interface
+
+                       local adv_subnet=$(uci_get network "$cfg" adv_subnet)
+                             adv_subnet=$((0x${adv_subnet:-1}))
+
+                       local adv_subnets=""
+
+                       for adv_interface in ${adv_interface:-lan}; do
+                               local adv_ifname
+                               config_get adv_ifname "${adv_interface:-lan}" ifname
+
+                               grep -qs "^ *$adv_ifname:" /proc/net/dev && {
+                                       local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)"
+
+                                       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" "$mtu"
+                                       set_6to4_radvd_prefix    "$sid" "$adv_interface" \
+                                               "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
+
+                                       adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
+                                       adv_subnet=$(($adv_subnet + 1))
+                               }
+                       done
+
+                       uci_set_state network "$cfg" adv_subnets "$adv_subnets"
+
+                       /etc/init.d/radvd restart
                }
 
                logger -t "$link" "... started"
                }
 
                logger -t "$link" "... started"
@@ -157,30 +234,29 @@ stop_interface_6to4() {
        local local6=$(uci_get_state network "$cfg" ip6addr)
        local defaultroute=$(uci_get_state network "$cfg" defaultroute)
 
        local local6=$(uci_get_state network "$cfg" ip6addr)
        local defaultroute=$(uci_get_state network "$cfg" defaultroute)
 
-       local adv_subnet=$(uci_get_state network "$cfg" adv_subnet)
-       local adv_ifname=$(uci_get_state network "$cfg" adv_ifname)
+       local adv_subnets=$(uci_get_state network "$cfg" adv_subnets)
 
        grep -qs "^ *$link:" /proc/net/dev && {
                logger -t "$link" "Shutting down ..."
                env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" &
 
 
        grep -qs "^ *$link:" /proc/net/dev && {
                logger -t "$link" "Shutting down ..."
                env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" &
 
-               [ -n "$adv_subnet" ] && [ -n "$adv_ifname" ] && {
-                       local sid="6to4_$cfg"
-
-                       uci -q batch <<-EOF
-                               delete radvd.iface_$sid
-                               delete radvd.prefix_$sid
-                       EOF
-
+               [ -n "$adv_subnets" ] && {
+                       uci_revert_state radvd
                        /etc/init.d/radvd enabled && /etc/init.d/radvd restart
 
                        /etc/init.d/radvd enabled && /etc/init.d/radvd restart
 
-                       ip -6 addr del $adv_subnet dev $adv_ifname
-               }
+                       local adv_subnet
+                       for adv_subnet in $adv_subnets; do
+                               local ifname="${adv_subnet%%:*}"
+                               local subnet="${adv_subnet#*:}"
 
 
-               [ "$defaultroute" = "1" ] && {
-                       ip -6 route del 2000::/3 via ::192.88.99.1 dev $link metric 1
+                               logger -t "$link" " * Removing IPv6 subnet $subnet from interface $ifname"
+                               ip -6 addr del $subnet dev $ifname
+                       done
                }
 
                }
 
+               [ "$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 tunnel del $link
                ip addr del $local6 dev $link
                ip link set $link down
                ip tunnel del $link
Personal OpenWRT clone
This page took 0.027326 seconds and 4 git commands to generate.