[patch] Patch against baselayout-1.9.1 for gre/ipip tunnels

baselayout-tunnels.diff (text/plain), 2.42 KB, created by George Barbarosie on 2004-05-11 09:48:32 UTC

diff -ur rc-scripts-1.4.12-vanilla/etc/conf.d/net rc-scripts-1.4.12/etc/conf.d/net
--- rc-scripts-1.4.12-vanilla/etc/conf.d/net	2004-05-11 19:23:11.193639266 +0300
+++ rc-scripts-1.4.12/etc/conf.d/net	2004-05-11 19:35:40.717136497 +0300
@@ -32,3 +32,13 @@
 #
 #gateway="eth0/192.168.0.1"
 
+# To create GRE/IPIP tunnels uncomment and change below;
+# you will need to create /etc/net.vpn0 as symlink to /etc/net.eth0
+#
+# GRE tunnel:
+#tunnel_vpn0="mode gre remote 207.170.82.1 key=0xffffffff ttl=255"
+#iface_vpn0="192.168.0.2 pointopoint 192.168.1.2"
+#
+# IPIP tunnel:
+#tunnel_vpn0="mode ipip remote 207.170.82.2 ttl=255"
+#iface_vpn0="192.168.0.2 pointopoint 192.168.2.2"
diff -ur rc-scripts-1.4.12-vanilla/init.d/net.eth0 rc-scripts-1.4.12/init.d/net.eth0
--- rc-scripts-1.4.12-vanilla/init.d/net.eth0	2004-05-11 19:23:11.205637306 +0300
+++ rc-scripts-1.4.12/init.d/net.eth0	2004-05-11 19:42:56.118955786 +0300
@@ -52,7 +52,9 @@
 	local i iface="${1//\./_}"
 
 	status_IFACE="$(ifconfig ${1} 2>${devnull} | gawk '$1 == "UP" {print "up"}')"
+	status_TUNNEL="$(/sbin/iptunnel show ${1})"
 	eval vlans_IFACE=\"\$\{iface_${iface}_vlans\}\"
+	eval tunnel_IFACE=\"$\{tunnel_${iface}\}\"
 	eval ifconfig_IFACE=( \"\$\{ifconfig_$iface\[@\]\}\" )
 	eval dhcpcd_IFACE=\"\$\{dhcpcd_$iface\}\"
 	eval routes_IFACE=( \"\$\{routes_$iface\[@\]\}\" )
@@ -88,6 +90,13 @@
 	local IFACE=${1} i x retval
 	checkconfig || return 1
 
+	# Tunnel configuration detected; run iptunnel
+	if [[ -z ${status_TUNNEL} && -n ${tunnel_IFACE} ]]; then
+		ebegin "Configuring tunnel ${IFACE}"
+		/sbin/iptunnel add ${IFACE} ${tunnel_IFACE}
+		eend 0
+	fi
+	
 	if [[ ${ifconfig_IFACE} != dhcp ]]; then
 		# Show the address, but catch if this interface will be inet6 only
 		i=${ifconfig_IFACE%% *}
@@ -214,6 +223,16 @@
 		ebegin "Bringing ${IFACE} down"
 		ifconfig ${IFACE} down &>/dev/null
 		eend 0
+
+		# Try to tear down tunnel
+		# setup_vars doesn't get to run, build status_TUNNEL 
+		status_TUNNEL="$(/sbin/iptunnel show ${IFACE})"
+		if [[ -n ${status_TUNNEL} ]]; then
+			ebegin "Destroying tunnel ${IFACE}"
+			/sbin/iptunnel del ${IFACE}
+			eend
+		fi
+
 		return 0
 	fi
 
@@ -252,6 +271,15 @@
 		eend 0
 	done
 
+	# Try to tear down tunnel
+	# setup_vars doesn't get to run, build status_TUNNEL 
+	status_TUNNEL="$(/sbin/iptunnel show ${IFACE})"
+	if [[ -n ${status_TUNNEL} ]]; then
+		ebegin "Destroying tunnel ${IFACE}"
+		/sbin/iptunnel del ${IFACE}
+		eend
+	fi
+	
 	return 0
 }