Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix remote host not clearing after login

Browse Source 
This would cause the client to disconnect whenever exiting the game
or returning to the login screen if the multiclient deterrent was enabled.
This commit is contained in:
P0nk
2021-08-18 11:58:52 +02:00
parent 435cafd381
commit a8c6ef8934
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java
View File

@@ -33,6 +33,7 @@ import java.sql.SQLException;
import java.time.Instant; import java.time.Instant;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -61,7 +62,7 @@ public class MapleSessionCoordinator {
private final LoginStorage loginStorage = new LoginStorage(); private final LoginStorage loginStorage = new LoginStorage();
private final Map<Integer, MapleClient> onlineClients = new HashMap<>(); // Key: account id private final Map<Integer, MapleClient> onlineClients = new HashMap<>(); // Key: account id
private final Set<Hwid> onlineRemoteHwids = new HashSet<>(); // Hwid/nibblehwid private final Set<Hwid> onlineRemoteHwids = new HashSet<>(); // Hwid/nibblehwid
private final Map<String, Set<MapleClient>> loginRemoteHosts = new HashMap<>(); // Key: Ip (+ nibblehwid) private final Map<String, MapleClient> loginRemoteHosts = new ConcurrentHashMap<>(); // Key: Ip (+ nibblehwid)
private final HostHwidCache hostHwidCache = new HostHwidCache(); private final HostHwidCache hostHwidCache = new HostHwidCache();
private MapleSessionCoordinator() { private MapleSessionCoordinator() {
@@ -144,27 +145,20 @@ public class MapleSessionCoordinator {
return false; return false;
} }
addLoginRemoteHostClient(remoteHost, client); loginRemoteHosts.put(remoteHost, client);
return true; return true;
} finally { } finally {
sessionInit.finalize(remoteHost); sessionInit.finalize(remoteHost);
} }
} }
private void addLoginRemoteHostClient(String remoteHost, MapleClient client) {
Set<MapleClient> clients = new HashSet<>(2);
clients.add(client);
loginRemoteHosts.put(remoteHost, clients);
}
public void closeLoginSession(MapleClient client) { public void closeLoginSession(MapleClient client) {
String remoteHost = getSessionRemoteHost(client); clearLoginRemoteHost(client);
removeRemoteHostClient(remoteHost, client);
Hwid nibbleHwid = client.getHwid(); Hwid nibbleHwid = client.getHwid();
client.setHwid(null); client.setHwid(null);
if (nibbleHwid != null) { if (nibbleHwid != null) {
onlineRemoteHwids.remove(nibbleHwid.hwid()); onlineRemoteHwids.remove(nibbleHwid);
if (client != null) { if (client != null) {
MapleClient loggedClient = onlineClients.get(client.getAccID()); MapleClient loggedClient = onlineClients.get(client.getAccID());
@@ -177,15 +171,10 @@ public class MapleSessionCoordinator {
} }
} }
private void removeRemoteHostClient(String remoteHost, MapleClient client) { private void clearLoginRemoteHost(MapleClient client) {
Set<MapleClient> clients = loginRemoteHosts.get(remoteHost); String remoteHost = getSessionRemoteHost(client);
if (clients != null) { loginRemoteHosts.remove(client.getRemoteAddress());
clients.remove(client); loginRemoteHosts.remove(remoteHost);
if (clients.isEmpty()) {
loginRemoteHosts.remove(remoteHost);
}
}
} }
public AntiMulticlientResult attemptLoginSession(MapleClient client, Hwid hwid, int accountId, boolean routineCheck) { public AntiMulticlientResult attemptLoginSession(MapleClient client, Hwid hwid, int accountId, boolean routineCheck) {
@@ -369,12 +358,12 @@ public class MapleSessionCoordinator {
} }
if (!loginRemoteHosts.isEmpty()) { if (!loginRemoteHosts.isEmpty()) {
List<Entry<String, Set<MapleClient>>> elist = new ArrayList<>(loginRemoteHosts.entrySet()); List<Entry<String, MapleClient>> elist = new ArrayList<>(loginRemoteHosts.entrySet());
elist.sort(Entry.comparingByKey()); elist.sort(Entry.comparingByKey());
System.out.println("Current login sessions: "); System.out.println("Current login sessions: ");
for (Entry<String, Set<MapleClient>> e : elist) { for (Entry<String, MapleClient> e : elist) {
System.out.println(" " + e.getKey() + ", size: " + e.getValue().size()); System.out.println(" " + e.getKey() + ", client: " + e.getValue());
} }
} }
} }
@@ -403,13 +392,13 @@ public class MapleSessionCoordinator {
} }
if (!loginRemoteHosts.isEmpty()) { if (!loginRemoteHosts.isEmpty()) {
List<Entry<String, Set<MapleClient>>> elist = new ArrayList<>(loginRemoteHosts.entrySet()); List<Entry<String, MapleClient>> elist = new ArrayList<>(loginRemoteHosts.entrySet());
elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey())); elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey()));
str += ("Current login sessions:\r\n"); str += ("Current login sessions:\r\n");
for (Entry<String, Set<MapleClient>> e : elist) { for (Entry<String, MapleClient> e : elist) {
str += (" " + e.getKey() + ", IP: " + e.getValue() + "\r\n"); str += (" " + e.getKey() + ", IP: " + e.getValue().getRemoteAddress() + "\r\n");
} }
} }