dpd now takes 180 s and 5 retransmits

diff --git a/testing/tests/ikev2/dpd-clear/evaltest.dat b/testing/tests/ikev2/dpd-clear/evaltest.dat
index 146cf6c33d7d1f81212753403096da963e1a2100..6383c1b1689e78077736fa00b986505887f270b5 100644 (file)
--- a/testing/tests/ikev2/dpd-clear/evaltest.dat
+++ b/testing/tests/ikev2/dpd-clear/evaltest.dat
@@ -1,7 +1,7 @@
 carol::ipsec statusall::home.*INSTALLED::YES
 carol::iptables -A INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
-moon::sleep 100::no output expected::NO
+moon::sleep 180::no output expected::NO
 moon::cat /var/log/daemon.log::sending DPD request::YES
-moon::cat /var/log/daemon.log::sending retransmit::YES
-moon::cat /var/log/daemon.log::giving up after 4 retransmits, deleting IKE_SA::YES
+moon::cat /var/log/daemon.log::retransmit.*of request::YES
+moon::cat /var/log/daemon.log::giving up after 5 retransmits::YES
 moon::cat /var/log/daemon.log::dpd action for rw is DPD_CLEAR::YES

diff --git a/testing/tests/ikev2/dpd-hold/evaltest.dat b/testing/tests/ikev2/dpd-hold/evaltest.dat
index 14de3735ea6b2069ac51e3a6eea9ba3742a98e99..4c8cdbb8e59ba0f3ff8685cc3949f775db56c602 100644 (file)
--- a/testing/tests/ikev2/dpd-hold/evaltest.dat
+++ b/testing/tests/ikev2/dpd-hold/evaltest.dat
@@ -2,10 +2,10 @@ carol::ipsec statusall::home.*INSTALLED::YES
 moon::ipsec statusall::rw.*INSTALLED::YES
 moon::iptables -A INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO
 carol::iptables -A INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
-carol::sleep 100::no output expected::NO
+carol::sleep 180::no output expected::NO
 carol::cat /var/log/daemon.log::sending DPD request::YES
-carol::cat /var/log/daemon.log::sending retransmit.*for INFORMATIONAL request::YES
-carol::cat /var/log/daemon.log::giving up after 4 retransmits, deleting IKE_SA::YES
+carol::cat /var/log/daemon.log::retransmit.*of request::YES
+carol::cat /var/log/daemon.log::giving up after 5 retransmits::YES
 carol::cat /var/log/daemon.log::dpd action for home is DPD_ROUTE::YES
 carol::iptables -D INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
 moon::iptables -D INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO

diff --git a/testing/tests/ikev2/dpd-restart/evaltest.dat b/testing/tests/ikev2/dpd-restart/evaltest.dat
index 635c79fb6c6a5b10e4fd11d0a54bdb3967e93f58..b1eee8aa5e6b58fecfb6f87cdc46449c5974b453 100644 (file)
--- a/testing/tests/ikev2/dpd-restart/evaltest.dat
+++ b/testing/tests/ikev2/dpd-restart/evaltest.dat
@@ -2,10 +2,10 @@ carol::ipsec statusall::home.*INSTALLED::YES
 moon::ipsec statusall::rw.*INSTALLED::YES
 moon::iptables -A INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO
 carol::iptables -A INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
-carol::sleep 100::no output expected::NO
+carol::sleep 180::no output expected::NO
 carol::cat /var/log/daemon.log::sending DPD request::YES
-carol::cat /var/log/daemon.log::sending retransmit.*for INFORMATIONAL request::YES
-carol::cat /var/log/daemon.log::giving up after 4 retransmits, deleting IKE_SA::YES
+carol::cat /var/log/daemon.log::retransmit.*of request::YES
+carol::cat /var/log/daemon.log::giving up after 5 retransmits::YES
 carol::cat /var/log/daemon.log::dpd action for home is DPD_RESTART::YES
 carol::iptables -D INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
 moon::iptables -D INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO