diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/ProxyHandler.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/ProxyHandler.java index c5e844151..d97fc4889 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/ProxyHandler.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/ProxyHandler.java @@ -123,8 +123,8 @@ public class ProxyHandler implements Runnable { } Integer target = mapper.get(server); - if (target == null) { - target = mapper.get(StrUtil.subBefore(server, ".", true) + "."); + for (int i = 1; target == null && i < 4; i++) { + target = mapper.get(server.substring(0, server.length() - i)); } if (target == null) { FileLog.e("No route for ip " + server); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/Tcp2wsServer.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/Tcp2wsServer.java index 839174e3a..9da133bb0 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/Tcp2wsServer.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/tcp2ws/Tcp2wsServer.java @@ -23,10 +23,7 @@ public class Tcp2wsServer extends Thread { public static final HashMap mapper = new HashMap<>(); static { - mapper.put("149.154.175.50", 1); - mapper.put("149.154.175.53", 1); - mapper.put("149.154.175.55", 1); - mapper.put("149.154.167.51", 2); + mapper.put("149.154.175.5", 1); mapper.put("95.161.76.100", 2); mapper.put("149.154.175.100", 3); mapper.put("149.154.167.91", 4); @@ -37,7 +34,6 @@ public class Tcp2wsServer extends Thread { mapper.put("2001:b28:f23d:f003:0000:0000:0000:000a", 3); mapper.put("2001:67c:4e8:f004:0000:0000:0000:000a", 4); mapper.put("2001:b28:f23f:f005:0000:0000:0000:000a", 5); - mapper.put("149.154.175.5", 1); mapper.put("149.154.161.144", 2); mapper.put("149.154.167.", 2); mapper.put("149.154.175.1", 3);