blob: 635f795de36c932e3f3a5ef1ca82207c062695d3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
package se.leap.bitmaskclient.pluggableTransports;
import android.util.Log;
import java.util.Observable;
import java.util.Observer;
import java.util.concurrent.atomic.AtomicBoolean;
import client.Client_;
import de.blinkt.openvpn.core.ConnectionStatus;
import se.leap.bitmaskclient.eip.EipStatus;
public class ObfsVpnClient implements Observer {
public static final String SOCKS_PORT = "4430";
public static final String SOCKS_IP = "127.0.0.1";
private static final String TAG = ObfsVpnClient.class.getSimpleName();
private volatile boolean noNetwork;
// TODO: implement error signaling go->java
private AtomicBoolean isErrorHandling = new AtomicBoolean(false);
private final client.Client_ obfsVpnClient;
private final Object LOCK = new Object();
public ObfsVpnClient(Obfs4Options options) {
obfsVpnClient = new Client_(options.udp, SOCKS_IP+":"+SOCKS_PORT, options.cert);
}
public void start() {
synchronized (LOCK) {
Log.d(TAG, "aquired LOCK");
new Thread(() -> {
try {
obfsVpnClient.start();
} catch (Exception e) {
e.printStackTrace();
if (noNetwork) {
isErrorHandling.set(true);
}
}
}).start();
try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
Log.d(TAG, "returning LOCK after 500 ms");
}
}
public void stop() {
synchronized (LOCK) {
Log.d(TAG, "stopping obfsVpnClient...");
try {
obfsVpnClient.stop();
Thread.sleep(500);
} catch (Exception e) {
e.printStackTrace();
VpnStatus.logError("[obfsvpn] " + e.getLocalizedMessage());
}
isErrorHandling.set(false);
Log.d(TAG, "stopping obfsVpnClient releasing LOCK ...");
}
}
public boolean isStarted() {
return obfsVpnClient.isStarted();
}
@Override
public void update(Observable observable, Object arg) {
if (observable instanceof EipStatus) {
EipStatus status = (EipStatus) observable;
//This doesn't do anything yet, since the error handling is still missing
if (status.getLevel() == ConnectionStatus.LEVEL_NONETWORK) {
noNetwork = true;
} else {
noNetwork = false;
if (isErrorHandling.getAndSet(false)) {
stop();
start();
}
}
}
}
}
|
