From 614359a7d5bedb5d750bac33fdd4b335dde451e5 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 16 Jul 2014 12:38:44 +0200 Subject: 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. --- .../android/jni/libandroidbridge/backend/android_service.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/frontends/android/jni/libandroidbridge/backend/android_service.c') 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, -- cgit v1.2.3