Skip to content

Commit 9cf540b

Browse files
committed
Quick fix in client, commented console output in server...
1 parent 28145e5 commit 9cf540b

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

TinyTcpServer/TinyTcpServer.Core.FunctionalTests/TestUtils/NetworkClient.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,14 @@ private Boolean WriteAsync(Byte[] data)
223223
while (_bytesSend < data.Length)
224224
{
225225
_writeCompleted.Reset();
226-
Int32 offset = _bytesSend;
227-
Int32 size = Math.Min(MaximumPacketSize, data.Length - _bytesSend);
228-
lock (_synch)
226+
//Int32 offset = _bytesSend;
227+
//Int32 size = Math.Min(MaximumPacketSize, data.Length - _bytesSend);
228+
/* lock (_synch)
229229
{
230230
_clientSocket.BeginSend(data, offset, size, SocketFlags.Partial, WriteAsyncCallback, _clientSocket);
231-
}
232-
//lock (_synch)
233-
//_clientSocket.BeginSend(data, 0, data.Length, SocketFlags.None, WriteAsyncCallback, _clientSocket);
231+
}*/
232+
lock (_synch)
233+
_clientSocket.BeginSend(data, 0, data.Length, SocketFlags.None, WriteAsyncCallback, _clientSocket);
234234
_writeCompleted.Wait(_writeTimeout);
235235
}
236236
Console.WriteLine("[Client, WriteAsync] write done, bytes written: " + _bytesSend);

TinyTcpServer/TinyTcpServer.Core/Server/TcpServer.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private void StartClientProcessing()
167167
if (freeTaskIndex >= 0)
168168
{
169169
_tcpClients[clientCounter].IsProcessing = true;
170-
Console.WriteLine("[Server, StartClientProcessing] Starting task 4 IO with client");
170+
//Console.WriteLine("[Server, StartClientProcessing] Starting task 4 IO with client");
171171
_clientProcessingTasks[freeTaskIndex] = new Task(() => ProcessClientReceiveSend(client), new CancellationToken(_interruptRequested));
172172
_clientProcessingTasks[freeTaskIndex].Start();
173173
}
@@ -188,7 +188,7 @@ private void StartClientProcessing()
188188

189189
private void ClientConnectProcessing()
190190
{
191-
Console.WriteLine("[Server, ClientConnectProcessing]waiting 4 clients");
191+
//Console.WriteLine("[Server, ClientConnectProcessing]waiting 4 clients");
192192
Int32 clientsNumber = _tcpClients.Count;
193193
for (Int32 attempt = 0; attempt < _clientConnectAttempts; attempt++)
194194
{
@@ -236,7 +236,7 @@ private Boolean CheckClientConnected(TcpClient client, Boolean formalCheck = fal
236236

237237
private void ProcessClientReceiveSend(TcpClientContext client)
238238
{
239-
Console.WriteLine("[Server ProcessClientReceiveSend] IO with client");
239+
//Console.WriteLine("[Server ProcessClientReceiveSend] IO with client");
240240
Byte[] receivedData = ReceiveImpl(client);
241241
if (receivedData != null)
242242
{
@@ -246,7 +246,7 @@ private void ProcessClientReceiveSend(TcpClientContext client)
246246
//todo: umv: add special selection for AnyPort and AnyIp
247247
return TcpClientHandlerSelector.Select(item.Item1, client);
248248
}).ToList();
249-
Console.WriteLine("[Server ProcessClientReceiveSend] found {0} handlers", linkedHandlers.Count);
249+
//Console.WriteLine("[Server ProcessClientReceiveSend] found {0} handlers", linkedHandlers.Count);
250250
foreach (Tuple<TcpClientHandlerInfo, Func<Byte[], TcpClientHandlerInfo, Byte[]>> handler in linkedHandlers)
251251
{
252252
Byte[] dataForSend = handler.Item2(receivedData, handler.Item1);
@@ -264,7 +264,7 @@ private Byte[] ReceiveImpl(TcpClientContext client)
264264

265265
try
266266
{
267-
Console.WriteLine("[Server ReceiveImpl] waiting 4 data");
267+
//Console.WriteLine("[Server ReceiveImpl] waiting 4 data");
268268

269269
for (Int32 attempt = 0; attempt < _clientReadAttempts; attempt++)
270270
{
@@ -300,7 +300,7 @@ private Byte[] ReceiveImpl(TcpClientContext client)
300300
}
301301
}
302302
Array.Resize(ref buffer, client.BytesRead);
303-
Console.WriteLine("[SERVER, ReceiveImpl] Read bytes: " + client.BytesRead);
303+
//Console.WriteLine("[SERVER, ReceiveImpl] Read bytes: " + client.BytesRead);
304304
}
305305
catch (Exception)
306306
{
@@ -325,13 +325,13 @@ private void SendImpl(TcpClientContext client, Byte[] data)
325325
{
326326
try
327327
{
328-
Console.WriteLine("[Server, SendImpl] Write started");
328+
//Console.WriteLine("[Server, SendImpl] Write started");
329329
client.WriteDataEvent.Reset();
330330
NetworkStream netStream = client.Client.GetStream();
331331
lock (client.SynchObject)
332332
netStream.BeginWrite(data, 0, data.Length, WriteAsyncCallback, client);
333333
client.WriteDataEvent.Wait(_writeTimeout);
334-
Console.WriteLine("[Server, SendImpl] Write done");
334+
//Console.WriteLine("[Server, SendImpl] Write done");
335335
}
336336
catch (Exception)
337337
{
@@ -346,7 +346,7 @@ private void WriteAsyncCallback(IAsyncResult state)
346346
if (client == null)
347347
throw new ApplicationException("state can't be null");
348348
client.Client.GetStream().EndWrite(state);
349-
Console.WriteLine("[Server, WriteAsyncCallback] Write done!");
349+
//Console.WriteLine("[Server, WriteAsyncCallback] Write done!");
350350
client.WriteDataEvent.Set();
351351
}
352352

0 commit comments

Comments
 (0)