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

android: Set CHILD_STATE_DOWN when the IKE_SA gets reestablished

Browse Source
This commit is contained in:
Tobias Brunner
2014-07-22 10:55:51 +02:00
parent fb5d541503
commit 08d545e29a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/backend/android_service.c
+7 -1
View File
@@ -392,7 +392,8 @@ METHOD(listener_t, ike_updown, bool,
private_android_service_t *this, ike_sa_t *ike_sa, bool up) private_android_service_t *this, ike_sa_t *ike_sa, bool up)
{ {
/* this callback is only registered during initiation, so if the IKE_SA /* this callback is only registered during initiation, so if the IKE_SA
* goes down we assume an authentication error */ * goes down we assume some kind of authentication error, more specific
* errors are catched in the alert() handler */
if (this->ike_sa == ike_sa && !up) if (this->ike_sa == ike_sa && !up)
{ {
charonservice->update_status(charonservice, charonservice->update_status(charonservice,
@@ -452,6 +453,11 @@ METHOD(listener_t, ike_reestablish, bool,
this->ike_sa = new; this->ike_sa = new;
/* re-register hook to detect initiation failures */ /* re-register hook to detect initiation failures */
this->public.listener.ike_updown = _ike_updown; this->public.listener.ike_updown = _ike_updown;
/* if the IKE_SA got deleted by the responder we get the child_down()
* event on the old IKE_SA after this hook has been called, so they
* get ignored and thus we trigger the event here */
charonservice->update_status(charonservice,
CHARONSERVICE_CHILD_STATE_DOWN);
/* the TUN device will be closed when the new CHILD_SA is established */ /* the TUN device will be closed when the new CHILD_SA is established */
} }
return TRUE; return TRUE;