denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only call disconnect() from CharonVpnService if we are not already disconnecting

Browse Source
This commit is contained in:
Tobias Brunner
2012-08-13 11:22:20 +02:00
parent 496e096e7b
commit a7c8b166a1
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+10 -4
View File
@@ -53,6 +53,7 @@ public class CharonVpnService extends VpnService implements Runnable
private VpnProfile mNextProfile; private VpnProfile mNextProfile;
private volatile boolean mProfileUpdated; private volatile boolean mProfileUpdated;
private volatile boolean mTerminate; private volatile boolean mTerminate;
private volatile boolean mIsDisconnecting;
private VpnStateService mService; private VpnStateService mService;
private final Object mServiceLock = new Object(); private final Object mServiceLock = new Object();
private final ServiceConnection mServiceConnection = new ServiceConnection() { private final ServiceConnection mServiceConnection = new ServiceConnection() {
@@ -200,6 +201,7 @@ public class CharonVpnService extends VpnService implements Runnable
setProfile(mCurrentProfile); setProfile(mCurrentProfile);
setError(ErrorState.NO_ERROR); setError(ErrorState.NO_ERROR);
setState(State.CONNECTING); setState(State.CONNECTING);
mIsDisconnecting = false;
BuilderAdapter builder = new BuilderAdapter(mCurrentProfile.getName()); BuilderAdapter builder = new BuilderAdapter(mCurrentProfile.getName());
initializeCharon(builder); initializeCharon(builder);
@@ -230,6 +232,7 @@ public class CharonVpnService extends VpnService implements Runnable
if (mCurrentProfile != null) if (mCurrentProfile != null)
{ {
setState(State.DISCONNECTING); setState(State.DISCONNECTING);
mIsDisconnecting = true;
deinitializeCharon(); deinitializeCharon();
Log.i(TAG, "charon stopped"); Log.i(TAG, "charon stopped");
mCurrentProfile = null; mCurrentProfile = null;
@@ -301,7 +304,10 @@ public class CharonVpnService extends VpnService implements Runnable
if (mService != null) if (mService != null)
{ {
mService.setError(error); mService.setError(error);
mService.disconnect(); if (!mIsDisconnecting)
{
mService.disconnect();
}
} }
} }
} }
@@ -319,9 +325,9 @@ public class CharonVpnService extends VpnService implements Runnable
case STATE_CHILD_SA_DOWN: case STATE_CHILD_SA_DOWN:
synchronized (mServiceLock) synchronized (mServiceLock)
{ {
/* since this state is also reached when the SA is closed remotely, /* if we are not actively disconnecting we assume the remote terminated
* we call disconnect() to make sure charon is properly deinitialized */ * the connection and call disconnect() to deinitialize charon properly */
if (mService != null) if (mService != null && !mIsDisconnecting)
{ {
mService.disconnect(); mService.disconnect();
} }