From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 2 Jul 2012 12:14:50 +0000 (+0000)
Subject: 6to4: fix ifname resolving for adv_interface option (#11796)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b2e2de794ec0b592052d3a6375b8987654c25093;p=openwrt%2Fstaging%2Fnbd.git

6to4: fix ifname resolving for adv_interface option (#11796)

SVN-Revision: 32576
---

diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index 740697f75e..fdf8627a45 100644
--- a/package/6to4/Makefile
+++ b/package/6to4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
-PKG_VERSION:=9
+PKG_VERSION:=10
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 10abd9a26e..f518b02332 100755
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -143,7 +143,6 @@ proto_6to4_setup() {
 
 		uci_revert_state radvd
 		config_load radvd
-		config_load network
 
 		adv_subnet=$((0x${adv_subnet:-1}))
 
@@ -151,22 +150,20 @@ proto_6to4_setup() {
 
 		for adv_interface in ${adv_interface:-lan}; do
 			local adv_ifname
-			config_get adv_ifname "${adv_interface:-lan}" ifname
+			network_get_device adv_ifname "${adv_interface:-lan}" || continue
 
-			grep -qs "^ *$adv_ifname:" /proc/net/dev && {
-				local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)"
+			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
+			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_valid_lifetime" "$adv_preferred_lifetime"
+			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_valid_lifetime" "$adv_preferred_lifetime"
 
-				adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
-				adv_subnet=$(($adv_subnet + 1))
-			}
+			adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
+			adv_subnet=$(($adv_subnet + 1))
 		done
 
 		uci_set_state network "$cfg" adv_subnets "$adv_subnets"