diff options
author | Tobias Brunner <tobias@strongswan.org> | 2014-07-16 12:38:44 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2014-07-22 11:10:36 +0200 |
commit | 614359a7d5bedb5d750bac33fdd4b335dde451e5 (patch) | |
tree | 036e0cf9ba6b9c85a78e73c7dbe8189582025038 /src/frontends/android/jni/libandroidbridge/backend/android_service.c | |
parent | 2dc26c557e6c8da38b60f8154acf0b007747253c (diff) | |
download | strongswan-614359a7d5bedb5d750bac33fdd4b335dde451e5.tar.bz2 strongswan-614359a7d5bedb5d750bac33fdd4b335dde451e5.tar.xz |
bus: Add ike_reestablish_pre hook, called before DNS resolution
The old hook is renamed to ike_reestablish_post and is now also called
when the initiation of the new IKE_SA failed.
Diffstat (limited to 'src/frontends/android/jni/libandroidbridge/backend/android_service.c')
-rw-r--r-- | src/frontends/android/jni/libandroidbridge/backend/android_service.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c index d73dc4582..a6a24dba9 100644 --- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c +++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c @@ -445,10 +445,11 @@ METHOD(listener_t, ike_rekey, bool, return TRUE; } -METHOD(listener_t, ike_reestablish, bool, - private_android_service_t *this, ike_sa_t *old, ike_sa_t *new) +METHOD(listener_t, ike_reestablish_post, bool, + private_android_service_t *this, ike_sa_t *old, ike_sa_t *new, + bool initiated) { - if (this->ike_sa == old) + if (this->ike_sa == old && initiated) { this->ike_sa = new; /* re-register hook to detect initiation failures */ @@ -655,7 +656,7 @@ android_service_t *android_service_create(android_creds_t *creds, char *type, .public = { .listener = { .ike_rekey = _ike_rekey, - .ike_reestablish = _ike_reestablish, + .ike_reestablish_post = _ike_reestablish_post, .ike_updown = _ike_updown, .child_updown = _child_updown, .alert = _alert, |