nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-27 02:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

remember manual connections for autodetection in future

Browse Source
This commit is contained in:
sirjonasxx 2018-09-28 22:14:20 +02:00
parent 9bde74d19d
commit 5ece05b4b1
2 changed files with 86 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/protocol/HConnection.java
View File

@ -1,5 +1,6 @@
package main.protocol; package main.protocol;
import main.misc.Cacher;
import main.protocol.hostreplacer.HostReplacer; import main.protocol.hostreplacer.HostReplacer;
import main.protocol.hostreplacer.HostReplacerFactory; import main.protocol.hostreplacer.HostReplacerFactory;
import main.protocol.memory.Rc4Obtainer; import main.protocol.memory.Rc4Obtainer;
@ -16,6 +17,7 @@ import java.util.*;
public class HConnection { public class HConnection {
public static final String HOTELS_CACHE_KEY = "hotelsConnectionInfo";
private final Queue<HPacket> sendToClientAsyncQueue = new LinkedList<>(); private final Queue<HPacket> sendToClientAsyncQueue = new LinkedList<>();
private final Queue<HPacket> sendToServerAsyncQueue = new LinkedList<>(); private final Queue<HPacket> sendToServerAsyncQueue = new LinkedList<>();
@ -63,7 +65,7 @@ public class HConnection {
CONNECTED // CONNECTED CONNECTED // CONNECTED
} }
private static List<String> autoDetectHosts; public static List<String> autoDetectHosts;
static { static {
autoDetectHosts = new ArrayList<>(); autoDetectHosts = new ArrayList<>();
autoDetectHosts.add("game-br.habbo.com:30000"); autoDetectHosts.add("game-br.habbo.com:30000");
@ -75,6 +77,15 @@ public class HConnection {
autoDetectHosts.add("game-nl.habbo.com:30000"); autoDetectHosts.add("game-nl.habbo.com:30000");
autoDetectHosts.add("game-tr.habbo.com:30000"); autoDetectHosts.add("game-tr.habbo.com:30000");
autoDetectHosts.add("game-us.habbo.com:38101"); autoDetectHosts.add("game-us.habbo.com:38101");
List<String> additionalCachedHotels = (List<String>) Cacher.get(HOTELS_CACHE_KEY);
if (additionalCachedHotels != null) {
for (String additionalHotel : additionalCachedHotels) {
if (!autoDetectHosts.contains(additionalHotel)) {
autoDetectHosts.add(additionalHotel);
}
}
}
} }
@ -112,6 +123,16 @@ public class HConnection {
// manual method // manual method
public void prepare(String domain, int port) { public void prepare(String domain, int port) {
List<String> additionalCachedHotels = (List<String>) Cacher.get(HOTELS_CACHE_KEY);
if (additionalCachedHotels == null) {
additionalCachedHotels = new ArrayList<>();
}
if (!additionalCachedHotels.contains(domain +":"+port)) {
additionalCachedHotels.add(domain+":"+port);
Cacher.put(HOTELS_CACHE_KEY, additionalCachedHotels);
}
List<String> potentialHost = new ArrayList<>(); List<String> potentialHost = new ArrayList<>();
potentialHost.add(domain+":"+port); potentialHost.add(domain+":"+port);
prepare(potentialHost); prepare(potentialHost);
@ -136,19 +157,31 @@ public class HConnection {
removeFromHosts(); removeFromHosts();
} }
try {
for (String host : allPotentialHosts) {
InetAddress address = InetAddress.getByName(host.split(":")[0]);
actual_domain.add(address.getHostAddress());
}
setState(State.PREPARED);
List<String> willremove = new ArrayList<>();
for (String host : allPotentialHosts) {
InetAddress address = null;
try {
address = InetAddress.getByName(host.split(":")[0]);
actual_domain.add(address.getHostAddress());
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
e.printStackTrace(); // e.printStackTrace();
setState(State.NOT_CONNECTED); actual_domain.add(null);
willremove.add(host);
} }
} }
List<String> additionalCachedHotels = (List<String>) Cacher.get(HOTELS_CACHE_KEY);
if (additionalCachedHotels != null) {
for (String host: willremove) {
additionalCachedHotels.remove(host);
}
Cacher.put(HOTELS_CACHE_KEY, additionalCachedHotels);
}
setState(State.PREPARED);
}
public void start() throws IOException { public void start() throws IOException {
if (state == State.PREPARED) { if (state == State.PREPARED) {
@ -159,6 +192,8 @@ public class HConnection {
for (int i = 0; i < actual_domain.size(); i++) { for (int i = 0; i < actual_domain.size(); i++) {
if (actual_domain.get(i) == null) continue;
ServerSocket proxy = new ServerSocket(port.get(i), 10, InetAddress.getByName("127.0.0." + (i+1))); ServerSocket proxy = new ServerSocket(port.get(i), 10, InetAddress.getByName("127.0.0." + (i+1)));
this.proxy.add(proxy); this.proxy.add(proxy);
String dom = actual_domain.get(i); String dom = actual_domain.get(i);
@ -361,17 +396,31 @@ public class HConnection {
} }
private void addToHosts() { private void addToHosts() {
String[] lines = new String[input_domain.size()]; List<String> linesTemp = new ArrayList<>();
for (int i = 0; i < input_domain.size(); i++) { for (int i = 0; i < input_domain.size(); i++) {
lines[i] = ("127.0.0." + (i+1)) + " " + input_domain.get(i); if (actual_domain.get(i) != null) {
linesTemp.add(("127.0.0." + (i+1)) + " " + input_domain.get(i));
}
}
String[] lines = new String[linesTemp.size()];
for (int i = 0; i < linesTemp.size(); i++) {
lines[i] = linesTemp.get(i);
} }
hostsReplacer.addRedirect(lines); hostsReplacer.addRedirect(lines);
hostRedirected = true; hostRedirected = true;
} }
private void removeFromHosts(){ private void removeFromHosts(){
String[] lines = new String[input_domain.size()]; List<String> linesTemp = new ArrayList<>();
for (int i = 0; i < input_domain.size(); i++) { for (int i = 0; i < input_domain.size(); i++) {
lines[i] = ("127.0.0." + (i+1)) + " " + input_domain.get(i); if (actual_domain.get(i) != null) {
linesTemp.add(("127.0.0." + (i+1)) + " " + input_domain.get(i));
}
}
String[] lines = new String[linesTemp.size()];
for (int i = 0; i < linesTemp.size(); i++) {
lines[i] = linesTemp.get(i);
} }
hostsReplacer.removeRedirect(lines); hostsReplacer.removeRedirect(lines);
hostRedirected = false; hostRedirected = false;

24
src/main/ui/connection/Connection.java
View File

@ -14,6 +14,10 @@ import main.protocol.TrafficListener;
import main.ui.SubForm; import main.ui.SubForm;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class Connection extends SubForm { public class Connection extends SubForm {
@ -35,8 +39,24 @@ public class Connection extends SubForm {
updateInputUI(); updateInputUI();
}); });
inpPort.getItems().addAll("30000", "38101"); List<String> knownHosts = HConnection.autoDetectHosts;
inpHost.getItems().addAll("game-nl.habbo.com", "game-us.habbo.com"); Set<String> hosts = new HashSet<>();
Set<String> ports = new HashSet<>();
for (String h : knownHosts) {
String[] split = h.split(":");
hosts.add(split[0]);
ports.add(split[1]);
}
List<String> hostsSorted = new ArrayList<>(hosts);
hostsSorted.sort(String::compareTo);
List<String> portsSorted = new ArrayList<>(ports);
portsSorted.sort(String::compareTo);
inpPort.getItems().addAll(portsSorted);
inpHost.getItems().addAll(hostsSorted);
inpPort.getSelectionModel().selectFirst(); inpPort.getSelectionModel().selectFirst();
inpHost.getSelectionModel().selectFirst(); inpHost.getSelectionModel().selectFirst();