X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=testing%2Ftesting.conf;h=6a5f8b3da063a0b91e5a9da3de91ac310c721c3f;hp=d3ed1129a1ab81c655829c5e98652651a753c036;hb=f22c88de5f2bcd1336c5f4f3bf9973c1edd728de;hpb=b5e1560659f9e7e74299077c1456c29065dbb4c9

diff --git a/testing/testing.conf b/testing/testing.conf
index d3ed112..6a5f8b3 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -21,27 +21,27 @@ UMLTESTDIR=~/strongswan-testing
 
 # Bzipped kernel sources
 # (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.16.16.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.18.tar.bz2
 
 # Extract kernel version
 KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
 
 # Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-2.6.16
+KERNELCONFIG=$UMLTESTDIR/.config-2.6.18
 
 # Bzipped uml patch for kernel
-# (not needed anymore for 2.6.9 kernel or higher)
-UMLPATCH=
+UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
 
 # Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.0.1.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.0.4.tar.bz2
 
 # strongSwan compile options (use "yes" or "no")
 USE_LIBCURL="yes"
 USE_LDAP="yes"
+USE_LEAK_DETECTIVE="no"
 
 # Gentoo linux root filesystem
-ROOTFS=$UMLTESTDIR/gentoo-fs-20060330.tar.bz2
+ROOTFS=$UMLTESTDIR/gentoo-fs-20061003.tar.bz2
 
 # Size of the finished root filesystem in MB
 ROOTFSSIZE=544
@@ -60,6 +60,11 @@ UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
 # Directory where test results will be stored
 TESTRESULTSDIR=$UMLTESTDIR/testresults
 
+# Path to a full strongswan tree on the host system, which is
+# mounted into /root/strongswan-shared. This gives us an easy
+# way to apply and test changes instantly.
+#SHAREDTREE=/home/mwilli/strongswan/trunk
+
 # Timezone for the UMLs, look in /usr/share/zoneinfo!
 TZUML="Europe/Zurich"
 
@@ -98,20 +103,30 @@ SELECTEDTESTSONLY="no"
 SELECTEDTESTS="net2net-cert"
 
 ##############################################################
-# hostname and according IP(s)
-# You may change the IPs but keep them in the same net,
+# hostname and corresponding IPv4 and IPv6 addresses
+# You may change the IPs but keep them in the same subnet,
 # this means retain the netmasks!
 # Also don't use IPs ending with 254, they are reserved!
 #
-HOSTNAMEIPS="\
-alice:10.1.0.10 \
-venus:10.1.0.20 \
-moon:192.168.0.1:10.1.0.1 \
-carol:192.168.0.100:10.3.0.1 \
-winnetou:192.168.0.150 \
-dave:192.168.0.200:10.3.0.2 \
-sun:192.168.0.2:10.2.0.1 \
-bob:10.2.0.10"
+HOSTNAMEIPV4="\
+alice,10.1.0.10 \
+venus,10.1.0.20 \
+moon,192.168.0.1,10.1.0.1 \
+carol,192.168.0.100,10.3.0.1 \
+winnetou,192.168.0.150 \
+dave,192.168.0.200,10.3.0.2 \
+sun,192.168.0.2,10.2.0.1 \
+bob,10.2.0.10"
+
+HOSTNAMEIPV6="\
+alice,fec1::10 \
+venus,fec1::20 \
+moon,fec0::1,fec1::1 \
+carol,fec0::10,fec3::1 \
+winnetou,fec0::15 \
+dave,fec0::20,fec3::2 \
+sun,fec0::2,fec2::1 \
+bob,fec2::10"
 
 ##############################################################
 # VPN gateways / clients
@@ -138,16 +153,16 @@ IFCONFIG_2="10.2.0.254 netmask 255.255.0.0"
 ##############################################################
 # Network interfaces of the UML instances
 #
-SWITCH_alice="eth0=daemon,,unix,/tmp/umlswitch1"
-SWITCH_venus="eth0=daemon,,unix,/tmp/umlswitch1"
-SWITCH_moon="eth0=daemon,,unix,/tmp/umlswitch0 \
-             eth1=daemon,,unix,/tmp/umlswitch1"
-SWITCH_carol="eth0=daemon,,unix,/tmp/umlswitch0"
-SWITCH_winnetou="eth0=daemon,,unix,/tmp/umlswitch0"
-SWITCH_dave="eth0=daemon,,unix,/tmp/umlswitch0"
-SWITCH_sun="eth0=daemon,,unix,/tmp/umlswitch0 \
-            eth1=daemon,,unix,/tmp/umlswitch2"
-SWITCH_bob="eth0=daemon,,unix,/tmp/umlswitch2"
+SWITCH_alice="eth0=daemon,fe:fd:0a:01:00:0a,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 \
+             eth1=daemon,fe:fd:0a:01:00:01,unix,/tmp/umlswitch1"
+SWITCH_carol="eth0=daemon,fe:fd:c0:a8:00:64,unix,/tmp/umlswitch0"
+SWITCH_winnetou="eth0=daemon,fe:fd:c0:a8:00:96,unix,/tmp/umlswitch0"
+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 \
+            eth1=daemon,fe:fd:0a:02:00:01,unix,/tmp/umlswitch2"
+SWITCH_bob="eth0=daemon,fe:fd:0a:02:00:0a,unix,/tmp/umlswitch2"