denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Use keyingtries=%forever and dpd|closeaction=restart

Browse Source 
We also ignore the CHILD_SA_DOWN event.

This should allow us to keep the connection up as long as the user does
not manually disconnect.
This commit is contained in:
Tobias Brunner
2012-10-18 10:57:55 +02:00
parent 292d8f41c3
commit 8658e87b35
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/backend/android_service.c
+3 -3
View File
@@ -470,7 +470,7 @@ static job_requeue_t initiate(private_android_service_t *this)
ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE)); ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
peer_cfg = peer_cfg_create("android", IKEV2, ike_cfg, CERT_SEND_IF_ASKED, peer_cfg = peer_cfg_create("android", IKEV2, ike_cfg, CERT_SEND_IF_ASKED,
UNIQUE_REPLACE, 1, /* keyingtries */ UNIQUE_REPLACE, 0, /* keyingtries */
36000, 0, /* rekey 10h, reauth none */ 36000, 0, /* rekey 10h, reauth none */
600, 600, /* jitter, over 10min */ 600, 600, /* jitter, over 10min */
TRUE, FALSE, /* mobike, aggressive */ TRUE, FALSE, /* mobike, aggressive */
@@ -522,8 +522,8 @@ static job_requeue_t initiate(private_android_service_t *this)
peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE); peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE);
child_cfg = child_cfg_create("android", &lifetime, NULL, TRUE, MODE_TUNNEL, child_cfg = child_cfg_create("android", &lifetime, NULL, TRUE, MODE_TUNNEL,
ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE, ACTION_NONE, ACTION_RESTART, ACTION_RESTART,
0, 0, NULL, NULL, 0); FALSE, 0, 0, NULL, NULL, 0);
/* create an ESP proposal with the algorithms currently supported by /* create an ESP proposal with the algorithms currently supported by
* libipsec, no PFS for now */ * libipsec, no PFS for now */
child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP, child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,
src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+1 -9
View File
@@ -329,15 +329,7 @@ public class CharonVpnService extends VpnService implements Runnable
switch (status) switch (status)
{ {
case STATE_CHILD_SA_DOWN: case STATE_CHILD_SA_DOWN:
synchronized (mServiceLock) /* we ignore this as we use closeaction=restart */
{
/* if we are not actively disconnecting we assume the remote terminated
* the connection and call disconnect() to deinitialize charon properly */
if (mService != null && !mIsDisconnecting)
{
mService.disconnect();
}
}
break; break;
case STATE_CHILD_SA_UP: case STATE_CHILD_SA_UP:
setState(State.CONNECTED); setState(State.CONNECTED);