X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/28ddaa0be90eb40be1de43e973260b7be20872c3..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/6in4/files/6in4.sh

diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index bea2e82ea..5f8dfffe5 100755
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -2,7 +2,7 @@
 # Copyright (c) 2010 OpenWrt.org
 
 find_6in4_wanif() {
-	local if=$(ip -4 r l e 0/0); if="${if#default* dev }"; if="${if%% *}"
+	local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}"
 	[ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if"
 }
 
@@ -28,7 +28,7 @@ setup_interface_6in4() {
 	local cfg="$2"
 	local link="6in4-$cfg"
 
-	local local4=$(uci_get network "$cfg" local4)
+	local local4=$(uci_get network "$cfg" ipaddr)
 
 	local remote4
 	config_get remote4 "$cfg" peeraddr
@@ -42,6 +42,9 @@ setup_interface_6in4() {
 	local ttl
 	config_get ttl "$cfg" ttl
 
+	local metric
+	config_get metric "$cfg" metric
+
 	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 ] && {
-			ip -6 route add ::/0 dev $link
+			ip -6 route add ::/0 ${metric:+metric $metric} dev $link
 			uci_set_state network "$cfg" defaultroute 1
 		}