mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-10-02 15:53:49 +03:00
[package] 6rd: apply the same simplifications done in 6to4 and 6in4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32432 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
fad2bfb9e1
commit
d84c1a6815
@ -8,7 +8,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=6rd
|
PKG_NAME:=6rd
|
||||||
PKG_VERSION:=1
|
PKG_VERSION:=2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
@ -48,8 +48,6 @@ define Package/6rd/install
|
|||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/6rdcalc $(1)/usr/sbin/
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/6rdcalc $(1)/usr/sbin/
|
||||||
$(INSTALL_DIR) $(1)/lib/netifd/proto
|
$(INSTALL_DIR) $(1)/lib/netifd/proto
|
||||||
$(INSTALL_BIN) ./files/6rd.sh $(1)/lib/netifd/proto/6rd.sh
|
$(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
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,6rd))
|
$(eval $(call BuildPackage,6rd))
|
||||||
|
@ -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
|
|
@ -9,13 +9,6 @@
|
|||||||
init_proto "$@"
|
init_proto "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
tun_error() {
|
|
||||||
local cfg="$1"; shift;
|
|
||||||
|
|
||||||
[ -n "$1" ] && proto_notify_error "$cfg" "$@"
|
|
||||||
proto_block_restart "$cfg"
|
|
||||||
}
|
|
||||||
|
|
||||||
proto_6rd_setup() {
|
proto_6rd_setup() {
|
||||||
local cfg="$1"
|
local cfg="$1"
|
||||||
local iface="$2"
|
local iface="$2"
|
||||||
@ -25,14 +18,17 @@ proto_6rd_setup() {
|
|||||||
json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen
|
json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen
|
||||||
|
|
||||||
[ -z "$ip6prefix" -o -z "$peeraddr" ] && {
|
[ -z "$ip6prefix" -o -z "$peeraddr" ] && {
|
||||||
tun_error "$cfg" "MISSING_ADDRESS"
|
proto_notify_error "$cfg" "MISSING_ADDRESS"
|
||||||
|
proto_block_restart "$cfg"
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
( proto_add_host_dependency "$cfg" 0.0.0.0 )
|
||||||
|
|
||||||
[ -z "$ipaddr" ] && {
|
[ -z "$ipaddr" ] && {
|
||||||
local wanif
|
local wanif
|
||||||
if ! network_find_wan wanif || ! network_get_ipaddr ipaddr "$wanif"; then
|
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
|
return
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user