lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved mmocore in loginserver.

Browse Source
This commit is contained in:
MobiusDev 2016-07-27 09:22:33 +00:00
parent 81bee84981
commit 6da87b6aa4
20 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jmobius/loginserver/L2LoginServer.java
View File

@ -32,11 +32,11 @@ import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.Server;
import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.commons.mmocore.SelectorConfig;
import com.l2jmobius.commons.mmocore.SelectorThread;
import com.l2jmobius.loginserver.mail.MailSystem;
import com.l2jmobius.loginserver.network.L2LoginClient;
import com.l2jmobius.loginserver.network.L2LoginPacketHandler;
import com.l2jmobius.loginserver.network.mmocore.SelectorConfig;
import com.l2jmobius.loginserver.network.mmocore.SelectorThread;
/**
* @author KenM

12
trunk/java/com/l2jmobius/loginserver/SelectorHelper.java
View File

@ -21,14 +21,14 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import com.l2jmobius.commons.mmocore.IAcceptFilter;
import com.l2jmobius.commons.mmocore.IClientFactory;
import com.l2jmobius.commons.mmocore.IMMOExecutor;
import com.l2jmobius.commons.mmocore.MMOConnection;
import com.l2jmobius.commons.mmocore.ReceivablePacket;
import com.l2jmobius.commons.util.IPv4Filter;
import com.l2jmobius.loginserver.network.L2LoginClient;
import com.l2jmobius.loginserver.network.mmocore.IAcceptFilter;
import com.l2jmobius.loginserver.network.mmocore.IClientFactory;
import com.l2jmobius.loginserver.network.mmocore.IMMOExecutor;
import com.l2jmobius.loginserver.network.mmocore.MMOConnection;
import com.l2jmobius.loginserver.network.mmocore.ReceivablePacket;
import com.l2jmobius.loginserver.network.serverpackets.Init;
import com.l2jmobius.loginserver.network.util.IPv4Filter;
/**
* @author KenM

6
trunk/java/com/l2jmobius/loginserver/network/L2LoginClient.java
View File

@ -25,14 +25,14 @@ import java.util.Map;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.mmocore.MMOClient;
import com.l2jmobius.commons.mmocore.MMOConnection;
import com.l2jmobius.commons.mmocore.SendablePacket;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.commons.util.crypt.LoginCrypt;
import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
import com.l2jmobius.loginserver.LoginController;
import com.l2jmobius.loginserver.SessionKey;
import com.l2jmobius.loginserver.network.mmocore.MMOClient;
import com.l2jmobius.loginserver.network.mmocore.MMOConnection;
import com.l2jmobius.loginserver.network.mmocore.SendablePacket;
import com.l2jmobius.loginserver.network.serverpackets.L2LoginServerPacket;
import com.l2jmobius.loginserver.network.serverpackets.LoginFail;
import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason;

20
trunk/java/com/l2jmobius/loginserver/network/L2LoginPacketHandler.java
View File

@ -19,8 +19,6 @@ package com.l2jmobius.loginserver.network;
import java.nio.ByteBuffer;
import java.util.logging.Logger;
import com.l2jmobius.commons.mmocore.IPacketHandler;
import com.l2jmobius.commons.mmocore.ReceivablePacket;
import com.l2jmobius.loginserver.network.L2LoginClient.LoginClientState;
import com.l2jmobius.loginserver.network.clientpackets.AuthGameGuard;
import com.l2jmobius.loginserver.network.clientpackets.RequestAuthLogin;
@ -28,6 +26,8 @@ import com.l2jmobius.loginserver.network.clientpackets.RequestPIAgreement;
import com.l2jmobius.loginserver.network.clientpackets.RequestPIAgreementCheck;
import com.l2jmobius.loginserver.network.clientpackets.RequestServerList;
import com.l2jmobius.loginserver.network.clientpackets.RequestServerLogin;
import com.l2jmobius.loginserver.network.mmocore.IPacketHandler;
import com.l2jmobius.loginserver.network.mmocore.ReceivablePacket;
/**
* Handler for packets received by Login Server
@ -48,6 +48,7 @@ public final class L2LoginPacketHandler implements IPacketHandler<L2LoginClient>
switch (state)
{
case CONNECTED:
{
switch (opcode)
{
case 0x07:
@ -58,7 +59,9 @@ public final class L2LoginPacketHandler implements IPacketHandler<L2LoginClient>
break;
}
break;
}
case AUTHED_GG:
{
switch (opcode)
{
case 0x00:
@ -69,26 +72,39 @@ public final class L2LoginPacketHandler implements IPacketHandler<L2LoginClient>
break;
}
break;
}
case AUTHED_LOGIN:
{
switch (opcode)
{
case 0x02:
{
packet = new RequestServerLogin();
break;
}
case 0x05:
{
packet = new RequestServerList();
break;
}
case 0x0E:
{
packet = new RequestPIAgreementCheck(); // TODO: Verify names
break;
}
case 0x0F:
{
packet = new RequestPIAgreement();
break;
}
default:
{
debugOpcode(opcode, state);
break;
}
}
break;
}
}
return packet;
}

2
trunk/java/com/l2jmobius/loginserver/network/clientpackets/L2LoginClientPacket.java
View File

@ -19,8 +19,8 @@ package com.l2jmobius.loginserver.network.clientpackets;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jmobius.commons.mmocore.ReceivablePacket;
import com.l2jmobius.loginserver.network.L2LoginClient;
import com.l2jmobius.loginserver.network.mmocore.ReceivablePacket;
/**
* @author KenM

2
trunk/java/com/l2jmobius/commons/mmocore/AbstractPacket.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/AbstractPacket.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.nio.ByteBuffer;

2
trunk/java/com/l2jmobius/commons/mmocore/IAcceptFilter.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/IAcceptFilter.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.nio.channels.SocketChannel;

2
trunk/java/com/l2jmobius/commons/mmocore/IClientFactory.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/IClientFactory.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
/**
* @author KenM

2
trunk/java/com/l2jmobius/commons/mmocore/IMMOExecutor.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/IMMOExecutor.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
/**
* @author KenM

2
trunk/java/com/l2jmobius/commons/mmocore/IPacketHandler.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/IPacketHandler.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.nio.ByteBuffer;

2
trunk/java/com/l2jmobius/commons/mmocore/MMOClient.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/MMOClient.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.nio.ByteBuffer;

2
trunk/java/com/l2jmobius/commons/mmocore/MMOConnection.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/MMOConnection.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.io.IOException;
import java.net.InetAddress;

2
trunk/java/com/l2jmobius/commons/mmocore/NioNetStackList.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/NioNetStackList.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
/**
* @author Forsaiken

2
trunk/java/com/l2jmobius/commons/mmocore/NioNetStringBuffer.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/NioNetStringBuffer.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.nio.BufferOverflowException;

2
trunk/java/com/l2jmobius/commons/mmocore/ReceivablePacket.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/ReceivablePacket.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.nio.ByteBuffer;

2
trunk/java/com/l2jmobius/commons/mmocore/SelectorConfig.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/SelectorConfig.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
/**
* @author KenM

2
trunk/java/com/l2jmobius/commons/mmocore/SelectorThread.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/SelectorThread.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
import java.io.IOException;
import java.net.InetAddress;

2
trunk/java/com/l2jmobius/commons/mmocore/SendablePacket.java → trunk/java/com/l2jmobius/loginserver/network/mmocore/SendablePacket.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.mmocore;
package com.l2jmobius.loginserver.network.mmocore;
/**
* @author KenM

2
trunk/java/com/l2jmobius/loginserver/network/serverpackets/L2LoginServerPacket.java
View File

@ -16,8 +16,8 @@
*/
package com.l2jmobius.loginserver.network.serverpackets;
import com.l2jmobius.commons.mmocore.SendablePacket;
import com.l2jmobius.loginserver.network.L2LoginClient;
import com.l2jmobius.loginserver.network.mmocore.SendablePacket;
/**
* @author KenM

4
trunk/java/com/l2jmobius/commons/util/IPv4Filter.java → trunk/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.commons.util;
package com.l2jmobius.loginserver.network.util;
import java.net.Inet4Address;
import java.net.InetAddress;
@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Map.Entry;
import java.util.logging.Logger;
import com.l2jmobius.commons.mmocore.IAcceptFilter;
import com.l2jmobius.loginserver.network.mmocore.IAcceptFilter;
/**
* IPv4 filter.