From: Andreas Steffen Date: Sun, 28 Nov 2010 16:41:27 +0000 (+0100) Subject: configured various DPD modes in sql scenarios X-Git-Tag: 4.5.1~477 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b62bde3b95dacb0d2a09cf07facbb300520f0e12;p=thirdparty%2Fstrongswan.git configured various DPD modes in sql scenarios --- diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql index 54086643f6..ef6849c114 100644 --- a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql @@ -109,9 +109,9 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( - name, ike_cfg, local_id, remote_id, mobike + name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( - 'net-net', 1, 4, 5, 0 + 'net-net', 1, 4, 5, 0, 0 ); INSERT INTO child_configs ( diff --git a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql index 2bc8b34c83..79a35ef68f 100644 --- a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql @@ -109,9 +109,9 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( - name, ike_cfg, local_id, remote_id, mobike + name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( - 'net-net', 1, 5, 4, 0 + 'net-net', 1, 5, 4, 0, 0 ); INSERT INTO child_configs ( diff --git a/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql index 470a18ee21..8d85497e23 100644 --- a/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql @@ -109,27 +109,27 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( - name, ike_cfg, local_id, remote_id, mobike + name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( - 'net-net', 1, 4, 5, 0 + 'net-net', 1, 4, 5, 0, 30 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-1', 'ipsec _updown iptables', 1 + 'net-1', 'ipsec _updown iptables', 1, 1 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-2', 'ipsec _updown iptables', 1 + 'net-2', 'ipsec _updown iptables', 1, 1 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-3', 'ipsec _updown iptables', 0 + 'net-3', 'ipsec _updown iptables', 0, 0 ); INSERT INTO peer_config_child_config ( diff --git a/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql index 677c99957b..aeacf493fc 100644 --- a/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql @@ -109,27 +109,27 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( - name, ike_cfg, local_id, remote_id, mobike + name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( - 'net-net', 1, 5, 4, 0 + 'net-net', 1, 5, 4, 0, 30 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-1', 'ipsec _updown iptables', 1 + 'net-1', 'ipsec _updown iptables', 1, 1 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-2', 'ipsec _updown iptables', 1 + 'net-2', 'ipsec _updown iptables', 1, 1 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-3', 'ipsec _updown iptables', 0 + 'net-3', 'ipsec _updown iptables', 0, 0 ); INSERT INTO peer_config_child_config ( diff --git a/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql index 2a333ab9ae..542bdeae24 100644 --- a/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql @@ -109,27 +109,27 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( - name, ike_cfg, local_id, remote_id, mobike + name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( - 'net-net', 1, 4, 5, 0 + 'net-net', 1, 4, 5, 0, 30 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-1', 'ipsec _updown iptables', 2 + 'net-1', 'ipsec _updown iptables', 2, 2 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-2', 'ipsec _updown iptables', 2 + 'net-2', 'ipsec _updown iptables', 2, 2 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-3', 'ipsec _updown iptables', 2 + 'net-3', 'ipsec _updown iptables', 2, 2 ); INSERT INTO peer_config_child_config ( diff --git a/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql index 6e7760a41e..3bcefd3d20 100644 --- a/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql +++ b/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql @@ -109,27 +109,27 @@ INSERT INTO ike_configs ( ); INSERT INTO peer_configs ( - name, ike_cfg, local_id, remote_id, mobike + name, ike_cfg, local_id, remote_id, mobike, dpd_delay ) VALUES ( - 'net-net', 1, 5, 4, 0 + 'net-net', 1, 5, 4, 0, 30 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-1', 'ipsec _updown iptables', 0 + 'net-1', 'ipsec _updown iptables', 0, 0 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-2', 'ipsec _updown iptables', 0 + 'net-2', 'ipsec _updown iptables', 0, 0 ); INSERT INTO child_configs ( - name, updown, start_action + name, updown, start_action, dpd_action ) VALUES ( - 'net-3', 'ipsec _updown iptables', 0 + 'net-3', 'ipsec _updown iptables', 0, 0 ); INSERT INTO peer_config_child_config (