warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add crash report packet handler

Browse source 
begin packet processing parallelization
This commit is contained in:
Mark Sturgill 2013-10-07 15:27:16 -07:00
parent 7b6cf66b87
commit a0bafa9bf7
2 changed files with 120 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

187
Server/Network/MessagePump.cs
View file

@ -37,7 +37,6 @@ namespace Server.Network
private Queue<NetState> m_Queue; private Queue<NetState> m_Queue;
private Queue<NetState> m_WorkingQueue; private Queue<NetState> m_WorkingQueue;
private Queue<NetState> m_Throttled; private Queue<NetState> m_Throttled;
private byte[] m_Peek;
public MessagePump() public MessagePump()
{ {
@ -64,7 +63,6 @@ namespace Server.Network
m_Queue = new Queue<NetState>(); m_Queue = new Queue<NetState>();
m_WorkingQueue = new Queue<NetState>(); m_WorkingQueue = new Queue<NetState>();
m_Throttled = new Queue<NetState>(); m_Throttled = new Queue<NetState>();
m_Peek = new byte[4];
} }
public Listener[] Listeners public Listener[] Listeners
@ -139,151 +137,136 @@ namespace Server.Network
private const int BufferSize = 4096; private const int BufferSize = 4096;
private BufferPool m_Buffers = new BufferPool( "Processor", 4, BufferSize ); private BufferPool m_Buffers = new BufferPool( "Processor", 4, BufferSize );
public bool HandleReceive( NetState ns ) private bool HandleSeed(NetState ns, ByteQueue buffer) {
if (buffer.GetPacketID() == 0xEF) {
// new packet in client 6.0.5.0 replaces the traditional seed method with a seed packet
// 0xEF = 239 = multicast IP, so this should never appear in a normal seed. So this is backwards compatible with older clients.
ns.Seeded = true;
return true;
} else if (buffer.Length >= 4) {
byte[] m_Peek = new byte[4];
buffer.Dequeue(m_Peek, 0, 4);
int seed = (m_Peek[0] << 24) | (m_Peek[1] << 16) | (m_Peek[2] << 8) | m_Peek[3];
if (seed == 0) {
Console.WriteLine("Login: {0}: Invalid client detected, disconnecting", ns);
ns.Dispose();
return false;
}
ns.m_Seed = seed;
ns.Seeded = true;
return true;
} else {
return false;
}
}
private bool CheckEncrypted(NetState ns, int packetID) {
if (!ns.SentFirstPacket && packetID != 0xF0 && packetID != 0xF1 && packetID != 0xCF && packetID != 0x80 && packetID != 0x91 && packetID != 0xA4 && packetID != 0xEF) {
Console.WriteLine("Client: {0}: Encrypted client detected, disconnecting", ns);
ns.Dispose();
return true;
}
return false;
}
public void HandleReceive( NetState ns )
{ {
ByteQueue buffer = ns.Buffer; ByteQueue buffer = ns.Buffer;
if ( buffer == null || buffer.Length <= 0 ) if ( buffer == null || buffer.Length <= 0 )
return true; return;
lock ( buffer ) lock ( buffer )
{ {
int length = buffer.Length; if ( !ns.Seeded ) {
if (!HandleSeed(ns, buffer))
if ( !ns.Seeded ) return;
{
if ( buffer.GetPacketID() == 0xEF )
{
// new packet in client 6.0.5.0 replaces the traditional seed method with a seed packet
// 0xEF = 239 = multicast IP, so this should never appear in a normal seed. So this is backwards compatible with older clients.
ns.Seeded = true;
}
else if ( buffer.Length >= 4 )
{
buffer.Dequeue( m_Peek, 0, 4 );
int seed = (m_Peek[0] << 24) | (m_Peek[1] << 16) | (m_Peek[2] << 8) | m_Peek[3];
if ( seed == 0 )
{
Console.WriteLine( "Login: {0}: Invalid client detected, disconnecting", ns );
ns.Dispose();
return false;
}
ns.m_Seed = seed;
ns.Seeded = true;
length = buffer.Length;
}
else
{
return true;
}
} }
while ( length > 0 && ns.Running ) int length = buffer.Length;
{
while ( length > 0 && ns.Running ) {
int packetID = buffer.GetPacketID(); int packetID = buffer.GetPacketID();
if ( !ns.SentFirstPacket && packetID != 0xF0 && packetID != 0xF1 && packetID != 0xCF && packetID != 0x80 && packetID != 0x91 && packetID != 0xA4 && packetID != 0xEF ) if (CheckEncrypted(ns, packetID))
{
Console.WriteLine( "Client: {0}: Encrypted client detected, disconnecting", ns );
ns.Dispose();
break; break;
}
PacketHandler handler = ns.GetHandler( packetID ); PacketHandler handler = ns.GetHandler( packetID );
if ( handler == null ) if ( handler == null ) {
{
byte[] data = new byte[length]; byte[] data = new byte[length];
length = buffer.Dequeue( data, 0, length ); length = buffer.Dequeue( data, 0, length );
new PacketReader( data, length, false ).Trace( ns ); new PacketReader( data, length, false ).Trace( ns );
break; break;
} }
int packetLength = handler.Length; int packetLength = handler.Length;
if ( packetLength <= 0 ) if ( packetLength <= 0 ) {
{ if ( length >= 3 ) {
if ( length >= 3 )
{
packetLength = buffer.GetPacketLength(); packetLength = buffer.GetPacketLength();
if ( packetLength < 3 ) if ( packetLength < 3 ) {
{
ns.Dispose(); ns.Dispose();
break; break;
} }
} } else {
else
{
break; break;
} }
} }
if ( length >= packetLength ) if ( length >= packetLength ) {
{ if ( handler.Ingame && ns.Mobile == null ) {
if ( handler.Ingame && ns.Mobile == null )
{
Console.WriteLine( "Client: {0}: Sent ingame packet (0x{1:X2}) before having been attached to a mobile", ns, packetID ); Console.WriteLine( "Client: {0}: Sent ingame packet (0x{1:X2}) before having been attached to a mobile", ns, packetID );
ns.Dispose(); ns.Dispose();
break; break;
} } else if ( handler.Ingame && ns.Mobile.Deleted ) {
else if ( handler.Ingame && ns.Mobile.Deleted )
{
ns.Dispose(); ns.Dispose();
break; break;
} }
else
{
ThrottlePacketCallback throttler = handler.ThrottleCallback;
if ( throttler != null && !throttler( ns ) ) ThrottlePacketCallback throttler = handler.ThrottleCallback;
{
m_Throttled.Enqueue( ns );
return false;
}
PacketReceiveProfile prof = PacketReceiveProfile.Acquire( packetID ); if ( throttler != null && !throttler( ns ) ) {
m_Throttled.Enqueue( ns );
if ( prof != null ) { return;
prof.Start();
}
byte[] packetBuffer;
if ( BufferSize >= packetLength )
packetBuffer = m_Buffers.AcquireBuffer();
else
packetBuffer = new byte[packetLength];
packetLength = buffer.Dequeue( packetBuffer, 0, packetLength );
PacketReader r = new PacketReader( packetBuffer, packetLength, handler.Length != 0 );
handler.OnReceive( ns, r );
length = buffer.Length;
if ( BufferSize >= packetLength )
m_Buffers.ReleaseBuffer( packetBuffer );
if ( prof != null ) {
prof.Finish( packetLength );
}
} }
}
else PacketReceiveProfile prof = PacketReceiveProfile.Acquire( packetID );
{
if ( prof != null ) {
prof.Start();
}
byte[] packetBuffer;
if ( BufferSize >= packetLength )
packetBuffer = m_Buffers.AcquireBuffer();
else
packetBuffer = new byte[packetLength];
packetLength = buffer.Dequeue( packetBuffer, 0, packetLength );
PacketReader r = new PacketReader( packetBuffer, packetLength, handler.Length != 0 );
handler.OnReceive( ns, r );
length = buffer.Length;
if ( BufferSize >= packetLength )
m_Buffers.ReleaseBuffer( packetBuffer );
if ( prof != null ) {
prof.Finish( packetLength );
}
} else {
break; break;
} }
} }
} }
return true;
} }
} }
} }

