nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-26 18:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes part 2, SOCKS now implemented

Browse Source
This commit is contained in:
sirjonasxx 2020-05-06 23:06:45 +02:00
parent 5ffc7b2313
commit d6e135eed1
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
G-Earth/src/main/java/gearth/protocol/HConnection.java
View File

@ -62,6 +62,11 @@ public class HConnection {
if (proxyProvider != null) {
proxyProvider.start();
}
else {
// trigger UI update
setState(HState.ABORTING);
setState(HState.NOT_CONNECTED);
}
} catch (IOException e) {
e.printStackTrace();
}

14
G-Earth/src/main/java/gearth/protocol/connection/proxy/ProxyProviderFactory.java
View File

@ -5,6 +5,10 @@ import gearth.misc.OSValidator;
import gearth.protocol.HConnection;
import gearth.protocol.connection.HProxySetter;
import gearth.protocol.connection.HStateSetter;
import javafx.application.Platform;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.layout.Region;
import java.io.IOException;
import java.util.ArrayList;
@ -92,6 +96,16 @@ public class ProxyProviderFactory {
else if (config.useSocks()) {
return new SocksProxyProvider(proxySetter, stateSetter, hConnection, domain, port);
}
Platform.runLater(() -> {
Alert alert = new Alert(Alert.AlertType.ERROR, "G-Earth is already connected to this hotel. " +
"Due to current limitations you can only connect one session per hotel to G-Earth in Raw IP mode.\n\n" +
"You can bypass this by using a SOCKS proxy [Extra -> Advanced -> SOCKS]", ButtonType.OK);
alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
alert.setResizable(false);
alert.show();
});
return null;
}
else {

26
G-Earth/src/main/java/gearth/protocol/connection/proxy/RawIpProxyProvider.java
View File

@ -52,7 +52,11 @@ public class RawIpProxyProvider extends ProxyProvider {
stateSetter.setState(HState.PREPARING);
proxy = new HProxy(input_host, input_host, input_port, input_port, "0.0.0.0");
onBeforeIpMapping();
if (!onBeforeIpMapping()) {
stateSetter.setState(HState.NOT_CONNECTED);
return;
}
maybeAddMapping();
if (HConnection.DEBUG) System.out.println("Added mapping for raw IP");
@ -98,6 +102,12 @@ public class RawIpProxyProvider extends ProxyProvider {
super.abort();
}
@Override
protected void onConnect() {
super.onConnect();
tryCloseProxy();
}
@Override
protected void onConnectEnd() {
if (hasMapped) {
@ -119,7 +129,8 @@ public class RawIpProxyProvider extends ProxyProvider {
private Queue<Socket> preConnectedServerConnections;
protected void onBeforeIpMapping() throws IOException, InterruptedException {
// returns false if fail
protected boolean onBeforeIpMapping() throws IOException, InterruptedException {
preConnectedServerConnections = new LinkedList<>();
for (int i = 0; i < 3; i++) {
Socket s1 = new Socket();
@ -128,14 +139,15 @@ public class RawIpProxyProvider extends ProxyProvider {
s1.connect(new InetSocketAddress(proxy.getActual_domain(), proxy.getActual_port()), 1200);
}
catch (SocketTimeoutException e) {
stateSetter.setState(HState.NOT_CONNECTED);
showInvalidConnectionError();
return;
return false;
}
preConnectedServerConnections.add(s1);
Thread.sleep(50);
}
return true;
}
protected void createProxyThread(Socket client) throws IOException, InterruptedException {
@ -215,7 +227,7 @@ public class RawIpProxyProvider extends ProxyProvider {
private void removeMappingCache() {
JSONObject connections = getCurrentConnectionsCache();
connections.remove(proxy.getActual_domain());
connections.remove(INSTANCE_ID.toString());
saveCurrentConnectionsCache(connections);
}
@ -234,7 +246,7 @@ public class RawIpProxyProvider extends ProxyProvider {
static private JSONObject getCurrentConnectionsCache(String actual_host) {
if (!Cacher.getCacheContents().has(actual_host)) {
if (!Cacher.getCacheContents().has(RAWIP_CONNECTIONS)) {
Cacher.put(RAWIP_CONNECTIONS, new JSONObject());
}
JSONObject gearthConnections = Cacher.getCacheContents().getJSONObject(RAWIP_CONNECTIONS);
@ -252,7 +264,7 @@ public class RawIpProxyProvider extends ProxyProvider {
BigInteger timeoutTimestamp = BigInteger.valueOf(System.currentTimeMillis() - 60000);
for (String key : connections.keySet()) {
JSONObject connection = connections.getJSONObject(key);
if (!connection.getString("id").equals(INSTANCE_ID.toString())) {
if (!key.equals(INSTANCE_ID.toString())) {
if (connection.getBigInteger("timestamp").compareTo(timeoutTimestamp) > 0) {
return false;
}

4
G-Earth/src/main/java/gearth/protocol/connection/proxy/SocksProxyProvider.java
View File

@ -20,8 +20,8 @@ public class SocksProxyProvider extends RawIpProxyProvider {
}
@Override
protected void onBeforeIpMapping() {
// do nothing
protected boolean onBeforeIpMapping() {
return true;
}
@Override