aboutsummaryrefslogtreecommitdiffstats
path: root/src/starter
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-09-26 10:15:03 +0200
committerTobias Brunner <tobias@strongswan.org>2013-09-26 10:17:48 +0200
commita2cebbe6742c2bc8e08d8d2569c5bc0bd8fb0c3a (patch)
treea2ada8a76215eae54219f5c4bc2f2c17a55a7784 /src/starter
parent90031b2fc71367bacfc30f75d098273f5d422d0d (diff)
downloadstrongswan-a2cebbe6742c2bc8e08d8d2569c5bc0bd8fb0c3a.tar.bz2
strongswan-a2cebbe6742c2bc8e08d8d2569c5bc0bd8fb0c3a.tar.xz
starter: Don't ignore keyingtries with rekey=no
Since keyingtries also affects the number of retries initially or when reestablishing an SA it should not be affected by the rekey option. Fixes #418.
Diffstat (limited to 'src/starter')
-rw-r--r--src/starter/starterstroke.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index f4541937b..bf7e0284f 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -176,9 +176,10 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
msg.add_conn.rekey.margin_bytes = conn->sa_ipsec_margin_bytes;
msg.add_conn.rekey.life_packets = conn->sa_ipsec_life_packets;
msg.add_conn.rekey.margin_packets = conn->sa_ipsec_margin_packets;
- msg.add_conn.rekey.tries = conn->sa_keying_tries;
msg.add_conn.rekey.fuzz = conn->sa_rekey_fuzz;
}
+ msg.add_conn.rekey.tries = conn->sa_keying_tries;
+
msg.add_conn.mobike = conn->options & SA_OPTION_MOBIKE;
msg.add_conn.force_encap = conn->options & SA_OPTION_FORCE_ENCAP;
msg.add_conn.fragmentation = conn->fragmentation;