[package] 6to4: advertise effective tunnel mtu in RAs

[openwrt/svn-archive/archive.git] / package / 6to4 / files / 6to4.sh

diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 6e85914b434190f72475647342dc6a984cf272f2..b8baa1510d248054cd81ad0a70a4cb858a1d7cb5 100755 (executable)
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -30,6 +30,7 @@ test_6to4_rfc1918()
 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() {


@@ -55,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() {


@@ -203,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)"
 


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

-               [ "$defaultroute" = "1" ] && {
-                       ip -6 route del ::/0 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