diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-07-14 15:10:49 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-07-22 10:55:51 +0200 |
| commit | 08d545e29aa57277c520df0d02f99b6591db0a35 (patch) | |
| tree | cb5acb0af36801f090fc7cff72b2831e77baa2fb | |
| parent | fb5d541503e44f2ca727661040d2fce9392ee96f (diff) | |
| download | strongswan-08d545e29aa57277c520df0d02f99b6591db0a35.tar.bz2 strongswan-08d545e29aa57277c520df0d02f99b6591db0a35.tar.xz | |
android: Set CHILD_STATE_DOWN when the IKE_SA gets reestablished
| -rw-r--r-- | src/frontends/android/jni/libandroidbridge/backend/android_service.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c index c893f62fe..d73dc4582 100644 --- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c +++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c @@ -392,7 +392,8 @@ METHOD(listener_t, ike_updown, bool, private_android_service_t *this, ike_sa_t *ike_sa, bool up) { /* 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) { charonservice->update_status(charonservice, @@ -452,6 +453,11 @@ METHOD(listener_t, ike_reestablish, bool, this->ike_sa = new; /* re-register hook to detect initiation failures */ 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 */ } return TRUE; |