36
Server/Network/PacketHandlers.cs
View file

@ -149,6 +149,7 @@ namespace Server.Network
Register( 0xD7, 0, true, new OnPacketReceive( EncodedCommand ) ); Register( 0xD7, 0, true, new OnPacketReceive( EncodedCommand ) );
Register( 0xE1, 0, false, new OnPacketReceive( ClientType ) ); Register( 0xE1, 0, false, new OnPacketReceive( ClientType ) );
Register( 0xEF, 21, false, new OnPacketReceive( LoginServerSeed ) ); Register( 0xEF, 21, false, new OnPacketReceive( LoginServerSeed ) );
Register( 0xF4, 0, false, new OnPacketReceive( CrashReport ) );
Register( 0xF8, 106, false, new OnPacketReceive( CreateCharacter70160 ) ); Register( 0xF8, 106, false, new OnPacketReceive( CreateCharacter70160 ) );
Register6017( 0x08, 15, true, new OnPacketReceive( DropReq6017 ) ); Register6017( 0x08, 15, true, new OnPacketReceive( DropReq6017 ) );
@ -2566,7 +2567,40 @@ namespace Server.Network
state.Version = new ClientVersion( clientMaj, clientMin, clientRev, clientPat ); state.Version = new ClientVersion( clientMaj, clientMin, clientRev, clientPat );
} }
public static void AccountLogin( NetState state, PacketReader pvSrc ) public static void CrashReport(NetState state, PacketReader pvSrc)
{
byte clientMaj = pvSrc.ReadByte();
byte clientMin = pvSrc.ReadByte();
byte clientRev = pvSrc.ReadByte();
byte clientPat = pvSrc.ReadByte();
ushort x = pvSrc.ReadUInt16();
ushort y = pvSrc.ReadUInt16();
sbyte z = pvSrc.ReadSByte();
byte map = pvSrc.ReadByte();
string account = pvSrc.ReadString(32);
string character = pvSrc.ReadString(32);
string ip = pvSrc.ReadString(15);
int unk1 = pvSrc.ReadInt32();
int exception = pvSrc.ReadInt32();
string process = pvSrc.ReadString(100);
string report = pvSrc.ReadString(100);
pvSrc.ReadByte(); // 0x00
int offset = pvSrc.ReadInt32();
int count = (int)pvSrc.ReadByte();
for (int i = 0; i < count; i++) {
int address = pvSrc.ReadInt32();
}
}
public static void AccountLogin(NetState state, PacketReader pvSrc)
{ {
if ( state.SentFirstPacket ) if ( state.SentFirstPacket )
{ {