6in4: add netifd support

SVN-Revision: 31036
This commit is contained in:
Felix Fietkau 2012-03-19 21:10:04 +00:00
parent 1147799b85
commit 3454c35127
5 changed files with 283 additions and 107 deletions

View File

@ -34,11 +34,20 @@ endef
define Build/Configure define Build/Configure
endef endef
define Package/6in4/install ifneq ($(CONFIG_PACKAGE_netifd),)
$(INSTALL_DIR) $(1)/lib/network define Package/6in4/install
$(INSTALL_DATA) ./files/6in4.sh $(1)/lib/network/6in4.sh $(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
$(INSTALL_DATA) ./files/6in4.hotplug $(1)/etc/hotplug.d/iface/90-6in4 $(INSTALL_DATA) ./files/6in4.hotplug $(1)/etc/hotplug.d/iface/90-6in4
endef endef
else
define Package/6in4/install
$(INSTALL_DIR) $(1)/lib/network
$(INSTALL_DATA) ./files.old/6in4.sh $(1)/lib/network/6in4.sh
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
$(INSTALL_DATA) ./files.old/6in4.hotplug $(1)/etc/hotplug.d/iface/90-6in4
endef
endif
$(eval $(call BuildPackage,6in4)) $(eval $(call BuildPackage,6in4))

View File

@ -0,0 +1,68 @@
#!/bin/sh
if [ "$ACTION" = ifup ]; then
. /etc/functions.sh
include /lib/network
scan_interfaces
update_tunnel() {
local cfg="$1"
local proto
config_get proto "$cfg" proto
[ "$proto" = 6in4 ] || return 0
local wandev
config_get wandev "$cfg" wan_device "$(find_6in4_wanif)"
[ "$wandev" = "$DEVICE" ] || return 0
local wanip=$(find_6in4_wanip "$wandev")
[ -n "$wanip" ] && {
lsmod | grep -q ^sit || {
logger -t 6in4-update "Tunneling driver not loaded yet, deferring action"
exit 0
}
local tunnelid
config_get tunnelid "$cfg" tunnelid
local username
config_get username "$cfg" username
local password
config_get password "$cfg" password
uci_set_state network "$cfg" ipaddr "$wanip"
[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
[ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
}
(
local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
local try=0
local max=3
while [ $((++try)) -le $max ]; do
wget -qO/dev/null "$url" 2>/dev/null && {
logger -t 6in4-update "Updated tunnel #$tunnelid endpoint to $wanip"
ifup "$cfg"
break
} || {
logger -t 6in4-update "Try $try/$max failed, retrying"
sleep 1
}
done
)&
} || {
logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)"
ifup "$cfg" &
}
}
}
config_foreach update_tunnel interface
fi

104
package/6in4/files.old/6in4.sh Executable file
View File

@ -0,0 +1,104 @@
# 6in4.sh - IPv6-in-IPv4 tunnel backend
# Copyright (c) 2010 OpenWrt.org
find_6in4_wanif() {
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"
}
find_6in4_wanip() {
local ip=$(ip -4 a s dev "$1"); ip="${ip#*inet }"
echo "${ip%%[^0-9.]*}"
}
# Hook into scan_interfaces() to synthesize a .device option
# This is needed for /sbin/ifup to properly dispatch control
# to setup_interface_6in4() even if no .ifname is set in
# the configuration.
scan_6in4() {
config_set "$1" device "6in4-$1"
}
coldplug_interface_6in4() {
setup_interface_6in4 "6in4-$1" "$1"
}
setup_interface_6in4() {
local iface="$1"
local cfg="$2"
local link="6in4-$cfg"
local local4=$(uci_get network "$cfg" ipaddr)
local remote4
config_get remote4 "$cfg" peeraddr
local local6
config_get local6 "$cfg" ip6addr
local mtu
config_get mtu "$cfg" mtu
local ttl
config_get ttl "$cfg" ttl
local metric
config_get metric "$cfg" metric
local defaultroute
config_get_bool defaultroute "$cfg" defaultroute 1
# If local4 is unset, guess local IPv4 address from the
# interface used by the default route.
[ -z "$local4" ] && {
local wanif=$(find_6in4_wanif)
[ -n "$wanif" ] && {
local4=$(find_6in4_wanip "$wanif")
uci_set_state network "$cfg" wan_device "$wanif"
}
}
[ -n "$local4" ] && {
# creating the tunnel below will trigger a net subsystem event
# prevent it from touching or iface by disabling .auto here
uci_set_state network "$cfg" ifname $link
uci_set_state network "$cfg" auto 0
ip tunnel add $link mode sit remote $remote4 local $local4 ttl ${ttl:-64}
ip link set $link up
ip link set mtu ${mtu:-1280} dev $link
ip addr add $local6 dev $link
uci_set_state network "$cfg" ipaddr $local4
uci_set_state network "$cfg" ip6addr $local6
[ "$defaultroute" = 1 ] && {
ip -6 route add ::/0 ${metric:+metric $metric} dev $link
uci_set_state network "$cfg" defaultroute 1
}
env -i ACTION="ifup" INTERFACE="$cfg" DEVICE="$link" PROTO=6in4 /sbin/hotplug-call "iface" &
} || {
echo "Cannot determine local IPv4 address for 6in4 tunnel $cfg - skipping"
}
}
stop_interface_6in4() {
local cfg="$1"
local link="6in4-$cfg"
local local6=$(uci_get_state network "$cfg" ip6addr)
local defaultroute=$(uci_get_state network "$cfg" defaultroute)
grep -qs "^ *$link:" /proc/net/dev && {
env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6in4 /sbin/hotplug-call "iface" &
[ "$defaultroute" = "1" ] && {
ip -6 route del ::/0 dev $link
}
ip addr del $local6 dev $link
ip link set $link down
ip tunnel del $link
}
}

