GitLab/Worms2server
1
0
Fork 0
mirror of https://gitlab.com/Syroot/Worms.git synced 2025-05-25 12:58:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix channel packet format.

Browse Source
This commit is contained in:
Ray Koopa 2019-01-04 03:38:46 +01:00
parent 7e801057ac
commit b61f190df6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,10 @@ namespace Syroot.Worms.OnlineWorms.Server
public void HandleChannelConnect(ChannelConnectQuery packet) public void HandleChannelConnect(ChannelConnectQuery packet)
{ {
SendPacket(new RawPacket(PacketType.Channel, 0x11)
{
Data = new byte[] { 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF }
});
} }
#if DEBUG #if DEBUG

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

@ -140,8 +140,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
throw new IOException("Invalid channel packet start tag."); throw new IOException("Invalid channel packet start tag.");
dataSize = _receiveStream.ReadUInt16(); dataSize = _receiveStream.ReadUInt16();
id = _receiveStream.Read1Byte(); id = _receiveStream.Read1Byte();
_receiveStream.ReadAll(_receiveBuffer, 0, dataSize - sizeof(byte)); _receiveStream.ReadAll(_receiveBuffer, 0, dataSize);
_ = _receiveStream.Read1Byte(); // ?
ushort endTag = _receiveStream.ReadUInt16(); ushort endTag = _receiveStream.ReadUInt16();
if (endTag != _channelPacketEndTag) if (endTag != _channelPacketEndTag)
throw new IOException("Invalid channel packet end tag."); throw new IOException("Invalid channel packet end tag.");
@ -183,8 +182,8 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
_receiveStream.WriteUInt16(_channelPacketStartTag); _receiveStream.WriteUInt16(_channelPacketStartTag);
_receiveStream.WriteByte(1); _receiveStream.WriteByte(1);
_receiveStream.WriteUInt16(dataSize); _receiveStream.WriteUInt16(dataSize);
_receiveStream.WriteByte((byte)attribute.PacketID);
_receiveStream.Write(_sendDataBuffer, 0, dataSize); _receiveStream.Write(_sendDataBuffer, 0, dataSize);
_receiveStream.WriteByte(0); // ?
_receiveStream.Write(_channelPacketEndTag); _receiveStream.Write(_channelPacketEndTag);
break; break;
case PacketType.Server: case PacketType.Server:
@ -193,7 +192,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
_receiveStream.Write(_sendDataBuffer, 0, dataSize); _receiveStream.Write(_sendDataBuffer, 0, dataSize);
break; break;
default: default:
throw new InvalidOperationException("Cannot send unknown packet type."); throw new IOException("Cannot send unknown packet type.");
} }
return true; return true;
} }

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

@ -21,6 +21,8 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
public ushort UnknownA { get; set; } // Always 1? public ushort UnknownA { get; set; } // Always 1?
public byte UnknownB { get; set; }
// ---- METHODS (INTERNAL) ------------------------------------------------------------------------------------- // ---- METHODS (INTERNAL) -------------------------------------------------------------------------------------
internal override void Deserialize(PacketStream stream) internal override void Deserialize(PacketStream stream)
@ -46,6 +48,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
Password = stream.ReadString(12) Password = stream.ReadString(12)
}); });
} }
UnknownB = stream.Read1Byte();
} }
internal override void Serialize(PacketStream stream) => throw new NotImplementedException(); internal override void Serialize(PacketStream stream) => throw new NotImplementedException();