sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-06 00:00:47 -04:00
Code Issues Projects Releases Wiki Activity

android: For keyingtries > 0 notify the GUI if the limit is reached when reestablishing

Browse Source 
The IKE_SA is destroyed anyway, so letting the GUI remain in
"connecting" state would be incorrect.

We still use keyingtries=0 for now, though. And we still abort after the
first failed attempt initially, in case there is a configuration error.
This commit is contained in:
Tobias Brunner 2014-07-17 15:39:29 +02:00
parent 5fd9e5fd00
commit ffff7219ef
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,6 +502,23 @@ METHOD(listener_t, alert, bool,
(callback_job_cb_t)terminate, id, free,
(callback_job_cancel_t)return_false, JOB_PRIO_HIGH));
}
else
{
peer_cfg_t *peer_cfg;
u_int32_t tries, try;
/* when reestablishing and if keyingtries is not %forever
* the IKE_SA is destroyed after the set number of tries,
* so notify the GUI */
peer_cfg = ike_sa->get_peer_cfg(ike_sa);
tries = peer_cfg->get_keyingtries(peer_cfg);
try = va_arg(args, u_int32_t);
if (tries != 0 && try == tries-1)
{
charonservice->update_status(charonservice,
CHARONSERVICE_UNREACHABLE_ERROR);
}
}
this->lock->unlock(this->lock);
break;
default: