android: Ignore if peer is unreachable when reestablishing an SA

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
index d451a3d94219cb1295c17ac1557962313afc282f..b00567f60804dbe624391d9f65046996cacd2543 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
@@ -414,8 +414,13 @@ METHOD(listener_t, alert, bool,
                                                                                         CHARONSERVICE_PEER_AUTH_ERROR);
                                break;
                        case ALERT_PEER_INIT_UNREACHABLE:
-                               charonservice->update_status(charonservice,
-                                                                                        CHARONSERVICE_UNREACHABLE_ERROR);
+                               this->lock->read_lock(this->lock);
+                               if (this->tunfd < 0)
+                               {       /* only handle this if we are not reestablishing the SA */
+                                       charonservice->update_status(charonservice,
+                                                                                       CHARONSERVICE_UNREACHABLE_ERROR);
+                               }
+                               this->lock->unlock(this->lock);
                                break;
                        default:
                                break;