check ip xfrm state in IKEv1 and IKEv2 transport mode scenarios

diff --git a/testing/tests/ikev1/host2host-transport/evaltest.dat b/testing/tests/ikev1/host2host-transport/evaltest.dat
index d19f970f2cabddd0b7042dbbcf94b2e8a4c000cf..04c0eb3a2f1937218d372135f7fdf5f3ce5b7b46 100644 (file)
--- a/testing/tests/ikev1/host2host-transport/evaltest.dat
+++ b/testing/tests/ikev1/host2host-transport/evaltest.dat
@@ -1,5 +1,7 @@
 moon::ipsec status::host-host.*STATE_QUICK_I2.*IPsec SA established::YES
 sun::ipsec status::host-host.*STATE_QUICK_R2.*IPsec SA established::YES
+moon::ip xfrm state::mode transport::YES
+sun::ip xfrm state::mode transport::YES
 moon::ping -c 1 PH_IP_SUN::64 bytes from PH_IP_SUN: icmp_seq=1::YES
 sun::tcpdump::IP moon.strongswan.org > sun.strongswan.org: ESP::YES
 sun::tcpdump::IP sun.strongswan.org > moon.strongswan.org: ESP::YES

diff --git a/testing/tests/ikev2/host2host-transport/evaltest.dat b/testing/tests/ikev2/host2host-transport/evaltest.dat
index a46e4e4e4f74b8ba195683a2e499b74d32115120..2dd58c9d7f5a59994ce07f89d51bd0cc9febf468 100644 (file)
--- a/testing/tests/ikev2/host2host-transport/evaltest.dat
+++ b/testing/tests/ikev2/host2host-transport/evaltest.dat
@@ -1,5 +1,8 @@
+moon::cat /var/log/daemon.log::received USE_TRANSPORT_MODE notify::YES
 moon::ipsec status::host-host.*INSTALLED.*TRANSPORT::YES
 sun::ipsec status::host-host.*INSTALLED.*TRANSPORT::YES
+moon::ip xfrm state::mode transport::YES
+sun::ip xfrm state::mode transport::YES
 moon::ping -c 1 PH_IP_SUN::64 bytes from PH_IP_SUN: icmp_seq=1::YES
 sun::tcpdump::IP moon.strongswan.org > sun.strongswan.org: ESP::YES
 sun::tcpdump::IP sun.strongswan.org > moon.strongswan.org: ESP::YES

diff --git a/testing/tests/ikev2/host2host-transport/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/host2host-transport/hosts/moon/etc/ipsec.conf
index b80aa80c4241e01f066cd5c711dc74652a6171cf..7f6c5a58a3c4360cc07dede75c66be4a92343f22 100755 (executable)
--- a/testing/tests/ikev2/host2host-transport/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev2/host2host-transport/hosts/moon/etc/ipsec.conf
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       mobike=no
        keyexchange=ikev2
 
 conn host-host

diff --git a/testing/tests/ikev2/host2host-transport/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2/host2host-transport/hosts/sun/etc/ipsec.conf
index dd1811083beba1b92a08eea4a8c1067f2a7d50db..af52fb22b85b65c944a8e3f0c1d09c28a1c22544 100755 (executable)
--- a/testing/tests/ikev2/host2host-transport/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ikev2/host2host-transport/hosts/sun/etc/ipsec.conf
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       mobike=no
        keyexchange=ikev2
 
 conn host-host