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

Only intercept selected hotel hosts

Browse Source
This commit is contained in:
UnfamiliarLegacy 2024-06-22 02:27:59 +02:00
parent f875eb4e29
commit b66968435f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,10 @@ public class ProxyProviderFactory {
public static final String HOTELS_CACHE_KEY = "hotelsConnectionInfo"; public static final String HOTELS_CACHE_KEY = "hotelsConnectionInfo";
private static SocksConfiguration socksConfig = null; private static SocksConfiguration socksConfig = null;
public static List<String> autoDetectHosts; private static List<String> autoDetectHosts;
private static List<String> autoDetectHostsOrigins;
private static List<String> allHosts;
static { static {
autoDetectHosts = new ArrayList<>(); autoDetectHosts = new ArrayList<>();
autoDetectHosts.add("game-br.habbo.com:30000"); autoDetectHosts.add("game-br.habbo.com:30000");
@ -41,10 +44,15 @@ public class ProxyProviderFactory {
autoDetectHosts.add("game-us.habbo.com:30000"); autoDetectHosts.add("game-us.habbo.com:30000");
autoDetectHosts.add("game-s2.habbo.com:30000"); autoDetectHosts.add("game-s2.habbo.com:30000");
autoDetectHosts.add("game-od.habbo.com:40001"); autoDetectHostsOrigins = new ArrayList<>();
autoDetectHosts.add("game-ous.habbo.com:40001"); autoDetectHostsOrigins.add("game-od.habbo.com:40001");
autoDetectHosts.add("game-obr.habbo.com:40001"); autoDetectHostsOrigins.add("game-ous.habbo.com:40001");
autoDetectHosts.add("game-oes.habbo.com:40001"); autoDetectHostsOrigins.add("game-obr.habbo.com:40001");
autoDetectHostsOrigins.add("game-oes.habbo.com:40001");
allHosts = new ArrayList<>(autoDetectHosts.size() + autoDetectHostsOrigins.size());
allHosts.addAll(autoDetectHosts);
allHosts.addAll(autoDetectHostsOrigins);
List<Object> additionalCachedHotels = Cacher.getList(HOTELS_CACHE_KEY); List<Object> additionalCachedHotels = Cacher.getList(HOTELS_CACHE_KEY);
if (additionalCachedHotels != null) { if (additionalCachedHotels != null) {
@ -56,7 +64,7 @@ public class ProxyProviderFactory {
} }
if (OSValidator.isMac()) { if (OSValidator.isMac()) {
for (int i = 2; i <= autoDetectHosts.size() + 5; i++) { for (int i = 2; i <= allHosts.size() + 5; i++) {
ProcessBuilder allowLocalHost = new ProcessBuilder("ifconfig", "lo0", "alias", ("127.0.0." + i), "up"); ProcessBuilder allowLocalHost = new ProcessBuilder("ifconfig", "lo0", "alias", ("127.0.0." + i), "up");
try { try {
allowLocalHost.start(); allowLocalHost.start();
@ -67,6 +75,10 @@ public class ProxyProviderFactory {
} }
} }
public static List<String> getAllHosts() {
return allHosts;
}
private final HProxySetter proxySetter; private final HProxySetter proxySetter;
private final HStateSetter stateSetter; private final HStateSetter stateSetter;
private final HConnection hConnection; private final HConnection hConnection;
@ -89,7 +101,7 @@ public class ProxyProviderFactory {
} }
public ProxyProvider provide(HClient client) { public ProxyProvider provide(HClient client) {
return provide(client, autoDetectHosts); return provide(client, client == HClient.FLASH ? autoDetectHosts : autoDetectHostsOrigins);
} }
public ProxyProvider provide(HClient client, String domain, int port) { public ProxyProvider provide(HClient client, String domain, int port) {

2
G-Earth/src/main/java/gearth/ui/subforms/connection/ConnectionController.java
View File

@ -96,7 +96,7 @@ public class ConnectionController extends SubForm {
updateInputUI(); updateInputUI();
}); });
List<String> knownHosts = ProxyProviderFactory.autoDetectHosts; List<String> knownHosts = ProxyProviderFactory.getAllHosts();
Set<String> hosts = new HashSet<>(); Set<String> hosts = new HashSet<>();
Set<String> ports = new HashSet<>(); Set<String> ports = new HashSet<>();