nullptr/NetworkTest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлен magic-header

Browse Source
This commit is contained in:
Пытков Роман
2025-09-17 12:39:49 +03:00
parent 095726786d
commit c21c92db37
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Client/TcpClient.cs
View File

@@ -9,6 +9,7 @@ namespace Client;
public class TcpClientWrapper : IClient
{
private const uint MagicHeader = 0xDEADBEEF;
private readonly string _host;
private readonly int _port;
private CancellationTokenSource _cts = new CancellationTokenSource();
@@ -16,7 +17,7 @@ public class TcpClientWrapper : IClient
private Func<byte[], Task<Data?>>? _responseConverter;
private TcpClient? _tcpClient;
public TcpClientWrapper(Func<byte[], Task<Data?>> responseConverter, string host = "192.168.1.117", int port = 5555)
public TcpClientWrapper(Func<byte[], Task<Data?>> responseConverter, string host = "localhost", int port = 5555)
{
_host = host;
_port = port;
@@ -51,9 +52,26 @@ public class TcpClientWrapper : IClient
{
try
{
// Читаем magic header полностью
var magicBytes = new byte[4];
int totalRead = 0;
while (totalRead < 4)
{
var read = await stream.ReadAsync(magicBytes, totalRead, 4 - totalRead, token);
if (read == 0) break; // соединение закрыто
totalRead += read;
}
if (totalRead < 4) break;
var magic = BitConverter.ToUInt32(magicBytes, 0);
if (magic != MagicHeader)
{
Console.WriteLine($"Invalid magic header: {magic:X8}, expected {MagicHeader:X8}. Skipping packet.");
continue; // or break, depending on policy
}
// Читаем длину полностью
var lengthBytes = new byte[4];
int totalRead = 0;
totalRead = 0;
while (totalRead < 4)
{
var read = await stream.ReadAsync(lengthBytes, totalRead, 4 - totalRead, token);

3
Server/TcpServer.cs
View File

@@ -10,6 +10,7 @@ namespace NetworkTest;
public class TcpServer : IServer
{
private const uint MagicHeader = 0xDEADBEEF;
private readonly TcpListener _listener;
private readonly Func<long, Data?> _getData;
private readonly Func<Data, byte[]> _prepareBytes;
@@ -69,7 +70,9 @@ public class TcpServer : IServer
if (data != null)
{
var bytes = _prepareBytes(data);
var magicBytes = BitConverter.GetBytes(MagicHeader);
var lengthBytes = BitConverter.GetBytes(bytes.Length);
await stream.WriteAsync(magicBytes, 0, magicBytes.Length, token);
await stream.WriteAsync(lengthBytes, 0, lengthBytes.Length, token);
await stream.WriteAsync(bytes, 0, bytes.Length, token);
index++;