Changeset 27164

Timestamp:

2011-06-12T21:31:30+02:00 (7 years ago)

Author:

jow

Message:

[backfire] merge r27163

Location:

branches/backfire/package/6to4

Files:

• Makefile (modified) (2 diffs)
• files/6to4.sh (modified) (4 diffs)

branches/backfire/package/6to4/Makefile

@@ -1 +1 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9 +9 @@
 
 PKG_NAME:=6to4
-PKG_VERSION:=4
+PKG_VERSION:=5
 PKG_RELEASE:=1
 

branches/backfire/package/6to4/files/6to4.sh

@@ -31 +31 @@
         local cfgid="$1"
         local lanif="${2:-lan}"
+        local ifmtu="${3:-1280}"
         local ifsection=""
 
@@ -56 +57 @@
         uci_set_state radvd "$ifsection" AdvSendAdvert     1
         uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30
+        uci_set_state radvd "$ifsection" AdvLinkMTU        "$ifmtu"
 }
 
@@ -204 +206 @@
                                         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)"
@@ -253 +255 @@
                 }
 
-                [ "$defaultroute" = "1" ] && {
-                        ip -6 route del 2000::/3 via ::192.88.99.1 dev $link metric 1
-                }
+                [ "$defaultroute" = "1" ] && \
+                        ip -6 route del 2000::/3 via ::192.88.99.1 dev $link
 
                 ip addr del $local6 dev $link