GitLab/Worms2server
1
0
Fork 0
mirror of https://gitlab.com/Syroot/Worms.git synced 2025-04-06 09:29:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename PacketType to PacketFormat.

Browse Source
This commit is contained in:
Ray Koopa 2019-01-06 23:16:13 +01:00
parent 9b663bb72b
commit 83024baaf3
23 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Syroot.Worms.OnlineWorms.Server/Client.cs
View File

@ -2,6 +2,7 @@
using System.Drawing;
using System.Net;
using System.Net.Sockets;
using System.Threading;
using Syroot.Worms.OnlineWorms.Server.Net;
namespace Syroot.Worms.OnlineWorms.Server
@ -189,6 +190,8 @@ namespace Syroot.Worms.OnlineWorms.Server
protected override void OnPrePacketSend(Packet packet)
{
_server.Log.Write(LogCategory.Server, $"{TcpClient.Client.RemoteEndPoint} << {packet}");
if (_server.Config.SendDelay > 0)
Thread.Sleep(_server.Config.SendDelay);
}
}
}

2
src/Syroot.Worms.OnlineWorms.Server/Config.cs
View File

@ -20,6 +20,8 @@ namespace Syroot.Worms.OnlineWorms.Server
public string Region { get; set; }
public ushort Version { get; set; }
public int SendDelay { get; set; }
internal IPAddress IPAddress => IPAddress.Parse(IP);
internal IPEndPoint EndPoint => new IPEndPoint(IPAddress, Port);
}

40
src/Syroot.Worms.OnlineWorms.Server/Net/GameConnection.cs
View File

