From d65c8552032ba94daae2fa137c3dab0d40e7021b Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jun 2012 23:08:20 +0000
Subject: 6rd: apply the same simplifications done in 6to4 and 6in4
SVN-Revision: 32432
---
package/6rd/files/6rd.hotplug | 29 -----------------------------
package/6rd/files/6rd.sh | 14 +++++---------
2 files changed, 5 insertions(+), 38 deletions(-)
delete mode 100644 package/6rd/files/6rd.hotplug
(limited to 'package/6rd/files')
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
}
--
cgit v1.2.3