From b900bfe5a536065665f6575aaa84b0615db856dc Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Tue, 25 Jul 2006 02:36:49 +0000 Subject: GRE and IPIP tunnel support (#168990, based on patches by Razvan Corneliu C.R. Vilt , Aaron Hope and Sean Millichamp ) check_device_down: Handle tunnel_device@NONE: <...> --- sysconfig/network-scripts/ifdown-tunnel | 39 +++++++++++++++ sysconfig/network-scripts/ifup-tunnel | 73 +++++++++++++++++++++++++++++ sysconfig/network-scripts/network-functions | 6 ++- 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 sysconfig/network-scripts/ifdown-tunnel create mode 100644 sysconfig/network-scripts/ifup-tunnel (limited to 'sysconfig/network-scripts') diff --git a/sysconfig/network-scripts/ifdown-tunnel b/sysconfig/network-scripts/ifdown-tunnel new file mode 100644 index 00000000..0e8d1cc9 --- /dev/null +++ b/sysconfig/network-scripts/ifdown-tunnel @@ -0,0 +1,39 @@ +#!/bin/bash +# Copyright (C) 1996-2006 Red Hat, Inc. all rights reserved. +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# Thanks to: +# - Razvan Corneliu C.R. Vilt +# - Aaron Hope +# - Sean Millichamp +# for providing the scripts this one is based on + +. /etc/init.d/functions + +cd /etc/sysconfig/network-scripts +. network-functions + +[ -f ../network ] && . ../network + +CONFIG=$1 +need_config "$CONFIG" +source_config + +# Generic tunnel devices are not supported here +if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then + echo $"Device '$DEVICE' isn't supported as a valid GRE device name." + exit 1 +fi + +check_device_down "$DEVICE" && exit 0 + +/sbin/ip link set dev "$DEVICE" down +/sbin/ip tunnel del "$DEVICE" + +exec /etc/sysconfig/network-scripts/ifdown-post "$CONFIG" diff --git a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel new file mode 100644 index 00000000..7e5058f1 --- /dev/null +++ b/sysconfig/network-scripts/ifup-tunnel @@ -0,0 +1,73 @@ +#!/bin/bash +# Copyright (C) 1996-2006 Red Hat, Inc. all rights reserved. +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# Thanks to: +# - Razvan Corneliu C.R. Vilt +# - Aaron Hope +# - Sean Millichamp +# for providing the scripts this one is based on + +. /etc/init.d/functions + +cd /etc/sysconfig/network-scripts +. network-functions + +CONFIG=$1 +need_config "$CONFIG" +source_config + +if [ "$PEER_OUTER_IPADDR" = "$PEER_INNER_IPADDR" ]; then + # Specifying PEER_INNER_IPADDR would automatically add a route to the peer + # through the tunnel, redirecting tunnel packets back to the tunnel and + # creating a dead loop. + unset PEER_INNER_IPADDR +fi + +case "$TYPE" in + GRE) + MODE=gre + /sbin/modprobe ip_gre + ;; + IPIP) + MODE=ipip + /sbin/modprobe ipip + ;; + *) + echo $"Invalid tunnel type $TYPE" + exit 1 + ;; +esac + +# Generic tunnel devices are not supported here +if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then + echo $"Device '$DEVICE' isn't supported as a valid GRE device name." + exit 1 +fi + +# Create the tunnel +# The outer addresses are those of the underlying (public) network. +/sbin/ip tunnel add "$DEVICE" mode "$MODE" \ + ${MY_OUTER_IPADDR:+local "$MY_OUTER_IPADDR"} \ + remote "$PEER_OUTER_IPADDR" ${TTL:+ttl "$TTL"} + +if [ -n "$MTU" ]; then + /sbin/ip link set "$DEVICE" mtu "$MTU" +fi + +# The inner address are used mainly for communication between a gateway +# and a private network. When the peer is configured with an inner address +# contained in the peer's private network or identical to it's public address, +# it need not be specified. +/sbin/ip addr add "$MY_INNER_IPADDR" dev "$DEVICE" \ + ${PEER_INNER_IPADDR:+peer "$PEER_INNER_IPADDR"} + +/sbin/ip link set dev "$DEVICE" up + +exec /etc/sysconfig/network-scripts/ifup-post "$CONFIG" "$2" diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index aea5f0c9..eb2ce1c8 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -92,7 +92,9 @@ source_config () IUCV) DEVICETYPE="iucv" ;; - + GRE | IPIP) + DEVICETYPE="tunnel" + ;; esac [ -z "$DEVICETYPE" ] && DEVICETYPE=`echo ${DEVICE} | sed "s/[0-9]*$//"` [ -z "$REALDEVICE" -a -n "$PARENTDEVICE" ] && REALDEVICE=$PARENTDEVICE @@ -254,7 +256,7 @@ check_device_down () return 0 fi else - if LC_ALL=C ip -o link 2>/dev/null | grep -q "$1:.*,UP" ; then + if LC_ALL=C ip -o link 2>/dev/null | grep -q "$1[:@].*,UP" ; then return 1 else return 0 -- cgit v1.2.1