@ -126,7 +126,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
private Packet ReceivePacket()
{
// Receive the raw packet data.
PacketType type;
PacketFormat type;
int id;
ushort dataSize;
try
@ -135,7 +135,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
ushort tag = _receiveStream.ReadUInt16();
if (tag == _channelPacketStartTag)
{
type = PacketType.Channel;
type = PacketFormat.Channel;
if (_receiveStream.Read1Byte() != 1)
throw new IOException("Invalid channel packet start tag.");
dataSize = _receiveStream.ReadUInt16();
@ -147,7 +147,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
}
else
{
type = PacketType.Server;
type = PacketFormat.Server;
id = tag;
dataSize = _receiveStream.ReadUInt16();
_receiveStream.ReadAll(_receiveBuffer, 0, dataSize);
@ -167,34 +167,40 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
{
OnPrePacketSend(packet);
// Serialize the raw packet data, which must consist of at least 1 byte (at least for channels).
// Serialize the packet data.
_sendStream.Position = 0;
packet.Serialize(_sendStream);
if (_sendStream.Position == 0)
_sendStream.WriteByte(0);
ushort dataSize = (ushort)_sendStream.Position;
ushort dataSize;
// Send the data and return success.
// Send the packet in one of the two possible formats and return success.
try
{
PacketAttribute attribute = PacketFactory.GetAttribute(packet);
switch (attribute.PacketType)
switch (attribute.Format)
{
case PacketType.Channel:
case PacketFormat.Server:
// Retrieve data size.
dataSize = (ushort)_sendStream.Position;
// Send head and data.
_receiveStream.WriteUInt16((ushort)attribute.ID);
_receiveStream.WriteUInt16(dataSize);
_receiveStream.Write(_sendDataBuffer, 0, dataSize);
break;
case PacketFormat.Channel:
// Retrieve data size. Data must have at least 1 byte.
if (_sendStream.Position == 0)
_sendStream.WriteByte(0);
dataSize = (ushort)_sendStream.Position;
// Send head, data, and tail.
_receiveStream.WriteUInt16(_channelPacketStartTag);
_receiveStream.WriteByte(1);
_receiveStream.WriteUInt16(dataSize);
_receiveStream.WriteByte((byte)attribute.PacketID);
_receiveStream.WriteByte((byte)attribute.ID);
_receiveStream.Write(_sendDataBuffer, 0, dataSize);
_receiveStream.Write(_channelPacketEndTag);
break;
case PacketType.Server:
_receiveStream.WriteUInt16((ushort)attribute.PacketID);
_receiveStream.WriteUInt16(dataSize);
_receiveStream.Write(_sendDataBuffer, 0, dataSize);
break;
default:
throw new IOException("Cannot send unknown packet type.");
throw new IOException("Cannot send unknown packet format.");
}
return true;
}

72
src/Syroot.Worms.OnlineWorms.Server/Net/Packet.cs
View File

@ -41,14 +41,10 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
switch (obj)
{
case null:
sb.Append(indent);
sb.Append("null");
sb.Append($"{indent}null");
break;
case String stringValue:
sb.Append(indent);
sb.Append('"');
sb.Append(stringValue);
sb.Append('"');
sb.Append($"{indent}\"{stringValue}\"");
break;
case Byte[] byteArrayValue:
sb.Append(indent);
@ -62,62 +58,50 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
sb.Append("]");
break;
case Byte byteValue:
sb.Append(indent);
sb.Append("0x" + byteValue.ToString("X2"));
sb.Append($"{indent}0x{byteValue:X2}");
break;
case Int16 int16Value:
sb.Append(indent);
sb.Append("0x" + int16Value.ToString("X4"));
sb.Append($"{indent}0x{int16Value:X4}");
break;
case Int32 int32Value:
sb.Append(indent);
sb.Append("0x" + int32Value.ToString("X8"));
sb.Append($"{indent}0x{int32Value:X8}");
break;
case Int64 int64Value:
sb.Append(indent);
sb.Append("0x" + int64Value.ToString("X16"));
sb.Append($"{indent}0x{int64Value:X16}");
break;
case UInt16 uint16Value:
sb.Append(indent);
sb.Append("0x" + uint16Value.ToString("X4"));
sb.Append($"{indent}0x{uint16Value:X4}");
break;
case UInt32 uint32Value:
sb.Append(indent);
sb.Append("0x" + uint32Value.ToString("X8"));
sb.Append($"{indent}0x{uint32Value:X8}");
break;
case UInt64 uint64Value:
sb.Append(indent);
sb.Append("0x" + uint64Value.ToString("X16"));
break;
case Enum enumValue:
sb.Append(indent);
sb.Append(enumValue.ToString());
break;
case Color color:
sb.Append(indent);
sb.Append(color.ToString());
sb.Append($"{indent}0x{uint64Value:X16}");
break;
case IPEndPoint ipEndPoint:
sb.Append(indent);
sb.Append($"{ipEndPoint.Address}:{ipEndPoint.Port}");
break;
case IPAddress ipAddress:
sb.Append(indent);
sb.Append(ipAddress.ToString());
sb.Append($"{indent}{ipEndPoint.Address}:{ipEndPoint.Port}");
break;
default:
foreach (PropertyInfo property in obj.GetType().GetProperties(
BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public))
Type objType = obj.GetType();
if (objType == typeof(Boolean) || objType.IsEnum || objType == typeof(Color)
|| objType == typeof(IPAddress))
{
// Ignore indexers.
if (property.GetIndexParameters().Length > 0)
continue;
sb.AppendLine();
sb.Append((indent + property.Name).PadRight(20));
sb.Append(" ");
sb.Append(DumpClass(property.GetValue(obj), indentLevel + 1));
sb.Append($"{indent}{obj}");
}
else
{
foreach (PropertyInfo property in objType.GetProperties(
BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public))
{
if (property.GetIndexParameters().Length > 0)
continue;
sb.AppendLine();
sb.Append((indent + property.Name).PadRight(20));
sb.Append(" ");
sb.Append(DumpClass(property.GetValue(obj), indentLevel + 1));
}
sb.AppendLine();
}
sb.AppendLine();
break;
}
return sb.ToString().TrimEnd();

15
src/Syroot.Worms.OnlineWorms.Server/Net/PacketAttribute.cs
View File

@ -15,10 +15,10 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// packet it represents.
/// </summary>
/// <param name="id">The ID of the packet which the decorated class represents.</param>
public PacketAttribute(PacketType type, int id)
public PacketAttribute(PacketFormat format, int id)
{
PacketType = type;
PacketID = id;
Format = format;
ID = id;
}
// ---- PROPERTIES ---------------------------------------------------------------------------------------------
@ -26,12 +26,15 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Gets the ID of the packet the decorated class represents.
/// </summary>
public int PacketID { get; }
public int ID { get; }
public PacketType PacketType { get; }
/// <summary>
/// Gets the format in which the packet is serialized and sent over the network.
/// </summary>
public PacketFormat Format { get; }
}
internal enum PacketType
internal enum PacketFormat
{
Server,
Channel

6
src/Syroot.Worms.OnlineWorms.Server/Net/PacketFactory.cs
View File

@ -26,7 +26,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
if (_packetMetas.ContainsKey(attrib))
{
throw new InvalidOperationException(
$"{attrib.PacketType} packet with ID {attrib.PacketID} mapped to multiple classes.");
$"{attrib.Format} packet with ID {attrib.ID} mapped to multiple classes.");
}
_packetMetas.Add(attrib, type);
}
@ -41,11 +41,11 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <param name="id">The ID of the packet class to instantiate.</param>
/// <returns>The created <see cref="Packet"/> instance.</returns>
/// <exception cref="KeyNotFoundException">No class was mapped to the given packet ID.</exception>
internal static Packet Create(PacketType type, int id)
internal static Packet Create(PacketFormat type, int id)
{
foreach (KeyValuePair<PacketAttribute, Type> packetMeta in _packetMetas)
{
if (packetMeta.Key.PacketType == type && packetMeta.Key.PacketID == id)
if (packetMeta.Key.Format == type && packetMeta.Key.ID == id)
return (Packet)Activator.CreateInstance(packetMeta.Value, true);
}
// No packet metadata matching.

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelConnectQuery.cs
View File

@ -8,7 +8,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the client request for a <see cref="ChannelConnectReply"/>.
/// </summary>
[Packet(PacketType.Channel, 0x10)]
[Packet(PacketFormat.Channel, 0x10)]
internal class ChannelConnectQuery : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelConnectReply.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the server response to a <see cref="ChannelConnectQuery"/>.
/// </summary>
[Packet(PacketType.Channel, 0x11)]
[Packet(PacketFormat.Channel, 0x11)]
internal class ChannelConnectReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterFinishReply.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// Represents an additional server response to a <see cref="ChannelTop20Query"/>, causing the client to switch
/// to the channel screen (game lobby).
/// </summary>
[Packet(PacketType.Channel, 0x44)]
[Packet(PacketFormat.Channel, 0x44)]
internal class ChannelEnterFinishReply : Packet
{
// ---- METHODS (INTERNAL) -------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterQuery.cs
View File

@ -7,7 +7,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the client request for a <see cref="ChannelEnterReply"/>.
/// </summary>
[Packet(PacketType.Server, 0x8034)]
[Packet(PacketFormat.Server, 0x8034)]
internal class ChannelEnterQuery : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterReply.cs
View File

@ -7,7 +7,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the server response to a <see cref="ChannelEnterQuery"/>.
/// </summary>
[Packet(PacketType.Server, 0x8035)]
[Packet(PacketFormat.Server, 0x8035)]
internal class ChannelEnterReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelInfosReply.cs
View File

@ -9,7 +9,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents an additional server response to a <see cref="LoginQuery"/>, providing available server channels.
/// </summary>
[Packet(PacketType.Server, 0x80C9)]
[Packet(PacketFormat.Server, 0x80C9)]
internal class ChannelInfosReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Query.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the client request for a <see cref="ChannelConnectReply"/>.
/// </summary>
[Packet(PacketType.Channel, 0x37)]
[Packet(PacketFormat.Channel, 0x37)]
internal class ChannelTop20Query : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Reply.cs
View File

@ -7,7 +7,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the server response to a <see cref="ChannelTop20Query"/>.
/// </summary>
[Packet(PacketType.Channel, 0x36)]
[Packet(PacketFormat.Channel, 0x36)]
internal class ChannelTop20Reply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQuery.cs
View File

@ -5,7 +5,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the client request for a <see cref="ConnectReply"/>.
/// </summary>
[Packet(PacketType.Server, 0x800E)]
[Packet(PacketFormat.Server, 0x800E)]
internal class ConnectQuery : Packet
{
// ---- METHODS (INTERNAL) -------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReply.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the server response to a <see cref="ConnectQuery"/>.
/// </summary>
[Packet(PacketType.Server, 0x800F)]
[Packet(PacketFormat.Server, 0x800F)]
internal class ConnectReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQuery.cs
View File

@ -7,7 +7,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the client request for a <see cref="LoginReply"/>.
/// </summary>
[Packet(PacketType.Server, 0x8000)]
[Packet(PacketFormat.Server, 0x8000)]
internal class LoginQuery : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReply.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the server response to a <see cref="LoginQuery"/>.
/// </summary>
[Packet(PacketType.Server, 0x8001)]
[Packet(PacketFormat.Server, 0x8001)]
internal class LoginReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

4
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQuery.cs
View File

@ -10,7 +10,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
{
// ---- CONSTRUCTORS & DESTRUCTOR ------------------------------------------------------------------------------
internal RawPacket(PacketType type, int id, params byte[] data)
internal RawPacket(PacketFormat type, int id, params byte[] data)
{
Type = type;
ID = id;
@ -19,7 +19,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
// ---- PROPERTIES ---------------------------------------------------------------------------------------------
internal PacketType Type { get; }
internal PacketFormat Type { get; }
internal int ID { get; }

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReply.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// Represents an additional server response to a <see cref="LoginQuery"/>, providing informational server
/// screen text.
/// </summary>
[Packet(PacketType.Server, 0x8033)]
[Packet(PacketFormat.Server, 0x8033)]
internal class ServerInfoReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/StartSingleGameQuery.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the client request for a <see cref="StartSingleGameReply"/>.
/// </summary>
[Packet(PacketType.Channel, 0x38)]
[Packet(PacketFormat.Channel, 0x38)]
internal class StartSingleGameQuery : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

2
src/Syroot.Worms.OnlineWorms.Server/Net/Packets/StartSingleGameReply.cs
View File

@ -6,7 +6,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
/// <summary>
/// Represents the server response to a <see cref="StartSingleGameQuery"/>.
/// </summary>
[Packet(PacketType.Channel, 0x39)]
[Packet(PacketFormat.Channel, 0x39)]
internal class StartSingleGameReply : Packet
{
// ---- PROPERTIES ---------------------------------------------------------------------------------------------

6
src/Syroot.Worms.OnlineWorms.Server/OWServerConfig.json
View File

@ -1,7 +1,11 @@
{
// Server settings
"IP": "127.0.0.1", // external IP sent to clients to connect to
"Port": 17022,
"Name": "Online Worms Private Server",
"Region": "Global",
"Version": 114
"Version": 114,
// Debugging settings (optional)
"SendDelay": 100 // milliseconds to sleep before sending packets (simulate network load)
}