From 42cf10c3476c6cbb7620a5910992914a79dc6e82 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 13 Apr 2021 16:33:39 +0000
Subject: [PATCH] Moved login client and handler in network.
---
.../org/l2jmobius/loginserver/GameServerTable.java | 1 +
.../org/l2jmobius/loginserver/LoginController.java | 2 +-
.../java/org/l2jmobius/loginserver/LoginServer.java | 1 +
.../loginserver/network/AbstractClientPacket.java | 2 --
.../loginserver/{ => network}/LoginClient.java | 10 ++++++----
.../loginserver/{ => network}/LoginPacketHandler.java | 5 ++---
.../network/clientpackets/RequestAuthGG.java | 4 ++--
.../network/clientpackets/RequestAuthLogin.java | 4 ++--
.../network/clientpackets/RequestServerList.java | 2 +-
.../network/clientpackets/RequestServerLogin.java | 2 +-
.../loginserver/network/serverpackets/Init.java | 2 +-
11 files changed, 18 insertions(+), 17 deletions(-)
rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/{ => network}/LoginClient.java (91%)
rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/{ => network}/LoginPacketHandler.java (90%)
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java
index 551c7fc646..55d0a5cb43 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java
@@ -49,6 +49,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.loginserver.network.LoginClient;
import org.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
import org.l2jmobius.loginserver.network.serverpackets.ServerList;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java
index 1ae8d6064e..f1b0925a01 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java
@@ -40,9 +40,9 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.loginserver.network.LoginClient;
/**
- * This class ...
* @version $Revision: 1.7.4.3 $ $Date: 2005/03/27 15:30:09 $
*/
public class LoginController
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java
index 9734999db2..5e4a35d6d3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.enums.ServerMode;
import org.l2jmobius.loginserver.network.AbstractClientPacket;
+import org.l2jmobius.loginserver.network.LoginClient;
import org.l2jmobius.loginserver.ui.Gui;
import org.l2jmobius.telnet.TelnetStatusThread;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/AbstractClientPacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/AbstractClientPacket.java
index daf290f7f1..ffd8e85830 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/AbstractClientPacket.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/AbstractClientPacket.java
@@ -16,8 +16,6 @@
*/
package org.l2jmobius.loginserver.network;
-import org.l2jmobius.loginserver.LoginClient;
-
/**
* @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:12 $
*/
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/LoginClient.java
similarity index 91%
rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginClient.java
rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/LoginClient.java
index 19b2dca8bc..23e2941d87 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginClient.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/LoginClient.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.l2jmobius.loginserver;
+package org.l2jmobius.loginserver.network;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -29,13 +29,15 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.commons.util.crypt.NewCrypt;
+import org.l2jmobius.loginserver.LoginController;
import org.l2jmobius.loginserver.LoginController.ScrambledKeyPair;
+import org.l2jmobius.loginserver.LoginServer;
+import org.l2jmobius.loginserver.SessionKey;
import org.l2jmobius.loginserver.network.serverpackets.Init;
-import org.l2jmobius.loginserver.network.AbstractClientPacket;
-import org.l2jmobius.loginserver.network.AbstractServerPacket;
/**
- * @version $Revision: 1.15.2.5.2.5 $ $Date: 2005/04/06 16:13:46 $
+ * Represents a client connected into the LoginServer
+ * @author KenM
*/
public class LoginClient extends Thread
{
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginPacketHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java
similarity index 90%
rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginPacketHandler.java
rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java
index 403ccca7c4..ea31e7045e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginPacketHandler.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java
@@ -14,12 +14,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.l2jmobius.loginserver;
+package org.l2jmobius.loginserver.network;
import java.util.logging.Logger;
-import org.l2jmobius.loginserver.LoginClient.LoginClientState;
-import org.l2jmobius.loginserver.network.AbstractClientPacket;
+import org.l2jmobius.loginserver.network.LoginClient.LoginClientState;
import org.l2jmobius.loginserver.network.clientpackets.RequestAuthGG;
import org.l2jmobius.loginserver.network.clientpackets.RequestAuthLogin;
import org.l2jmobius.loginserver.network.clientpackets.RequestServerList;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthGG.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthGG.java
index 01ec25c755..4da5fe2399 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthGG.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthGG.java
@@ -16,9 +16,9 @@
*/
package org.l2jmobius.loginserver.network.clientpackets;
-import org.l2jmobius.loginserver.LoginClient;
-import org.l2jmobius.loginserver.LoginClient.LoginClientState;
import org.l2jmobius.loginserver.network.AbstractClientPacket;
+import org.l2jmobius.loginserver.network.LoginClient;
+import org.l2jmobius.loginserver.network.LoginClient.LoginClientState;
import org.l2jmobius.loginserver.network.serverpackets.GGAuth;
import org.l2jmobius.loginserver.network.serverpackets.LoginFail;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
index 65de785fe7..f59e754e25 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
@@ -25,11 +25,11 @@ import javax.crypto.Cipher;
import org.l2jmobius.Config;
import org.l2jmobius.loginserver.GameServerTable;
import org.l2jmobius.loginserver.GameServerThread;
-import org.l2jmobius.loginserver.LoginClient;
-import org.l2jmobius.loginserver.LoginClient.LoginClientState;
import org.l2jmobius.loginserver.LoginController;
import org.l2jmobius.loginserver.LoginServer;
import org.l2jmobius.loginserver.network.AbstractClientPacket;
+import org.l2jmobius.loginserver.network.LoginClient;
+import org.l2jmobius.loginserver.network.LoginClient.LoginClientState;
import org.l2jmobius.loginserver.network.serverpackets.AccountKicked;
import org.l2jmobius.loginserver.network.serverpackets.LoginFail;
import org.l2jmobius.loginserver.network.serverpackets.LoginOk;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java
index bc5077ab22..da1a39d73e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java
@@ -17,8 +17,8 @@
package org.l2jmobius.loginserver.network.clientpackets;
import org.l2jmobius.loginserver.GameServerTable;
-import org.l2jmobius.loginserver.LoginClient;
import org.l2jmobius.loginserver.network.AbstractClientPacket;
+import org.l2jmobius.loginserver.network.LoginClient;
import org.l2jmobius.loginserver.network.serverpackets.LoginFail;
/**
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java
index 67ae57ea71..70e9133d83 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java
@@ -20,9 +20,9 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.loginserver.GameServerTable;
-import org.l2jmobius.loginserver.LoginClient;
import org.l2jmobius.loginserver.LoginController;
import org.l2jmobius.loginserver.network.AbstractClientPacket;
+import org.l2jmobius.loginserver.network.LoginClient;
import org.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
import org.l2jmobius.loginserver.network.serverpackets.LoginFail;
import org.l2jmobius.loginserver.network.serverpackets.PlayFail;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java
index 2ab2eddc35..24eedf9dca 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java
@@ -16,8 +16,8 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.loginserver.LoginClient;
import org.l2jmobius.loginserver.network.AbstractServerPacket;
+import org.l2jmobius.loginserver.network.LoginClient;
/**
* Format: dd b dddd s d: session id d: protocol revision b: 0x90 bytes : 0x80 bytes for the scrambled RSA public key 0x10 bytes at 0x00 d: unknow d: unknow d: unknow d: unknow s: blowfish key