zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-08 05:24:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed an error in the netcode that would cause the client to d/c on partial packets. Set buffer size to 0xFFFF due to disconnect on really large packets (ie gm packet). Implemented support ticket packets.

Browse source
This commit is contained in:
Filip Maj 2016-02-16 22:53:53 -05:00
parent cb4171f1fd
commit c6ac8b2f14
8 changed files with 131 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

76
FFXIVClassic Map Server/Server.cs
View file

@ -23,7 +23,7 @@ namespace FFXIVClassic_Lobby_Server
class Server
{
public const int FFXIV_MAP_PORT = 54992;
public const int BUFFER_SIZE = 0x400;
public const int BUFFER_SIZE = 0xFFFF; //Max basepacket size is 0xFFFF
public const int BACKLOG = 100;
public const string STATIC_ACTORS_PATH = "./staticactors.bin";
@ -163,12 +163,29 @@ namespace FFXIVClassic_Lobby_Server
/// <param name="result"></param>
private void receiveCallback(IAsyncResult result)
{
ClientConnection conn = (ClientConnection)result.AsyncState;
ClientConnection conn = (ClientConnection)result.AsyncState;
//Check if disconnected
if ((conn.socket.Poll(1, SelectMode.SelectRead) && conn.socket.Available == 0))
{
if (mConnectedPlayerList.ContainsKey(conn.owner))
mConnectedPlayerList.Remove(conn.owner);
lock (mConnectionList)
{
mConnectionList.Remove(conn);
}
if (conn.connType == BasePacket.TYPE_ZONE)
Log.conn(String.Format("{0} has disconnected.", conn.owner == 0 ? conn.getAddress() : "User " + conn.owner));
return;
}
try
{
int bytesRead = conn.socket.EndReceive(result);
if (bytesRead > 0)
bytesRead += conn.lastPartialSize;
if (bytesRead >= 0)
{
int offset = 0;
@ -176,6 +193,7 @@ namespace FFXIVClassic_Lobby_Server
while(true)
{
BasePacket basePacket = buildPacket(ref offset, conn.buffer, bytesRead);
//If can't build packet, break, else process another
if (basePacket == null)
break;
@ -184,9 +202,13 @@ namespace FFXIVClassic_Lobby_Server
}
//Not all bytes consumed, transfer leftover to beginning
if (offset < bytesRead)
if (offset < bytesRead)
Array.Copy(conn.buffer, offset, conn.buffer, 0, bytesRead - offset);
Array.Clear(conn.buffer, bytesRead - offset, conn.buffer.Length - (bytesRead - offset));
conn.lastPartialSize = bytesRead - offset;
//Build any queued subpackets into basepackets and send
conn.flushQueuedSendPackets();
@ -424,6 +446,27 @@ namespace FFXIVClassic_Lobby_Server
}
}
private void giveItem(ConnectedPlayer client, uint itemId, int quantity, ushort type)
{
if (client != null)
{
Player p = client.getActor();
if (p.inventories.ContainsKey(type))
p.inventories[type].addItem(itemId, quantity, 1);
}
else
{
foreach (KeyValuePair<uint, ConnectedPlayer> entry in mConnectedPlayerList)
{
Player p = entry.Value.getActor();
if (p.inventories.ContainsKey(type))
p.inventories[type].addItem(itemId, quantity, 1);
}
}
}
private void removeItem(ConnectedPlayer client, uint itemId, int quantity)
{
if (client != null)
@ -441,6 +484,27 @@ namespace FFXIVClassic_Lobby_Server
}
}
private void removeItem(ConnectedPlayer client, uint itemId, int quantity, ushort type)
{
if (client != null)
{
Player p = client.getActor();
if (p.inventories.ContainsKey(type))
p.inventories[type].removeItem(itemId, quantity);
}
else
{
foreach (KeyValuePair<uint, ConnectedPlayer> entry in mConnectedPlayerList)
{
Player p = entry.Value.getActor();
if (p.inventories.ContainsKey(type))
p.inventories[type].removeItem(itemId, quantity);
}
}
}
private void giveCurrancy(ConnectedPlayer client, uint itemId, int quantity)
{
if (client != null)
@ -562,6 +626,8 @@ namespace FFXIVClassic_Lobby_Server
giveItem(client, UInt32.Parse(split[1]), 1);
else if (split.Length == 3)
giveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]));
else if (split.Length == 4)
giveItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]), UInt16.Parse(split[3]));
}
catch (Exception e)
{
@ -579,6 +645,8 @@ namespace FFXIVClassic_Lobby_Server
removeItem(client, UInt32.Parse(split[1]), 1);
else if (split.Length == 3)
removeItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]));
else if (split.Length == 4)
removeItem(client, UInt32.Parse(split[1]), Int32.Parse(split[2]), UInt16.Parse(split[3]));
}
catch (Exception e)
{