From 2b6088c7187f30479ef20d305e1972abe3d5a40a Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 16 Oct 2012 13:41:02 +0200
Subject: [PATCH] android: Ignore if peer is unreachable when reestablishing an
 SA

---
 .../jni/libandroidbridge/backend/android_service.c       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
index d451a3d94..b00567f60 100644
--- 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;