[package] 6in4: implement metric option
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 17 Nov 2010 19:13:11 +0000 (19:13 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 17 Nov 2010 19:13:11 +0000 (19:13 +0000)
SVN-Revision: 24022

package/6in4/Makefile
package/6in4/files/6in4.sh

index d03d2396ffa38fb6d21ee91b04b50eda47d11f63..905d7f810bfccaff6cc414d73ec4a3bc877e4daa 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=7
+PKG_VERSION:=8
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
index 2af1f74b297c744f2886817661f8f9156e13f387..5f8dfffe5785913db4b0308c2fd44d8f2b35cbb4 100755 (executable)
@@ -42,6 +42,9 @@ setup_interface_6in4() {
        local ttl
        config_get ttl "$cfg" ttl
 
        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,7 +73,7 @@ setup_interface_6in4() {
                uci_set_state network "$cfg" ip6addr $local6
 
                [ "$defaultroute" = 1 ] && {
                uci_set_state network "$cfg" ip6addr $local6
 
                [ "$defaultroute" = 1 ] && {
-                       ip -6 route add ::/0 dev $link
+                       ip -6 route add ::/0 ${metric:+metric $metric} dev $link
                        uci_set_state network "$cfg" defaultroute 1
                }
 
                        uci_set_state network "$cfg" defaultroute 1
                }