X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2F6to4%2Ffiles%2F6to4.sh;h=3a616f675bb609bceb6ffa2a1b5ce74f66d18e25;hb=eecf5b17520f6b3b6ffb45ac7dca298d93b27501;hp=65f4ffa5c2613f731f11f1fbd2b60f05b13907ea;hpb=28e2aaeeb28bc2a308395f4aab511b5ad20a1bbd;p=openwrt.git

diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 65f4ffa5c2..3a616f675b 100755
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -1,14 +1,12 @@
+#!/bin/sh
 # 6to4.sh - IPv6-in-IPv4 tunnel backend
-# Copyright (c) 2010 OpenWrt.org
+# Copyright (c) 2010-2012 OpenWrt.org
 
-find_6to4_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_6to4_wanip() {
-	local ip=$(ip -4 a s dev "$1"); ip="${ip#*inet }"
-	echo "${ip%%[^0-9.]*}"
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
 }
 
 find_6to4_prefix() {
@@ -18,9 +16,23 @@ find_6to4_prefix() {
 	printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4
 }
 
+test_6to4_rfc1918()
+{
+	local oIFS="$IFS"; IFS="."; set -- $1; IFS="$oIFS"
+	[ $1 -eq  10 ] && return 0
+	[ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0
+	[ $1 -eq 172 ] && [ $2 -ge  16 ] && [ $2 -le  31 ] && return 0
+
+	# RFC 6598
+	[ $1 -eq 100 ] && [ $2 -ge  64 ] && [ $2 -le 127 ] && return 0
+
+	return 1
+}
+
 set_6to4_radvd_interface() {
 	local cfgid="$1"
 	local lanif="${2:-lan}"
+	local ifmtu="${3:-1280}"
 	local ifsection=""
 
 	find_ifsection() {
@@ -46,6 +58,7 @@ set_6to4_radvd_interface() {
 	uci_set_state radvd "$ifsection" IgnoreIfMissing   1
 	uci_set_state radvd "$ifsection" AdvSendAdvert     1
 	uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30
+	uci_set_state radvd "$ifsection" AdvLinkMTU        "$ifmtu"
 }
 
 set_6to4_radvd_prefix() {
@@ -53,6 +66,8 @@ set_6to4_radvd_prefix() {
 	local lanif="${2:-lan}"
 	local wanif="${3:-wan}"
 	local prefix="${4:-0:0:0:1::/64}"
+	local vlt="${5:-300}"
+	local plt="${6:-120}"
 	local pfxsection=""
 
 	find_pfxsection() {
@@ -77,175 +92,118 @@ set_6to4_radvd_prefix() {
 		uci_set_state radvd "$pfxsection" prefix               "$prefix"
 		uci_set_state radvd "$pfxsection" AdvOnLink            1
 		uci_set_state radvd "$pfxsection" AdvAutonomous        1
-		uci_set_state radvd "$pfxsection" AdvValidLifetime     300
-		uci_set_state radvd "$pfxsection" AdvPreferredLifetime 120
+		uci_set_state radvd "$pfxsection" AdvValidLifetime     "$vlt"
+		uci_set_state radvd "$pfxsection" AdvPreferredLifetime "$plt"
 		uci_set_state radvd "$pfxsection" Base6to4Interface    "$wanif"
 	}
 }
 
-
-# Hook into scan_interfaces() to synthesize a .device option
-# This is needed for /sbin/ifup to properly dispatch control
-# to setup_interface_6to4() even if no .ifname is set in
-# the configuration.
-scan_6to4() {
-	config_set "$1" device "6to4-$1"
-}
-
-coldplug_interface_6to4() {
-	setup_interface_6to4 "6to4-$1" "$1"
-}
-
-setup_interface_6to4() {
-	local iface="$1"
-	local cfg="$2"
+proto_6to4_setup() {
+	local cfg="$1"
+	local iface="$2"
 	local link="6to4-$cfg"
 
-	local local4=$(uci_get network "$cfg" ipaddr)
-
-	local mtu
-	config_get mtu "$cfg" mtu
-
-	local ttl
-	config_get ttl "$cfg" ttl
-
-	local metric
-	config_get metric "$cfg" metric
+	local mtu ttl ipaddr adv_subnet adv_interface adv_valid_lifetime adv_preferred_lifetime
+	json_get_vars mtu ttl ipaddr adv_subnet adv_interface adv_valid_lifetime adv_preferred_lifetime
 
-	local defaultroute
-	config_get_bool defaultroute "$cfg" defaultroute 1
+	( proto_add_host_dependency "$cfg" 0.0.0.0 )
 
-	local wanif=$(find_6to4_wanif)
-	[ -z "$wanif" ] && {
-		logger -t "$link" "Cannot find wan interface - aborting"
+	local wanif
+	if ! network_find_wan wanif; then
+		proto_notify_error "$cfg" "NO_WAN_LINK"
 		return
+	fi
+
+	[ -z "$ipaddr" ] && {
+		if ! network_get_ipaddr ipaddr "$wanif"; then
+			proto_notify_error "$cfg" "NO_WAN_ADDRESS"
+			return
+		fi
 	}
 
-	local wancfg=$(find_config "$wanif")
-	[ -z "$wancfg" ] && {
-		logger -t "$link" "Cannot find wan network - aborting"
+	test_6to4_rfc1918 "$ipaddr" && {
+		proto_notify_error "$cfg" "INVALID_LOCAL_ADDRESS"
 		return
 	}
 
-	# If local4 is unset, guess local IPv4 address from the
-	# interface used by the default route.
-	[ -z "$local4" ] && {
-		[ -n "$wanif" ] && {
-			local4=$(find_6to4_wanip "$wanif")
-			uci_set_state network "$cfg" wan_device "$wanif"
-		}
-	}
+	# find our local prefix
+	local prefix6=$(find_6to4_prefix "$ipaddr")
+	local local6="$prefix6::1"
 
-	[ -n "$local4" ] && {
-		logger -t "$link" "Starting ..."
+	proto_init_update "$link" 1
+	proto_add_ipv6_address "$local6" 16
+	proto_add_ipv6_route "::" 0 "::192.88.99.1"
 
-		# 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
+	proto_add_tunnel
+	json_add_string mode sit
+	json_add_int mtu "${mtu:-1280}"
+	json_add_int ttl "${ttl:-64}"
+	json_add_string local "$ipaddr"
+	proto_close_tunnel
 
-		# find our local prefix
-		local prefix6=$(find_6to4_prefix "$local4")
-		local local6="$prefix6::1/16"
+	proto_send_update "$cfg"
 
-		logger -t "$link" " * IPv4 address is $local4"
-		logger -t "$link" " * IPv6 address is $local6"
-		ip tunnel add $link mode sit remote any local $local4 ttl ${ttl:-64}
-		ip link set $link up
-		ip link set mtu ${mtu:-1280} dev $link
-		ip addr add $local6 dev $link
+	[ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && {
+		local sid="6to4_$cfg"
 
-		uci_set_state network "$cfg" ipaddr $local4
-		uci_set_state network "$cfg" ip6addr $local6
+		uci_revert_state radvd
+		config_load radvd
 
-		[ "$defaultroute" = 1 ] && {
-			logger -t "$link" " * Adding default route"
-			ip -6 route add ::/0 via ::192.88.99.1 metric ${metric:-1} dev $link
-			uci_set_state network "$cfg" defaultroute 1
-		}
+		adv_subnet=$((0x${adv_subnet:-1}))
 
-		[ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && {
-			local sid="6to4_$cfg"
+		local adv_subnets=""
 
-			uci_revert_state radvd
-			config_load radvd
-
-			# find delegation target
-			local adv_interface
-			config_get adv_interface "$cfg" adv_interface
-
-			local adv_subnet=$(uci_get network "$cfg" adv_subnet)
-			      adv_subnet=$((0x${adv_subnet:-1}))
-
-			local adv_subnets=""
-
-			for adv_interface in ${adv_interface:-lan}; do
-				local adv_ifname
-				config_get adv_ifname "${adv_interface:-lan}" ifname
+		for adv_interface in ${adv_interface:-lan}; do
+			local adv_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"
-					set_6to4_radvd_prefix    "$sid" "$adv_interface" \
-						"$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
+			set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu"
+			set_6to4_radvd_prefix    "$sid" "$adv_interface" \
+				"$wanif" "$(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))
-				}
-			done
+			adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
+			adv_subnet=$(($adv_subnet + 1))
+		done
 
-			uci_set_state network "$cfg" adv_subnets "$adv_subnets"
+		uci_set_state network "$cfg" adv_subnets "$adv_subnets"
 
-			/etc/init.d/radvd restart
-		}
-
-		logger -t "$link" "... started"
-
-		env -i ACTION="ifup" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" &
-	} || {
-		echo "Cannot determine local IPv4 address for 6to4 tunnel $cfg - skipping"
+		/etc/init.d/radvd restart
 	}
 }
 
-stop_interface_6to4() {
+proto_6to4_teardown() {
 	local cfg="$1"
 	local link="6to4-$cfg"
 
-	local local6=$(uci_get_state network "$cfg" ip6addr)
-	local defaultroute=$(uci_get_state network "$cfg" defaultroute)
-
 	local adv_subnets=$(uci_get_state network "$cfg" adv_subnets)
 
 	grep -qs "^ *$link:" /proc/net/dev && {
-		logger -t "$link" "Shutting down ..."
-		env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" &
-
 		[ -n "$adv_subnets" ] && {
 			uci_revert_state radvd
 			/etc/init.d/radvd enabled && /etc/init.d/radvd restart
-
-			local adv_subnet
-			for adv_subnet in $adv_subnets; do
-				local ifname="${adv_subnet%%:*}"
-				local subnet="${adv_subnet#*:}"
-
-				logger -t "$link" " * Removing IPv6 subnet $subnet from interface $ifname"
-				ip -6 addr del $subnet dev $ifname
-			done
-		}
-
-		[ "$defaultroute" = "1" ] && {
-			ip -6 route del ::/0 via ::192.88.99.1 dev $link metric 1
 		}
+	}
+}
 
-		ip addr del $local6 dev $link
-		ip link set $link down
-		ip tunnel del $link
+proto_6to4_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_string "ipaddr"
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "adv_interface"
+	proto_config_add_string "adv_subnet"
+	proto_config_add_int "adv_valid_lifetime"
+	proto_config_add_int "adv_preferred_lifetime"
+}
 
-		logger -t "$link" "... stopped"
-	}
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol 6to4
 }