View File

@ -3,6 +3,9 @@
if [ "$ACTION" = ifup ]; then if [ "$ACTION" = ifup ]; then
. /etc/functions.sh . /etc/functions.sh
INCLUDE_ONLY=1
. /lib/netifd/proto/6in4.sh
include /lib/network include /lib/network
scan_interfaces scan_interfaces
@ -19,49 +22,7 @@ if [ "$ACTION" = ifup ]; then
local wanip=$(find_6in4_wanip "$wandev") local wanip=$(find_6in4_wanip "$wandev")
[ -n "$wanip" ] && { [ -n "$wanip" ] && ifup "$cfg"
lsmod | grep -q ^sit || {
logger -t 6in4-update "Tunneling driver not loaded yet, deferring action"
exit 0
}
local tunnelid
config_get tunnelid "$cfg" tunnelid
local username
config_get username "$cfg" username
local password
config_get password "$cfg" password
uci_set_state network "$cfg" ipaddr "$wanip"
[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
[ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
}
(
local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
local try=0
local max=3
while [ $((++try)) -le $max ]; do
wget -qO/dev/null "$url" 2>/dev/null && {
logger -t 6in4-update "Updated tunnel #$tunnelid endpoint to $wanip"
ifup "$cfg"
break
} || {
logger -t 6in4-update "Try $try/$max failed, retrying"
sleep 1
}
done
)&
} || {
logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)"
ifup "$cfg" &
}
}
} }
config_foreach update_tunnel interface config_foreach update_tunnel interface

View File

