From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 14 Jul 2014 13:06:40 +0000 (+0200)
Subject: android: Change to CONNECTING state if CHILD_SA goes down
X-Git-Tag: 5.2.1dr1~116^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1435bd2e1bb6a1f49cb51dd4650a200e50544b13;p=thirdparty%2Fstrongswan.git

android: Change to CONNECTING state if CHILD_SA goes down

Unless we are disconnecting.  This currently triggers the connecting
dialog, perhaps just updating the status text would do too (when switching
from CONNECTED to CONNECTING, not from DISCONNECTED to CONNECTING).
---

diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index 31172ab44e..13024512e2 100644
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -354,7 +354,10 @@ public class CharonVpnService extends VpnService implements Runnable
 		switch (status)
 		{
 			case STATE_CHILD_SA_DOWN:
-				/* we ignore this as we use closeaction=restart */
+				if (!mIsDisconnecting)
+				{
+					setState(State.CONNECTING);
+				}
 				break;
 			case STATE_CHILD_SA_UP:
 				setState(State.CONNECTED);