ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

android: Terminate IKE_SA if initial IKE_SA_INIT fails 

Since VpnStateService.disconnect() is now not called until the error
dialog is dismissed the daemon would continue to try connecting.
So while the error dialog is shown the connection might actually be
successfully established in the background, which is not intended.

This way the IKE_SA is destroyed right after sending the IKE_SA_INIT of
the second connection attempt (due to keyingtries=0).
This commit is contained in:
Tobias Brunner 2014-07-17 15:22:29 +02:00
parent 945832c67d
commit 5fd9e5fd00
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontends/android/jni/libandroidbridge/backend/android_service.c
View File

@ -407,6 +407,17 @@ static void close_tun_device(private_android_service_t *this)
close(tunfd);
}
/**
* Terminate the IKE_SA with the given unique ID
*/
CALLBACK(terminate, job_requeue_t,
u_int32_t *id)
{
charon->controller->terminate_ike(charon->controller, *id,
controller_cb_empty, NULL, 0);
return JOB_REQUEUE_NONE;
}
METHOD(listener_t, child_updown, bool,
private_android_service_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
bool up)
@ -476,9 +487,20 @@ METHOD(listener_t, alert, bool,
case ALERT_PEER_INIT_UNREACHABLE:
this->lock->read_lock(this->lock);
if (this->tunfd < 0)
{ /* only handle this if we are not reestablishing the SA */
{
u_int32_t *id = malloc_thing(u_int32_t);
/* always fail if we are not able to initiate the IKE_SA
* initially */
charonservice->update_status(charonservice,
CHARONSERVICE_UNREACHABLE_ERROR);
/* terminate the IKE_SA so no further keying tries are
* attempted */
*id = ike_sa->get_unique_id(ike_sa);
lib->processor->queue_job(lib->processor,
(job_t*)callback_job_create_with_prio(
(callback_job_cb_t)terminate, id, free,
(callback_job_cancel_t)return_false, JOB_PRIO_HIGH));
}
this->lock->unlock(this->lock);
break;