mirror of
https://github.com/moparisthebest/SSLDroid
synced 2024-11-10 11:05:05 -05:00
Fix a race condition in TcpServerThread
Signed-off-by: Balint Kovacs <blint@blint.hu>
This commit is contained in:
parent
a76eff7188
commit
42c6f7df96
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="hu.blint.ssldroid" android:versionCode="5"
|
||||
android:versionName="1.2.2">
|
||||
package="hu.blint.ssldroid" android:versionCode="6"
|
||||
android:versionName="1.2.3">
|
||||
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
|
||||
<permission android:name="hu.blint.ssldroid.permission.startstop" android:protectionLevel="normal" android:label="Start and stop the SSLDroid service" />
|
||||
<uses-permission android:name="hu.blint.ssldroid.permission.startstop" />
|
||||
|
@ -34,6 +34,7 @@ public class TcpProxyServerThread extends Thread {
|
||||
Relay inRelay, outRelay;
|
||||
ServerSocket ss = null;
|
||||
int sessionid = 0;
|
||||
private SSLSocketFactory sslSocketFactory;
|
||||
|
||||
public TcpProxyServerThread(ServerSocket ss,String tunnelName, int listenPort, String tunnelHost, int tunnelPort, String keyFile, String keyPass) {
|
||||
this.tunnelName = tunnelName;
|
||||
@ -62,8 +63,6 @@ public class TcpProxyServerThread extends Thread {
|
||||
}
|
||||
};
|
||||
|
||||
private static SSLSocketFactory sslSocketFactory;
|
||||
|
||||
public final SSLSocketFactory getSocketFactory(String pkcsFile,
|
||||
String pwd, int sessionid) {
|
||||
if (sslSocketFactory == null) {
|
||||
|
Loading…
Reference in New Issue
Block a user