diff --git a/L2J_Mobius_1.0_Ertheia/build.xml b/L2J_Mobius_1.0_Ertheia/build.xml index 03bade2a25..03b46f1487 100644 --- a/L2J_Mobius_1.0_Ertheia/build.xml +++ b/L2J_Mobius_1.0_Ertheia/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java index 7cabb6545c..7473693143 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -79,7 +79,7 @@ public class LoginServerThread extends Thread protected static final Logger LOGGER = Logger.getLogger(LoginServerThread.class.getName()); protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); - /** @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV */ + /** @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; private final int _port; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java index 78eadc9019..eef50ffde8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginServer.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java rename to L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginServer.java index b87afbb356..6b5e1784d9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginServer.java @@ -36,26 +36,26 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; /** * @author KenM */ -public final class L2LoginServer +public final class LoginServer { - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; + private static LoginServer _instance; private GameServerListener _gameServerListener; private Thread _restartLoginServer; public static void main(String[] args) throws Exception { - new L2LoginServer(); + new LoginServer(); } - public static L2LoginServer getInstance() + public static LoginServer getInstance() { return _instance; } - private L2LoginServer() throws Exception + private LoginServer() throws Exception { _instance = this; Server.serverMode = Server.MODE_LOGINSERVER; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index f69027308b..26ec59a6d9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch b/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch index 1efa65fa72..8838f70403 100644 --- a/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch +++ b/L2J_Mobius_1.0_Ertheia/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_2.5_Underground/build.xml b/L2J_Mobius_2.5_Underground/build.xml index 9185d88d83..40a4b8876b 100644 --- a/L2J_Mobius_2.5_Underground/build.xml +++ b/L2J_Mobius_2.5_Underground/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java index 7cabb6545c..7473693143 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -79,7 +79,7 @@ public class LoginServerThread extends Thread protected static final Logger LOGGER = Logger.getLogger(LoginServerThread.class.getName()); protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); - /** @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV */ + /** @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; private final int _port; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java index 78eadc9019..eef50ffde8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginServer.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java rename to L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginServer.java index b87afbb356..6b5e1784d9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginServer.java @@ -36,26 +36,26 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; /** * @author KenM */ -public final class L2LoginServer +public final class LoginServer { - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; + private static LoginServer _instance; private GameServerListener _gameServerListener; private Thread _restartLoginServer; public static void main(String[] args) throws Exception { - new L2LoginServer(); + new LoginServer(); } - public static L2LoginServer getInstance() + public static LoginServer getInstance() { return _instance; } - private L2LoginServer() throws Exception + private LoginServer() throws Exception { _instance = this; Server.serverMode = Server.MODE_LOGINSERVER; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index f69027308b..26ec59a6d9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch b/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch index a967c80a08..edfd792e28 100644 --- a/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch +++ b/L2J_Mobius_2.5_Underground/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_3.0_Helios/build.xml b/L2J_Mobius_3.0_Helios/build.xml index 7a80a767ce..868a87215f 100644 --- a/L2J_Mobius_3.0_Helios/build.xml +++ b/L2J_Mobius_3.0_Helios/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java index bf6d4a9bed..668d75f771 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -80,7 +80,7 @@ public class LoginServerThread extends Thread protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); /** - * @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV + * @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java index 78eadc9019..eef50ffde8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginServer.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java rename to L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginServer.java index b87afbb356..6b5e1784d9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginServer.java @@ -36,26 +36,26 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; /** * @author KenM */ -public final class L2LoginServer +public final class LoginServer { - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; + private static LoginServer _instance; private GameServerListener _gameServerListener; private Thread _restartLoginServer; public static void main(String[] args) throws Exception { - new L2LoginServer(); + new LoginServer(); } - public static L2LoginServer getInstance() + public static LoginServer getInstance() { return _instance; } - private L2LoginServer() throws Exception + private LoginServer() throws Exception { _instance = this; Server.serverMode = Server.MODE_LOGINSERVER; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index f69027308b..26ec59a6d9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch b/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch index 6cab652604..fccff1f241 100644 --- a/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch +++ b/L2J_Mobius_3.0_Helios/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/build.xml b/L2J_Mobius_4.0_GrandCrusade/build.xml index 56af6606ed..18a01aa566 100644 --- a/L2J_Mobius_4.0_GrandCrusade/build.xml +++ b/L2J_Mobius_4.0_GrandCrusade/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java index bf6d4a9bed..668d75f771 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -80,7 +80,7 @@ public class LoginServerThread extends Thread protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); /** - * @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV + * @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java index 78eadc9019..eef50ffde8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginServer.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java rename to L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginServer.java index b87afbb356..6b5e1784d9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginServer.java @@ -36,26 +36,26 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; /** * @author KenM */ -public final class L2LoginServer +public final class LoginServer { - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; + private static LoginServer _instance; private GameServerListener _gameServerListener; private Thread _restartLoginServer; public static void main(String[] args) throws Exception { - new L2LoginServer(); + new LoginServer(); } - public static L2LoginServer getInstance() + public static LoginServer getInstance() { return _instance; } - private L2LoginServer() throws Exception + private LoginServer() throws Exception { _instance = this; Server.serverMode = Server.MODE_LOGINSERVER; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index f69027308b..26ec59a6d9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch b/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch index 18985a61d8..355c0835d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch +++ b/L2J_Mobius_4.0_GrandCrusade/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_C6_Interlude/build.xml b/L2J_Mobius_C6_Interlude/build.xml index dcfb50d719..e0f2ae7cd6 100644 --- a/L2J_Mobius_C6_Interlude/build.xml +++ b/L2J_Mobius_C6_Interlude/build.xml @@ -80,7 +80,7 @@ - + diff --git a/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh b/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh index 10ed9c003c..af55d4bdf9 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh +++ b/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh @@ -3,7 +3,7 @@ err=1 until [ $err == 0 ]; do - java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms128m -Xmx128m -cp lib/*:LoginServer.jar com.l2jmobius.loginserver.L2LoginServer > log/stdout.log 2>&1 + java -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms128m -Xmx128m -cp lib/*:LoginServer.jar com.l2jmobius.loginserver.LoginServer > log/stdout.log 2>&1 err=$? # /etc/init.d/mysql restart sleep 10; diff --git a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat index 38cdc8a498..7b8453b3e7 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat +++ b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat @@ -5,7 +5,7 @@ title L2J Mobius - Login Server Console echo Starting Login Server. echo. -java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms128m -Xmx256m -cp ./lib/*;LoginServer.jar com.l2jmobius.loginserver.L2LoginServer +java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.config.file=config/others/log.cfg -Xms128m -Xmx256m -cp ./lib/*;LoginServer.jar com.l2jmobius.loginserver.LoginServer if ERRORLEVEL 2 goto restart if ERRORLEVEL 1 goto error diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java index c697b6f261..7352e35abe 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java @@ -219,8 +219,8 @@ public class GameServerThread extends Thread LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginServer.java rename to L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java index 62f10a70be..570a10c3aa 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java @@ -35,13 +35,13 @@ import com.l2jmobius.commons.mmocore.SelectorThread; import com.l2jmobius.commons.util.Util; import com.l2jmobius.status.Status; -public class L2LoginServer +public class LoginServer { - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0102; - private static L2LoginServer _instance; + private static LoginServer _instance; private GameServerListener _gameServerListener; private SelectorThread _selectorThread; @@ -49,15 +49,15 @@ public class L2LoginServer public static void main(String[] args) { - _instance = new L2LoginServer(); + _instance = new LoginServer(); } - public static L2LoginServer getInstance() + public static LoginServer getInstance() { return _instance; } - public L2LoginServer() + public LoginServer() { _instance = this; Server.serverMode = Server.MODE_LOGINSERVER; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index 16f9405f69..2be7b33f65 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.loginserver.network.loginserverpackets; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; import com.l2jmobius.loginserver.network.serverpackets.ServerBasePacket; /** @@ -33,7 +33,7 @@ public class InitLS extends ServerBasePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java index d6b8191dd0..f75750bcf1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.loginserver.GameServerTable; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; import com.l2jmobius.loginserver.LoginController; public class LoginStatusThread extends Thread @@ -243,14 +243,14 @@ public class LoginStatusThread extends Thread } else if (_usrCommand.startsWith("shutdown")) { - L2LoginServer.getInstance().shutdown(false); + LoginServer.getInstance().shutdown(false); _print.println("Bye Bye!"); _print.flush(); _cSocket.close(); } else if (_usrCommand.startsWith("restart")) { - L2LoginServer.getInstance().shutdown(true); + LoginServer.getInstance().shutdown(true); _print.println("Bye Bye!"); _print.flush(); _cSocket.close(); diff --git a/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch b/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch index 1c856fadbc..49af8fb783 100644 --- a/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch +++ b/L2J_Mobius_C6_Interlude/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/build.xml b/L2J_Mobius_CT_2.6_HighFive/build.xml index 3392ceb15f..6c5ecbc666 100644 --- a/L2J_Mobius_CT_2.6_HighFive/build.xml +++ b/L2J_Mobius_CT_2.6_HighFive/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java index 591b9e1407..f8bec51edb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -79,7 +79,7 @@ public class LoginServerThread extends Thread protected static final Logger LOGGER = Logger.getLogger(LoginServerThread.class.getName()); protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); - /** @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV */ + /** @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; private final int _port; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java index 5cc887dbad..a8301eb4b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java deleted file mode 100644 index 4c3aed9bdb..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.loginserver; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.net.UnknownHostException; -import java.security.GeneralSecurityException; -import java.util.logging.Level; -import java.util.logging.LogManager; -import java.util.logging.Logger; - -import com.l2jmobius.Config; -import com.l2jmobius.Server; -import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.loginserver.network.ClientNetworkManager; - -/** - * @author KenM - */ -public final class L2LoginServer -{ - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); - - public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; - private GameServerListener _gameServerListener; - private Thread _restartLoginServer; - - public static void main(String[] args) throws Exception - { - new L2LoginServer(); - } - - public static L2LoginServer getInstance() - { - return _instance; - } - - private L2LoginServer() throws Exception - { - _instance = this; - Server.serverMode = Server.MODE_LOGINSERVER; - - // Local Constants - final String LOG_FOLDER = "log"; // Name of folder for log file - final String LOG_NAME = "./log.cfg"; // Name of log file - - /*** Main ***/ - // Create log folder - final File logFolder = new File(".", LOG_FOLDER); - logFolder.mkdir(); - - // Create input stream for log file -- or store file data into memory - - try (InputStream is = new FileInputStream(new File(LOG_NAME))) - { - LogManager.getLogManager().readConfiguration(is); - } - catch (IOException e) - { - LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); - } - - // Load Config - Config.load(); - - // Prepare Database - DatabaseFactory.getInstance(); - - try - { - LoginController.load(); - } - catch (GeneralSecurityException e) - { - LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); - System.exit(1); - } - - GameServerTable.getInstance(); - - loadBanFile(); - - try - { - _gameServerListener = new GameServerListener(); - _gameServerListener.start(); - LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); - } - catch (IOException e) - { - LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); - System.exit(1); - } - - ClientNetworkManager.getInstance().start(); - } - - public GameServerListener getGameServerListener() - { - return _gameServerListener; - } - - private void loadBanFile() - { - final File bannedFile = new File("./banned_ip.cfg"); - if (bannedFile.exists() && bannedFile.isFile()) - { - try (FileInputStream fis = new FileInputStream(bannedFile); - InputStreamReader is = new InputStreamReader(fis); - LineNumberReader lnr = new LineNumberReader(is)) - { - //@formatter:off - lnr.lines() - .map(String::trim) - .filter(l -> !l.isEmpty() && (l.charAt(0) != '#')) - .forEach(line -> { - String[] parts = line.split("#", 2); // address[ duration][ # comments] - line = parts[0]; - parts = line.split("\\s+"); // durations might be aligned via multiple spaces - final String address = parts[0]; - long duration = 0; - - if (parts.length > 1) - { - try - { - duration = Long.parseLong(parts[1]); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); - return; - } - } - - try - { - LoginController.getInstance().addBanForAddress(address, duration); - } - catch (UnknownHostException e) - { - LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); - } - }); - //@formatter:on - } - catch (IOException e) - { - LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); - } - LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); - } - else - { - LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); - } - - if (Config.LOGIN_SERVER_SCHEDULE_RESTART) - { - LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); - _restartLoginServer = new LoginServerRestart(); - _restartLoginServer.setDaemon(true); - _restartLoginServer.start(); - } - } - - class LoginServerRestart extends Thread - { - public LoginServerRestart() - { - setName("LoginServerRestart"); - } - - @Override - public void run() - { - while (!isInterrupted()) - { - try - { - Thread.sleep(Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME * 3600000); - } - catch (InterruptedException e) - { - return; - } - shutdown(true); - } - } - } - - public void shutdown(boolean restart) - { - Runtime.getRuntime().exit(restart ? 2 : 0); - } -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginServer.java new file mode 100644 index 0000000000..4d3be6300d --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginServer.java @@ -0,0 +1,216 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.l2jmobius.loginserver; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +import com.l2jmobius.Config; +import com.l2jmobius.Server; +import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.loginserver.network.ClientNetworkManager; + +/** + * @author KenM + */ +public final class LoginServer +{ + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); + + public static final int PROTOCOL_REV = 0x0106; + private static LoginServer _instance; + private GameServerListener _gameServerListener; + private Thread _restartLoginServer; + + public static void main(String[] args) throws Exception + { + new LoginServer(); + } + + public static LoginServer getInstance() + { + return _instance; + } + + private LoginServer() throws Exception + { + _instance = this; + Server.serverMode = Server.MODE_LOGINSERVER; + + // Local Constants + final String LOG_FOLDER = "log"; // Name of folder for log file + final String LOG_NAME = "./log.cfg"; // Name of log file + + /*** Main ***/ + // Create log folder + final File logFolder = new File(".", LOG_FOLDER); + logFolder.mkdir(); + + // Create input stream for log file -- or store file data into memory + + try (InputStream is = new FileInputStream(new File(LOG_NAME))) + { + LogManager.getLogManager().readConfiguration(is); + } + catch (IOException e) + { + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); + } + + // Load Config + Config.load(); + + // Prepare Database + DatabaseFactory.getInstance(); + + try + { + LoginController.load(); + } + catch (GeneralSecurityException e) + { + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + System.exit(1); + } + + GameServerTable.getInstance(); + + loadBanFile(); + + try + { + _gameServerListener = new GameServerListener(); + _gameServerListener.start(); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + } + catch (IOException e) + { + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + System.exit(1); + } + + ClientNetworkManager.getInstance().start(); + } + + public GameServerListener getGameServerListener() + { + return _gameServerListener; + } + + private void loadBanFile() + { + final File bannedFile = new File("./banned_ip.cfg"); + if (bannedFile.exists() && bannedFile.isFile()) + { + try (FileInputStream fis = new FileInputStream(bannedFile); + InputStreamReader is = new InputStreamReader(fis); + LineNumberReader lnr = new LineNumberReader(is)) + { + //@formatter:off + lnr.lines() + .map(String::trim) + .filter(l -> !l.isEmpty() && (l.charAt(0) != '#')) + .forEach(line -> { + String[] parts = line.split("#", 2); // address[ duration][ # comments] + line = parts[0]; + parts = line.split("\\s+"); // durations might be aligned via multiple spaces + final String address = parts[0]; + long duration = 0; + + if (parts.length > 1) + { + try + { + duration = Long.parseLong(parts[1]); + } + catch (NumberFormatException nfe) + { + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + return; + } + } + + try + { + LoginController.getInstance().addBanForAddress(address, duration); + } + catch (UnknownHostException e) + { + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + } + }); + //@formatter:on + } + catch (IOException e) + { + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + } + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + } + else + { + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + } + + if (Config.LOGIN_SERVER_SCHEDULE_RESTART) + { + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + _restartLoginServer = new LoginServerRestart(); + _restartLoginServer.setDaemon(true); + _restartLoginServer.start(); + } + } + + class LoginServerRestart extends Thread + { + public LoginServerRestart() + { + setName("LoginServerRestart"); + } + + @Override + public void run() + { + while (!isInterrupted()) + { + try + { + Thread.sleep(Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME * 3600000); + } + catch (InterruptedException e) + { + return; + } + shutdown(true); + } + } + } + + public void shutdown(boolean restart) + { + Runtime.getRuntime().exit(restart ? 2 : 0); + } +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index 2e22616e3e..77daa06c85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch b/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch index 04a5ba731d..8ea58e3f1a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch +++ b/L2J_Mobius_CT_2.6_HighFive/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/build.xml b/L2J_Mobius_Classic_2.0_Saviors/build.xml index c5dc6a1123..f0f4344de3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/build.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java index bf6d4a9bed..668d75f771 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -80,7 +80,7 @@ public class LoginServerThread extends Thread protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); /** - * @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV + * @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java index 78eadc9019..eef50ffde8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java deleted file mode 100644 index b87afbb356..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.loginserver; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.net.UnknownHostException; -import java.security.GeneralSecurityException; -import java.util.logging.Level; -import java.util.logging.LogManager; -import java.util.logging.Logger; - -import com.l2jmobius.Config; -import com.l2jmobius.Server; -import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.loginserver.network.ClientNetworkManager; - -/** - * @author KenM - */ -public final class L2LoginServer -{ - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); - - public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; - private GameServerListener _gameServerListener; - private Thread _restartLoginServer; - - public static void main(String[] args) throws Exception - { - new L2LoginServer(); - } - - public static L2LoginServer getInstance() - { - return _instance; - } - - private L2LoginServer() throws Exception - { - _instance = this; - Server.serverMode = Server.MODE_LOGINSERVER; - - // Local Constants - final String LOG_FOLDER = "log"; // Name of folder for log file - final String LOG_NAME = "./log.cfg"; // Name of log file - - /*** Main ***/ - // Create log folder - final File logFolder = new File(".", LOG_FOLDER); - logFolder.mkdir(); - - // Create input stream for log file -- or store file data into memory - - try (InputStream is = new FileInputStream(new File(LOG_NAME))) - { - LogManager.getLogManager().readConfiguration(is); - } - catch (IOException e) - { - LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); - } - - // Load Config - Config.load(); - - // Prepare Database - DatabaseFactory.getInstance(); - - try - { - LoginController.load(); - } - catch (GeneralSecurityException e) - { - LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); - System.exit(1); - } - - GameServerTable.getInstance(); - - loadBanFile(); - - try - { - _gameServerListener = new GameServerListener(); - _gameServerListener.start(); - LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); - } - catch (IOException e) - { - LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); - System.exit(1); - } - - ClientNetworkManager.getInstance().start(); - } - - public GameServerListener getGameServerListener() - { - return _gameServerListener; - } - - private void loadBanFile() - { - final File bannedFile = new File("./banned_ip.cfg"); - if (bannedFile.exists() && bannedFile.isFile()) - { - try (FileInputStream fis = new FileInputStream(bannedFile); - InputStreamReader is = new InputStreamReader(fis); - LineNumberReader lnr = new LineNumberReader(is)) - { - //@formatter:off - lnr.lines() - .map(String::trim) - .filter(l -> !l.isEmpty() && (l.charAt(0) != '#')) - .forEach(line -> { - String[] parts = line.split("#", 2); // address[ duration][ # comments] - line = parts[0]; - parts = line.split("\\s+"); // durations might be aligned via multiple spaces - final String address = parts[0]; - long duration = 0; - - if (parts.length > 1) - { - try - { - duration = Long.parseLong(parts[1]); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); - return; - } - } - - try - { - LoginController.getInstance().addBanForAddress(address, duration); - } - catch (UnknownHostException e) - { - LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); - } - }); - //@formatter:on - } - catch (IOException e) - { - LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); - } - LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); - } - else - { - LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); - } - - if (Config.LOGIN_SERVER_SCHEDULE_RESTART) - { - LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); - _restartLoginServer = new LoginServerRestart(); - _restartLoginServer.setDaemon(true); - _restartLoginServer.start(); - } - } - - class LoginServerRestart extends Thread - { - public LoginServerRestart() - { - setName("LoginServerRestart"); - } - - @Override - public void run() - { - while (!isInterrupted()) - { - try - { - Thread.sleep(Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME * 3600000); - } - catch (InterruptedException e) - { - return; - } - shutdown(true); - } - } - } - - public void shutdown(boolean restart) - { - Runtime.getRuntime().exit(restart ? 2 : 0); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginServer.java new file mode 100644 index 0000000000..6b5e1784d9 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginServer.java @@ -0,0 +1,216 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.l2jmobius.loginserver; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +import com.l2jmobius.Config; +import com.l2jmobius.Server; +import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.loginserver.network.ClientNetworkManager; + +/** + * @author KenM + */ +public final class LoginServer +{ + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); + + public static final int PROTOCOL_REV = 0x0106; + private static LoginServer _instance; + private GameServerListener _gameServerListener; + private Thread _restartLoginServer; + + public static void main(String[] args) throws Exception + { + new LoginServer(); + } + + public static LoginServer getInstance() + { + return _instance; + } + + private LoginServer() throws Exception + { + _instance = this; + Server.serverMode = Server.MODE_LOGINSERVER; + + // Local Constants + final String LOG_FOLDER = "log"; // Name of folder for log file + final String LOG_NAME = "./log.cfg"; // Name of log file + + /*** Main ***/ + // Create log folder + final File logFolder = new File(".", LOG_FOLDER); + logFolder.mkdir(); + + // Create input stream for log file -- or store file data into memory + + try (InputStream is = new FileInputStream(new File(LOG_NAME))) + { + LogManager.getLogManager().readConfiguration(is); + } + catch (IOException e) + { + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); + } + + // Load Config + Config.load(); + + // Prepare Database + DatabaseFactory.getInstance(); + + try + { + LoginController.load(); + } + catch (GeneralSecurityException e) + { + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + System.exit(1); + } + + GameServerTable.getInstance(); + + loadBanFile(); + + try + { + _gameServerListener = new GameServerListener(); + _gameServerListener.start(); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + } + catch (IOException e) + { + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + System.exit(1); + } + + ClientNetworkManager.getInstance().start(); + } + + public GameServerListener getGameServerListener() + { + return _gameServerListener; + } + + private void loadBanFile() + { + final File bannedFile = new File("./banned_ip.cfg"); + if (bannedFile.exists() && bannedFile.isFile()) + { + try (FileInputStream fis = new FileInputStream(bannedFile); + InputStreamReader is = new InputStreamReader(fis); + LineNumberReader lnr = new LineNumberReader(is)) + { + //@formatter:off + lnr.lines() + .map(String::trim) + .filter(l -> !l.isEmpty() && (l.charAt(0) != '#')) + .forEach(line -> { + String[] parts = line.split("#", 2); // address[ duration][ # comments] + line = parts[0]; + parts = line.split("\\s+"); // durations might be aligned via multiple spaces + final String address = parts[0]; + long duration = 0; + + if (parts.length > 1) + { + try + { + duration = Long.parseLong(parts[1]); + } + catch (NumberFormatException nfe) + { + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + return; + } + } + + try + { + LoginController.getInstance().addBanForAddress(address, duration); + } + catch (UnknownHostException e) + { + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + } + }); + //@formatter:on + } + catch (IOException e) + { + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + } + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + } + else + { + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + } + + if (Config.LOGIN_SERVER_SCHEDULE_RESTART) + { + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + _restartLoginServer = new LoginServerRestart(); + _restartLoginServer.setDaemon(true); + _restartLoginServer.start(); + } + } + + class LoginServerRestart extends Thread + { + public LoginServerRestart() + { + setName("LoginServerRestart"); + } + + @Override + public void run() + { + while (!isInterrupted()) + { + try + { + Thread.sleep(Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME * 3600000); + } + catch (InterruptedException e) + { + return; + } + shutdown(true); + } + } + } + + public void shutdown(boolean restart) + { + Runtime.getRuntime().exit(restart ? 2 : 0); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index f69027308b..26ec59a6d9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch index 4ec891b090..e3fb75aba3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.0_Saviors/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Zaken/build.xml b/L2J_Mobius_Classic_2.0_Zaken/build.xml index 98a418d572..99660b1fe5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/build.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/build.xml @@ -83,7 +83,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java index bf6d4a9bed..668d75f771 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -80,7 +80,7 @@ public class LoginServerThread extends Thread protected static final Logger ACCOUNTING_LOGGER = Logger.getLogger("accounting"); /** - * @see com.l2jmobius.loginserver.L2LoginServer#PROTOCOL_REV + * @see com.l2jmobius.loginserver.LoginServer#PROTOCOL_REV */ private static final int REVISION = 0x0106; private final String _hostname; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java index 78eadc9019..eef50ffde8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java @@ -139,8 +139,8 @@ public class GameServerThread extends Thread _gsi.setDown(); LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } - L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); - L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); + LoginServer.getInstance().getGameServerListener().removeGameServer(this); + LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java deleted file mode 100644 index b87afbb356..0000000000 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.loginserver; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.net.UnknownHostException; -import java.security.GeneralSecurityException; -import java.util.logging.Level; -import java.util.logging.LogManager; -import java.util.logging.Logger; - -import com.l2jmobius.Config; -import com.l2jmobius.Server; -import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.loginserver.network.ClientNetworkManager; - -/** - * @author KenM - */ -public final class L2LoginServer -{ - private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); - - public static final int PROTOCOL_REV = 0x0106; - private static L2LoginServer _instance; - private GameServerListener _gameServerListener; - private Thread _restartLoginServer; - - public static void main(String[] args) throws Exception - { - new L2LoginServer(); - } - - public static L2LoginServer getInstance() - { - return _instance; - } - - private L2LoginServer() throws Exception - { - _instance = this; - Server.serverMode = Server.MODE_LOGINSERVER; - - // Local Constants - final String LOG_FOLDER = "log"; // Name of folder for log file - final String LOG_NAME = "./log.cfg"; // Name of log file - - /*** Main ***/ - // Create log folder - final File logFolder = new File(".", LOG_FOLDER); - logFolder.mkdir(); - - // Create input stream for log file -- or store file data into memory - - try (InputStream is = new FileInputStream(new File(LOG_NAME))) - { - LogManager.getLogManager().readConfiguration(is); - } - catch (IOException e) - { - LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); - } - - // Load Config - Config.load(); - - // Prepare Database - DatabaseFactory.getInstance(); - - try - { - LoginController.load(); - } - catch (GeneralSecurityException e) - { - LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); - System.exit(1); - } - - GameServerTable.getInstance(); - - loadBanFile(); - - try - { - _gameServerListener = new GameServerListener(); - _gameServerListener.start(); - LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); - } - catch (IOException e) - { - LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); - System.exit(1); - } - - ClientNetworkManager.getInstance().start(); - } - - public GameServerListener getGameServerListener() - { - return _gameServerListener; - } - - private void loadBanFile() - { - final File bannedFile = new File("./banned_ip.cfg"); - if (bannedFile.exists() && bannedFile.isFile()) - { - try (FileInputStream fis = new FileInputStream(bannedFile); - InputStreamReader is = new InputStreamReader(fis); - LineNumberReader lnr = new LineNumberReader(is)) - { - //@formatter:off - lnr.lines() - .map(String::trim) - .filter(l -> !l.isEmpty() && (l.charAt(0) != '#')) - .forEach(line -> { - String[] parts = line.split("#", 2); // address[ duration][ # comments] - line = parts[0]; - parts = line.split("\\s+"); // durations might be aligned via multiple spaces - final String address = parts[0]; - long duration = 0; - - if (parts.length > 1) - { - try - { - duration = Long.parseLong(parts[1]); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); - return; - } - } - - try - { - LoginController.getInstance().addBanForAddress(address, duration); - } - catch (UnknownHostException e) - { - LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); - } - }); - //@formatter:on - } - catch (IOException e) - { - LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); - } - LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); - } - else - { - LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); - } - - if (Config.LOGIN_SERVER_SCHEDULE_RESTART) - { - LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); - _restartLoginServer = new LoginServerRestart(); - _restartLoginServer.setDaemon(true); - _restartLoginServer.start(); - } - } - - class LoginServerRestart extends Thread - { - public LoginServerRestart() - { - setName("LoginServerRestart"); - } - - @Override - public void run() - { - while (!isInterrupted()) - { - try - { - Thread.sleep(Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME * 3600000); - } - catch (InterruptedException e) - { - return; - } - shutdown(true); - } - } - } - - public void shutdown(boolean restart) - { - Runtime.getRuntime().exit(restart ? 2 : 0); - } -} diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginServer.java new file mode 100644 index 0000000000..6b5e1784d9 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginServer.java @@ -0,0 +1,216 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.l2jmobius.loginserver; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +import com.l2jmobius.Config; +import com.l2jmobius.Server; +import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.loginserver.network.ClientNetworkManager; + +/** + * @author KenM + */ +public final class LoginServer +{ + private final Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); + + public static final int PROTOCOL_REV = 0x0106; + private static LoginServer _instance; + private GameServerListener _gameServerListener; + private Thread _restartLoginServer; + + public static void main(String[] args) throws Exception + { + new LoginServer(); + } + + public static LoginServer getInstance() + { + return _instance; + } + + private LoginServer() throws Exception + { + _instance = this; + Server.serverMode = Server.MODE_LOGINSERVER; + + // Local Constants + final String LOG_FOLDER = "log"; // Name of folder for log file + final String LOG_NAME = "./log.cfg"; // Name of log file + + /*** Main ***/ + // Create log folder + final File logFolder = new File(".", LOG_FOLDER); + logFolder.mkdir(); + + // Create input stream for log file -- or store file data into memory + + try (InputStream is = new FileInputStream(new File(LOG_NAME))) + { + LogManager.getLogManager().readConfiguration(is); + } + catch (IOException e) + { + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); + } + + // Load Config + Config.load(); + + // Prepare Database + DatabaseFactory.getInstance(); + + try + { + LoginController.load(); + } + catch (GeneralSecurityException e) + { + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + System.exit(1); + } + + GameServerTable.getInstance(); + + loadBanFile(); + + try + { + _gameServerListener = new GameServerListener(); + _gameServerListener.start(); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + } + catch (IOException e) + { + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + System.exit(1); + } + + ClientNetworkManager.getInstance().start(); + } + + public GameServerListener getGameServerListener() + { + return _gameServerListener; + } + + private void loadBanFile() + { + final File bannedFile = new File("./banned_ip.cfg"); + if (bannedFile.exists() && bannedFile.isFile()) + { + try (FileInputStream fis = new FileInputStream(bannedFile); + InputStreamReader is = new InputStreamReader(fis); + LineNumberReader lnr = new LineNumberReader(is)) + { + //@formatter:off + lnr.lines() + .map(String::trim) + .filter(l -> !l.isEmpty() && (l.charAt(0) != '#')) + .forEach(line -> { + String[] parts = line.split("#", 2); // address[ duration][ # comments] + line = parts[0]; + parts = line.split("\\s+"); // durations might be aligned via multiple spaces + final String address = parts[0]; + long duration = 0; + + if (parts.length > 1) + { + try + { + duration = Long.parseLong(parts[1]); + } + catch (NumberFormatException nfe) + { + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + return; + } + } + + try + { + LoginController.getInstance().addBanForAddress(address, duration); + } + catch (UnknownHostException e) + { + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + } + }); + //@formatter:on + } + catch (IOException e) + { + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + } + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + } + else + { + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + } + + if (Config.LOGIN_SERVER_SCHEDULE_RESTART) + { + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + _restartLoginServer = new LoginServerRestart(); + _restartLoginServer.setDaemon(true); + _restartLoginServer.start(); + } + } + + class LoginServerRestart extends Thread + { + public LoginServerRestart() + { + setName("LoginServerRestart"); + } + + @Override + public void run() + { + while (!isInterrupted()) + { + try + { + Thread.sleep(Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME * 3600000); + } + catch (InterruptedException e) + { + return; + } + shutdown(true); + } + } + } + + public void shutdown(boolean restart) + { + Runtime.getRuntime().exit(restart ? 2 : 0); + } +} diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java index f69027308b..26ec59a6d9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java @@ -17,7 +17,7 @@ package com.l2jmobius.loginserver.network.loginserverpackets; import com.l2jmobius.commons.network.BaseSendablePacket; -import com.l2jmobius.loginserver.L2LoginServer; +import com.l2jmobius.loginserver.LoginServer; /** * @author -Wooden- @@ -33,7 +33,7 @@ public class InitLS extends BaseSendablePacket public InitLS(byte[] publickey) { writeC(0x00); - writeD(L2LoginServer.PROTOCOL_REV); + writeD(LoginServer.PROTOCOL_REV); writeD(publickey.length); writeB(publickey); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/launcher/Loginserver.launch b/L2J_Mobius_Classic_2.0_Zaken/launcher/Loginserver.launch index 87783448c1..c8f63fcea3 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/launcher/Loginserver.launch +++ b/L2J_Mobius_Classic_2.0_Zaken/launcher/Loginserver.launch @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - +