denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes in uml configuration to allow mobike

Browse Source
This commit is contained in:
Andreas Steffen
2007-07-02 09:52:20 +00:00
parent face844a87
commit c598ac6360
6 changed files with 1156 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/do-tests
+6 -2
View File
@@ -79,6 +79,8 @@ do
eval ipv6_sun1="`echo $HOSTNAMEIPV6 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`" eval ipv6_sun1="`echo $HOSTNAMEIPV6 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`"
;; ;;
alice) alice)
eval ipv4_alice1="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`"
eval ipv6_alice1="`echo $HOSTNAMEIPV6 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`"
;; ;;
venus) venus)
;; ;;
@@ -278,8 +280,10 @@ do
searchandreplace PH_IP6_SUN $ipv6_sun $TESTDIR searchandreplace PH_IP6_SUN $ipv6_sun $TESTDIR
;; ;;
alice) alice)
searchandreplace PH_IP_ALICE $ipv4_alice $TESTDIR searchandreplace PH_IP_ALICE1 $ipv4_alice1 $TESTDIR
searchandreplace PH_IP6_ALICE $ipv6_alice $TESTDIR searchandreplace PH_IP_ALICE $ipv4_alice $TESTDIR
searchandreplace PH_IP6_ALICE1 $ipv6_alice1 $TESTDIR
searchandreplace PH_IP6_ALICE $ipv6_alice $TESTDIR
;; ;;
venus) venus)
searchandreplace PH_IP_VENUS $ipv4_venus $TESTDIR searchandreplace PH_IP_VENUS $ipv4_venus $TESTDIR
testing/hosts/alice/etc/conf.d/net
+2
View File
@@ -4,6 +4,8 @@
# #
config_eth0=( "PH_IP_ALICE broadcast 10.1.255.255 netmask 255.255.0.0" config_eth0=( "PH_IP_ALICE broadcast 10.1.255.255 netmask 255.255.0.0"
"PH_IP6_ALICE/16" ) "PH_IP6_ALICE/16" )
config_eth1=( "PH_IP_ALICE1 broadcast 192.168.0.255 netmask 255.255.255.0"
"PH_IP6_ALICE1/16" )
# For setting the default gateway # For setting the default gateway
# #
testing/hosts/alice/etc/init.d/net.eth1
Executable
+1124
View File
File diff suppressed because it is too large Load Diff
testing/hosts/default/etc/hosts
+2
View File
@@ -16,6 +16,7 @@
10.1.0.20 venus.strongswan.org venus 10.1.0.20 venus.strongswan.org venus
10.1.0.1 moon1.strongswan.org moon1 10.1.0.1 moon1.strongswan.org moon1
192.168.0.1 moon.strongswan.org moon 192.168.0.1 moon.strongswan.org moon
192.168.0.50 alice1.strongswan.org alice1
192.168.0.100 carol.strongswan.org carol 192.168.0.100 carol.strongswan.org carol
10.3.0.1 carol1.strongswan.org carol1 10.3.0.1 carol1.strongswan.org carol1
192.168.0.150 winnetou.strongswan.org winnetou crl.strongswan.org ocsp.strongswan.org ldap.strongswan.org 192.168.0.150 winnetou.strongswan.org winnetou crl.strongswan.org ocsp.strongswan.org ldap.strongswan.org
@@ -41,6 +42,7 @@ ff02::1:ff00:15 ip6-mcast-15
ff02::1:ff00:20 ip6-mcast-20 ff02::1:ff00:20 ip6-mcast-20
# IPv6 site-local addresses # IPv6 site-local addresses
fec0::5 ip6-alice1.strongswan.org ip6-alice1
fec1::10 ip6-alice.strongswan.org ip6-alice fec1::10 ip6-alice.strongswan.org ip6-alice
fec1::20 ip6-venus.strongswan.org ip6-venus fec1::20 ip6-venus.strongswan.org ip6-venus
fec1::1 ip6-moon1.strongswan.org ip6-moon1 fec1::1 ip6-moon1.strongswan.org ip6-moon1
testing/scripts/build-hostconfig
+6 -2
View File
@@ -83,8 +83,12 @@ do
searchandreplace PH_IP6_SUN $ipv6_sun $HOSTCONFIGDIR searchandreplace PH_IP6_SUN $ipv6_sun $HOSTCONFIGDIR
;; ;;
alice) alice)
searchandreplace PH_IP_ALICE $ipv4_alice $HOSTCONFIGDIR eval ipv4_alice1="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`"
searchandreplace PH_IP6_ALICE $ipv6_alice $HOSTCONFIGDIR searchandreplace PH_IP_ALICE1 $ipv4_alice1 $HOSTCONFIGDIR
searchandreplace PH_IP_ALICE $ipv4_alice $HOSTCONFIGDIR
eval ipv6_alice1="`echo $HOSTNAMEIPV6 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`"
searchandreplace PH_IP6_ALICE1 $ipv6_alice1 $HOSTCONFIGDIR
searchandreplace PH_IP6_ALICE $ipv6_alice $HOSTCONFIGDIR
;; ;;
venus) venus)
searchandreplace PH_IP_VENUS $ipv4_venus $HOSTCONFIGDIR searchandreplace PH_IP_VENUS $ipv4_venus $HOSTCONFIGDIR
testing/testing.conf
+16 -18
View File
@@ -17,11 +17,11 @@
# RCSID $Id: testing.conf,v 1.52 2006/04/24 16:58:03 as Exp $ # RCSID $Id: testing.conf,v 1.52 2006/04/24 16:58:03 as Exp $
# Root directory of testing # Root directory of testing
UMLTESTDIR=/home/strongswan-testing UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources # Bzipped kernel sources
# (file extension .tar.bz2 required) # (file extension .tar.bz2 required)
KERNEL=$UMLTESTDIR/linux-2.6.21.1.tar.bz2 KERNEL=$UMLTESTDIR/linux-2.6.21.5.tar.bz2
# Extract kernel version # Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'` KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -30,10 +30,11 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
KERNELCONFIG=$UMLTESTDIR/.config-2.6.21 KERNELCONFIG=$UMLTESTDIR/.config-2.6.21
# Bzipped uml patch for kernel # Bzipped uml patch for kernel
UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2 # (not needed anymore for 2.6.9 kernel or higher)
#UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
# Bzipped source of strongSwan # Bzipped source of strongSwan
STRONGSWAN=$UMLTESTDIR/strongswan-4.1.3.tar.bz2 STRONGSWAN=$UMLTESTDIR/strongswan-4.1.4.tar.bz2
# strongSwan compile options (use "yes" or "no") # strongSwan compile options (use "yes" or "no")
USE_LIBCURL="yes" USE_LIBCURL="yes"
@@ -55,7 +56,7 @@ MEM=96
BUILDDIR=$UMLTESTDIR/umlbuild BUILDDIR=$UMLTESTDIR/umlbuild
# Filename of the built UML Kernel # Filename of the built UML Kernel
UMLKERNEL=$UMLTESTDIR/linux UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
# Directory where test results will be stored # Directory where test results will be stored
TESTRESULTSDIR=$UMLTESTDIR/testresults TESTRESULTSDIR=$UMLTESTDIR/testresults
@@ -72,22 +73,22 @@ TZUML="Europe/Zurich"
# Enable particular steps in the make-testing and # Enable particular steps in the make-testing and
# start-testing scripts # start-testing scripts
# #
ENABLE_BUILD_UMLKERNEL="no" ENABLE_BUILD_UMLKERNEL="yes"
ENABLE_BUILD_SSHKEYS="yes" ENABLE_BUILD_SSHKEYS="yes"
ENABLE_BUILD_HOSTCONFIG="yes" ENABLE_BUILD_HOSTCONFIG="yes"
ENABLE_BUILD_UMLROOTFS="yes" ENABLE_BUILD_UMLROOTFS="yes"
ENABLE_BUILD_UMLHOSTFS="yes" ENABLE_BUILD_UMLHOSTFS="yes"
ENABLE_START_TESTING="no" ENABLE_START_TESTING="yes"
ENABLE_DO_TESTS="no" ENABLE_DO_TESTS="yes"
ENABLE_STOP_TESTING="no" ENABLE_STOP_TESTING="no"
############################################################## ##############################################################
# How to start the UMLs? # How to start the UMLs?
# #
# Start the UML instance in KDE konsole (requires KDE) # Start the UML instance in KDE konsole (requires KDE)
#UMLSTARTMODE="gnome-terminal" UMLSTARTMODE="konsole"
# Start the UML instance in an xterm (requires X11R6) # Start the UML instance in an xterm (requires X11R6)
UMLSTARTMODE="xterm" # UMLSTARTMODE="xterm"
# Start the UML instance without a terminal window # Start the UML instance without a terminal window
# but screen -r <host> can open a window anytime # but screen -r <host> can open a window anytime
# UMLSTARTMODE="screen" # UMLSTARTMODE="screen"
@@ -100,7 +101,7 @@ SELECTEDTESTSONLY="no"
# Tests to do if $SELECTEDTESTSONLY is set "yes". # Tests to do if $SELECTEDTESTSONLY is set "yes".
# #
SELECTEDTESTS="ikev2-net2net ikev2-rw" SELECTEDTESTS="ikev2/rw-cert"
############################################################## ##############################################################
# hostname and corresponding IPv4 and IPv6 addresses # hostname and corresponding IPv4 and IPv6 addresses
@@ -109,7 +110,7 @@ SELECTEDTESTS="ikev2-net2net ikev2-rw"
# Also don't use IPs ending with 254, they are reserved! # Also don't use IPs ending with 254, they are reserved!
# #
HOSTNAMEIPV4="\ HOSTNAMEIPV4="\
alice,10.1.0.10 \ alice,10.1.0.10,192.168.0.50 \
venus,10.1.0.20 \ venus,10.1.0.20 \
moon,192.168.0.1,10.1.0.1 \ moon,192.168.0.1,10.1.0.1 \
carol,192.168.0.100,10.3.0.1 \ carol,192.168.0.100,10.3.0.1 \
@@ -119,7 +120,7 @@ sun,192.168.0.2,10.2.0.1 \
bob,10.2.0.10" bob,10.2.0.10"
HOSTNAMEIPV6="\ HOSTNAMEIPV6="\
alice,fec1::10 \ alice,fec1::10,fec0::5 \
venus,fec1::20 \ venus,fec1::20 \
moon,fec0::1,fec1::1 \ moon,fec0::1,fec1::1 \
carol,fec0::10,fec3::1 \ carol,fec0::10,fec3::1 \
@@ -153,7 +154,8 @@ IFCONFIG_2="10.2.0.254 netmask 255.255.0.0"
############################################################## ##############################################################
# Network interfaces of the UML instances # Network interfaces of the UML instances
# #
SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,unix,/tmp/umlswitch1" SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,unix,/tmp/umlswitch1 \
eth1=daemon,fe:fd:c0:a8:00:32,unix,/tmp/umlswitch0"
SWITCH_venus="eth0=daemon,fe:fd:0a:01:00:14,unix,/tmp/umlswitch1" SWITCH_venus="eth0=daemon,fe:fd:0a:01:00:14,unix,/tmp/umlswitch1"
SWITCH_moon="eth0=daemon,fe:fd:c0:a8:00:01,unix,/tmp/umlswitch0 \ SWITCH_moon="eth0=daemon,fe:fd:c0:a8:00:01,unix,/tmp/umlswitch0 \
eth1=daemon,fe:fd:0a:01:00:01,unix,/tmp/umlswitch1" eth1=daemon,fe:fd:0a:01:00:01,unix,/tmp/umlswitch1"
@@ -163,7 +165,3 @@ SWITCH_dave="eth0=daemon,fe:fd:c0:a8:00:c8,unix,/tmp/umlswitch0"
SWITCH_sun="eth0=daemon,fe:fd:c0:a8:00:02,unix,/tmp/umlswitch0 \ SWITCH_sun="eth0=daemon,fe:fd:c0:a8:00:02,unix,/tmp/umlswitch0 \
eth1=daemon,fe:fd:0a:02:00:01,unix,/tmp/umlswitch2" eth1=daemon,fe:fd:0a:02:00:01,unix,/tmp/umlswitch2"
SWITCH_bob="eth0=daemon,fe:fd:0a:02:00:0a,unix,/tmp/umlswitch2" SWITCH_bob="eth0=daemon,fe:fd:0a:02:00:0a,unix,/tmp/umlswitch2"