From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 28 Feb 2007 23:19:20 +0000 (-0000)
Subject: dpd now takes 180 s and 5 retransmits
X-Git-Tag: 4.1.0~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b62f2fc895afc95643e375ef13be7a6ffab22455;p=thirdparty%2Fstrongswan.git

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 146cf6c33d..6383c1b168 100644
--- 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 14de3735ea..4c8cdbb8e5 100644
--- 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 635c79fb6c..b1eee8aa5e 100644
--- 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