From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jun 2012 23:08:20 +0000 (+0000)
Subject: 6rd: apply the same simplifications done in 6to4 and 6in4
X-Git-Tag: reboot~13566
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d65c8552032ba94daae2fa137c3dab0d40e7021b;p=openwrt%2Fstaging%2Fchunkeey.git

6rd: apply the same simplifications done in 6to4 and 6in4

SVN-Revision: 32432
---

diff --git a/package/6rd/Makefile b/package/6rd/Makefile
index 15b6e7a43e..3d4549674f 100644
--- a/package/6rd/Makefile
+++ b/package/6rd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6rd
-PKG_VERSION:=1
+PKG_VERSION:=2
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -48,8 +48,6 @@ define Package/6rd/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/6rdcalc $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/lib/netifd/proto
 	$(INSTALL_BIN) ./files/6rd.sh $(1)/lib/netifd/proto/6rd.sh
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/6rd.hotplug $(1)/etc/hotplug.d/iface/92-6rd
 endef
 
 $(eval $(call BuildPackage,6rd))
diff --git a/package/6rd/files/6rd.hotplug b/package/6rd/files/6rd.hotplug
deleted file mode 100644
index f38526c53a..0000000000
--- a/package/6rd/files/6rd.hotplug
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-if [ "$ACTION" = ifup ]; then
-	. /lib/functions.sh
-
-	INCLUDE_ONLY=1
-	. /lib/netifd/proto/6rd.sh
-
-	include /lib/network
-	scan_interfaces
-
-	update_tunnel() {
-		local cfg="$1"
-
-		local proto
-		config_get proto "$cfg" proto
-		[ "$proto" = 6rd ] || return 0
-
-		local wandev
-		config_get wandev "$cfg" wan_device "$(find_6rd_wanif)"
-		[ "$wandev" = "$DEVICE" ] || return 0
-
-		local wanip=$(find_6rd_wanip "$wandev")
-
-		[ -n "$wanip" ] && ifup "$cfg"
-	}
-
-	config_foreach update_tunnel interface
-fi
diff --git a/package/6rd/files/6rd.sh b/package/6rd/files/6rd.sh
index 3786ef06f9..d4dea369de 100644
--- a/package/6rd/files/6rd.sh
+++ b/package/6rd/files/6rd.sh
@@ -9,13 +9,6 @@
 	init_proto "$@"
 }
 
-tun_error() {
-	local cfg="$1"; shift;
-
-	[ -n "$1" ] && proto_notify_error "$cfg" "$@"
-	proto_block_restart "$cfg"
-}
-
 proto_6rd_setup() {
 	local cfg="$1"
 	local iface="$2"
@@ -25,14 +18,17 @@ proto_6rd_setup() {
 	json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen
 
 	[ -z "$ip6prefix" -o -z "$peeraddr" ] && {
-		tun_error "$cfg" "MISSING_ADDRESS"
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
 		return
 	}
 
+	( proto_add_host_dependency "$cfg" 0.0.0.0 )
+
 	[ -z "$ipaddr" ] && {
 		local wanif
 		if ! network_find_wan wanif || ! network_get_ipaddr ipaddr "$wanif"; then
-			tun_error "$cfg" "NO_WAN_LINK"
+			proto_notify_error "$cfg" "NO_WAN_LINK"
 			return
 		fi
 	}