From 96254b11ea884a76917061285d3b2d76bf593a6d Mon Sep 17 00:00:00 2001 From: Gravit Date: Tue, 12 Mar 2019 15:05:41 +0700 Subject: [PATCH] =?UTF-8?q?[FEATURE]=20clientData=20=D0=B4=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=83=D0=BF=D0=B5=D0=BD=20=D0=B2=D1=81=D0=B5=D0=BC=20Res?= =?UTF-8?q?ponse=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gravit/launchserver/response/PingResponse.java | 5 +++-- .../ru/gravit/launchserver/response/Response.java | 12 ++++++++---- .../response/admin/ExecCommandResponse.java | 4 ++-- .../launchserver/response/auth/AuthResponse.java | 5 ++--- .../response/auth/AuthServerResponse.java | 5 ++--- .../response/auth/ChangeServerResponse.java | 5 +++-- .../response/auth/CheckServerResponse.java | 5 ++--- .../response/auth/JoinServerResponse.java | 5 ++--- .../response/auth/SetProfileResponse.java | 5 ++--- .../profile/BatchProfileByUsernameResponse.java | 5 +++-- .../response/profile/ProfileByUUIDResponse.java | 5 +++-- .../response/profile/ProfileByUsernameResponse.java | 5 +++-- .../response/update/LauncherResponse.java | 9 ++++----- .../response/update/LegacyLauncherResponse.java | 5 +++-- .../response/update/ProfilesResponse.java | 7 +++---- .../response/update/UpdateListResponse.java | 5 +++-- .../launchserver/response/update/UpdateResponse.java | 5 ++--- .../gravit/launchserver/socket/ResponseThread.java | 8 +++++--- .../ru/gravit/launchserver/socket/SocketContext.java | 11 ++++++----- 19 files changed, 61 insertions(+), 55 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java index 74b78222..3a88b84b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java @@ -4,12 +4,13 @@ import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launchserver.LaunchServer; +import ru.gravit.launchserver.socket.Client; import java.io.IOException; public final class PingResponse extends Response { - public PingResponse(LaunchServer server, long id, HInput input, HOutput output, String ip) { - super(server, id, input, output, ip); + public PingResponse(LaunchServer server, long id, HInput input, HOutput output, String ip, Client clientData) { + super(server, id, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java index 68b3078b..e07b707d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java @@ -11,6 +11,7 @@ import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse; import ru.gravit.launchserver.response.profile.ProfileByUsernameResponse; import ru.gravit.launchserver.response.update.*; +import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.LogHelper; import java.io.IOException; @@ -21,13 +22,13 @@ public abstract class Response { @FunctionalInterface public interface Factory { - Response newResponse(LaunchServer server, long id, HInput input, HOutput output, String ip); + Response newResponse(LaunchServer server, long id, HInput input, HOutput output, String ip, Client clientData); } private static final Map> RESPONSES = new ConcurrentHashMap<>(8); - public static Response getResponse(int type, LaunchServer server, long session, HInput input, HOutput output, String ip) { - return RESPONSES.get(type).newResponse(server, session, input, output, ip); + public static Response getResponse(int type, LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + return RESPONSES.get(type).newResponse(server, session, input, output, ip, clientData); } public static void registerResponse(int type, Factory factory) { @@ -72,15 +73,18 @@ public static void requestError(String message) throws RequestException { protected final String ip; + protected final Client clientData; + protected final long session; - protected Response(LaunchServer server, long session, HInput input, HOutput output, String ip) { + protected Response(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { this.server = server; this.input = input; this.output = output; this.ip = ip; this.session = session; + this.clientData = clientData; } diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java index be4114e5..968696db 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java @@ -11,8 +11,8 @@ import java.io.IOException; public class ExecCommandResponse extends Response { - public ExecCommandResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public ExecCommandResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java index 6b56666f..20a6ff60 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java @@ -31,8 +31,8 @@ private static String echo(int length) { return new String(chars); } - public AuthResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public AuthResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } public static class AuthContext { @@ -81,7 +81,6 @@ public void reply() throws Exception { debug("Login: '%s', Password: '%s'", login, echo(password.length())); AuthProviderResult result; AuthProvider provider = server.config.authProvider[auth_id]; - Client clientData = server.sessionManager.getClient(session); clientData.type = Client.Type.USER; AuthContext context = new AuthContext(session, login, password.length(), customText, client, hwid_str, false); try { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java index 08370200..66ce8cce 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java @@ -28,8 +28,8 @@ private static String echo(int length) { return new String(chars); } - public AuthServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public AuthServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override @@ -52,7 +52,6 @@ public void reply() throws Exception { debug("ServerLogin: '%s', Password: '%s'", login, echo(password.length())); AuthProviderResult result; AuthProvider provider = server.config.authProvider[auth_id]; - Client clientData = server.sessionManager.getClient(session); try { if (server.limiter.isLimit(ip)) { AuthProvider.authError(server.config.authRejectString); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/ChangeServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/ChangeServerResponse.java index 6994a7ed..6dd2f01e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/ChangeServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/ChangeServerResponse.java @@ -4,14 +4,15 @@ import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.socket.Client; public class ChangeServerResponse extends Response { public static boolean needChange = false; public static String address; public static int port; - public ChangeServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public ChangeServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java index b2974674..002e381d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java @@ -16,8 +16,8 @@ public final class CheckServerResponse extends Response { - public CheckServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public CheckServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override @@ -26,7 +26,6 @@ public void reply() throws IOException { String serverID = VerifyHelper.verifyServerID(input.readASCII(41)); // With minus sign String client = input.readString(SerializeLimits.MAX_CLIENT); debug("Username: %s, Server ID: %s", username, serverID); - Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth || clientData.type != Client.Type.SERVER) { requestError("Access denied"); return; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java index 821848a6..27e16ebf 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java @@ -15,8 +15,8 @@ public final class JoinServerResponse extends Response { - public JoinServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public JoinServerResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override @@ -24,7 +24,6 @@ public void reply() throws IOException { String username = VerifyHelper.verifyUsername(input.readString(SerializeLimits.MAX_LOGIN)); String accessToken = SecurityHelper.verifyToken(input.readASCII(-SecurityHelper.TOKEN_STRING_LENGTH)); String serverID = VerifyHelper.verifyServerID(input.readASCII(SerializeLimits.MAX_SERVERID)); // With minus sign - Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth || clientData.type != Client.Type.USER) { requestError("Access denied"); return; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/SetProfileResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/SetProfileResponse.java index 33b30d83..271aa816 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/SetProfileResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/SetProfileResponse.java @@ -11,14 +11,13 @@ import java.util.Collection; public class SetProfileResponse extends Response { - public SetProfileResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public SetProfileResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override public void reply() throws Exception { String client = input.readString(SerializeLimits.MAX_CLIENT); - Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth) requestError("You not auth"); Collection profiles = server.getProfiles(); for (ClientProfile p : profiles) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/BatchProfileByUsernameResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/BatchProfileByUsernameResponse.java index 8d9f5181..ca444257 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/BatchProfileByUsernameResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/BatchProfileByUsernameResponse.java @@ -5,6 +5,7 @@ import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.VerifyHelper; import java.io.IOException; @@ -12,8 +13,8 @@ public final class BatchProfileByUsernameResponse extends Response { - public BatchProfileByUsernameResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public BatchProfileByUsernameResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java index 0aeeca44..2d636be5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java @@ -7,6 +7,7 @@ import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.LogHelper; import java.io.IOException; @@ -37,8 +38,8 @@ public static PlayerProfile getProfile(LaunchServer server, UUID uuid, String us return new PlayerProfile(uuid, username, skin, cloak); } - public ProfileByUUIDResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public ProfileByUUIDResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUsernameResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUsernameResponse.java index 859ada26..043418b5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUsernameResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUsernameResponse.java @@ -5,6 +5,7 @@ import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.VerifyHelper; import java.io.IOException; @@ -24,8 +25,8 @@ public static void writeProfile(LaunchServer server, HOutput output, String user ProfileByUUIDResponse.getProfile(server, uuid, username, client).write(output); } - public ProfileByUsernameResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public ProfileByUsernameResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java index 411be0d3..242e657b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java @@ -13,8 +13,8 @@ public final class LauncherResponse extends Response { - public LauncherResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public LauncherResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override @@ -25,17 +25,16 @@ public void reply() throws IOException { requestError("Missing launcher binary"); return; } - Client client = server.sessionManager.getOrNewClient(session); byte[] digest = input.readByteArray(SerializeLimits.MAX_DIGEST); if (!Arrays.equals(bytes.getDigest(), digest)) { writeNoError(output); output.writeBoolean(true); output.writeByteArray(bytes.getBytes(), 0); - client.checkSign = false; + clientData.checkSign = false; return; } writeNoError(output); output.writeBoolean(false); - client.checkSign = true; + clientData.checkSign = true; } } diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java index 92aba4d6..2994bdd7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java @@ -5,14 +5,15 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.binary.LauncherBinary; import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.SecurityHelper; import java.io.IOException; public final class LegacyLauncherResponse extends Response { - public LegacyLauncherResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public LegacyLauncherResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java index 47dd872e..26c66668 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java @@ -14,16 +14,15 @@ public final class ProfilesResponse extends Response { - public ProfilesResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public ProfilesResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override public void reply() throws IOException { // Resolve launcher binary - Client client = server.sessionManager.getClient(session); input.readBoolean(); - if (client.type == Client.Type.USER && !client.checkSign) { + if (clientData.type == Client.Type.USER && !clientData.checkSign) { LogHelper.warning("User session: %d ip %s try get profiles", session, ip); requestError("Access denied"); return; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateListResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateListResponse.java index ffb1dddf..ec8c4d1c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateListResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateListResponse.java @@ -6,14 +6,15 @@ import ru.gravit.launcher.serialize.signed.SignedObjectHolder; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.socket.Client; import java.util.Map.Entry; import java.util.Set; public final class UpdateListResponse extends Response { - public UpdateListResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public UpdateListResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java index 8e4c547b..c5234956 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java @@ -24,8 +24,8 @@ public final class UpdateResponse extends Response { - public UpdateResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) { - super(server, session, input, output, ip); + public UpdateResponse(LaunchServer server, long session, HInput input, HOutput output, String ip, Client clientData) { + super(server, session, input, output, ip, clientData); } @Override @@ -37,7 +37,6 @@ public void reply() throws IOException { requestError(String.format("Unknown update dir: %s", updateDirName)); return; } - Client clientData = server.sessionManager.getClient(session); if (!clientData.isAuth || clientData.type != Client.Type.USER || clientData.profile == null) { requestError("Access denied"); return; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java index 6d6922a3..7cb10056 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java @@ -82,12 +82,12 @@ private Handshake readHandshake(HInput input, HOutput output) throws IOException return new Handshake(type, session); } - private void respond(Integer type, HInput input, HOutput output, long session, String ip) throws Exception { + private void respond(Integer type, HInput input, HOutput output, long session, String ip, Client clientData) throws Exception { if (server.serverSocketHandler.logConnections) LogHelper.info("Connection #%d from %s", session, ip); // Choose response based on type - Response response = Response.getResponse(type, server, session, input, output, ip); + Response response = Response.getResponse(type, server, session, input, output, ip, clientData); // Reply response.reply(); @@ -115,11 +115,13 @@ public void run() { context.ip = IOHelper.getIP(socket.getRemoteSocketAddress()); context.session = handshake.session; context.type = handshake.type; + Client clientData = server.sessionManager.getOrNewClient(context.session); + context.client = clientData; // Start response if (socketHookManager.preHook(context)) { try { - respond(handshake.type, input, output, handshake.session, context.ip); + respond(handshake.type, input, output, handshake.session, context.ip, clientData); socketHookManager.postHook(context); } catch (RequestException e) { if (server.socketHookManager.errorHook(context, e)) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java index f4012818..a3b142fa 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java @@ -4,9 +4,10 @@ import ru.gravit.launcher.serialize.HOutput; public class SocketContext { - HInput input; - HOutput output; - long session; - String ip; - Integer type; + public HInput input; + public HOutput output; + public long session; + public String ip; + public Integer type; + public Client client; }