@ -1,6 +1,13 @@
#!/bin/sh
# 6in4.sh - IPv6-in-IPv4 tunnel backend # 6in4.sh - IPv6-in-IPv4 tunnel backend
# Copyright (c) 2010 OpenWrt.org # Copyright (c) 2010 OpenWrt.org
[ -n "$INCLUDE_ONLY" ] || {
. /etc/functions.sh
. ../netifd-proto.sh
init_proto "$@"
}
find_6in4_wanif() { find_6in4_wanif() {
local if=$(ip -4 r l e 0.0.0.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" [ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if"
@ -23,82 +30,109 @@ coldplug_interface_6in4() {
setup_interface_6in4 "6in4-$1" "$1" setup_interface_6in4 "6in4-$1" "$1"
} }
setup_interface_6in4() {
local iface="$1" tun_error() {
local cfg="$2" local cfg="$1"; shift;
[ -n "$1" ] && proto_notify_error "$cfg" "$@"
proto_block_restart "$cfg"
}
proto_6in4_setup() {
local cfg="$1"
local iface="$2"
local link="6in4-$cfg" local link="6in4-$cfg"
local local4=$(uci_get network "$cfg" ipaddr) json_get_var mtu mtu
json_get_var ttl ttl
json_get_var local4 ipaddr
json_get_var remote4 peeraddr
json_get_var ip6addr ip6addr
json_get_var tunnelid tunnelid
json_get_var username username
json_get_var password password
local remote4 [ -z "$ip6addr" -o -z "$remote4" ] && {
config_get remote4 "$cfg" peeraddr tun_error "$cfg" "MISSING_ADDRESS"
return
}
local local6
config_get local6 "$cfg" ip6addr
local mtu
config_get mtu "$cfg" mtu
local ttl
config_get ttl "$cfg" ttl
local metric
config_get metric "$cfg" metric
local defaultroute
config_get_bool defaultroute "$cfg" defaultroute 1
# If local4 is unset, guess local IPv4 address from the
# interface used by the default route.
[ -z "$local4" ] && { [ -z "$local4" ] && {
local wanif=$(find_6in4_wanif) local wanif=$(find_6in4_wanif)
[ -n "$wanif" ] && { [ -z "$wanif" ] && {
local4=$(find_6in4_wanip "$wanif") tun_error "$cfg" "NO_WAN_LINK"
uci_set_state network "$cfg" wan_device "$wanif" return
}
. /lib/network/config.sh
local wancfg="$(find_config "$wanif")"
[ -z "$wancfg" ] && {
tun_error "$cfg" "NO_WAN_LINK"
return
}
# If local4 is unset, guess local IPv4 address from the
# interface used by the default route.
[ -n "$wanif" ] && local4=$(find_6in4_wanip "$wanif")
[ -z "$local4" ] && {
tun_error "$cfg" "NO_WAN_LINK"
return
} }
} }
[ -n "$local4" ] && { local local6="${ip6addr%%/*}"
# creating the tunnel below will trigger a net subsystem event local mask6="${ip6addr##*/}"
# prevent it from touching or iface by disabling .auto here [[ "$local6" = "$mask6" ]] && mask6=
uci_set_state network "$cfg" ifname $link
uci_set_state network "$cfg" auto 0
ip tunnel add $link mode sit remote $remote4 local $local4 ttl ${ttl:-64} proto_init_update "$link" 1
ip link set $link up proto_add_ipv6_address "$local6" "$mask6"
ip link set mtu ${mtu:-1280} dev $link proto_add_ipv6_route "::" 0
ip addr add $local6 dev $link
uci_set_state network "$cfg" ipaddr $local4 proto_add_tunnel
uci_set_state network "$cfg" ip6addr $local6 json_add_string mode sit
json_add_int mtu "${mtu:-1280}"
json_add_int ttl "${ttl:-64}"
json_add_string local "$local4"
json_add_string remote "$remote4"
proto_close_tunnel
[ "$defaultroute" = 1 ] && { proto_send_update "$cfg"
ip -6 route add ::/0 ${metric:+metric $metric} dev $link
uci_set_state network "$cfg" defaultroute 1 [ -n "$tunnelid" -a -n "$username" -a -n "$password" ] && {
[ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
} }
env -i ACTION="ifup" INTERFACE="$cfg" DEVICE="$link" PROTO=6in4 /sbin/hotplug-call "iface" & local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
} || { local try=0
echo "Cannot determine local IPv4 address for 6in4 tunnel $cfg - skipping" local max=3
while [ $((++try)) -le $max ]; do
wget -qO/dev/null "$url" 2>/dev/null && break
sleep 1
done
} }
} }
stop_interface_6in4() { proto_6in4_teardown() {
local cfg="$1" local cfg="$1"
local link="6in4-$cfg" }
local local6=$(uci_get_state network "$cfg" ip6addr) proto_6in4_init_config() {
local defaultroute=$(uci_get_state network "$cfg" defaultroute) no_device=1
available=1
grep -qs "^ *$link:" /proc/net/dev && {
env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6in4 /sbin/hotplug-call "iface" & proto_config_add_string "ipaddr"
proto_config_add_string "ip6addr"
[ "$defaultroute" = "1" ] && { proto_config_add_string "peeraddr"
ip -6 route del ::/0 dev $link proto_config_add_string "tunnelid"
} proto_config_add_string "username"
proto_config_add_string "password"
ip addr del $local6 dev $link proto_config_add_int "mtu"
ip link set $link down proto_config_add_int "ttl"
ip tunnel del $link }
}
[ -n "$INCLUDE_ONLY" ] || {
add_protocol 6in4
} }