epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StyleCop clean Connection

Browse Source
This commit is contained in:
Matthias Mailänder
2014-11-01 07:43:12 +01:00
parent 7b22a01fc0
commit 7adacc0477
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Network/Connection.cs
View File

@@ -43,6 +43,7 @@ namespace OpenRA.Network
public int FromClient; public int FromClient;
public byte[] Data; public byte[] Data;
} }
protected List<ReceivedPacket> receivedPackets = new List<ReceivedPacket>(); protected List<ReceivedPacket> receivedPackets = new List<ReceivedPacket>();
public virtual int LocalClientId public virtual int LocalClientId
@@ -120,7 +121,7 @@ namespace OpenRA.Network
public NetworkConnection(string host, int port) public NetworkConnection(string host, int port)
{ {
t = new Thread( _ => t = new Thread(_ =>
{ {
try try
{ {
@@ -145,7 +146,7 @@ namespace OpenRA.Network
if (len == 0) if (len == 0)
throw new NotImplementedException(); throw new NotImplementedException();
lock (this) lock (this)
receivedPackets.Add(new ReceivedPacket { FromClient = client, Data = buf } ); receivedPackets.Add(new ReceivedPacket { FromClient = client, Data = buf });
} }
} }
catch { } catch { }
@@ -155,8 +156,7 @@ namespace OpenRA.Network
if (socket != null) if (socket != null)
socket.Close(); socket.Close();
} }
} }) { IsBackground = true };
) { IsBackground = true };
t.Start(); t.Start();
} }
@@ -182,12 +182,14 @@ namespace OpenRA.Network
var ms = new MemoryStream(); var ms = new MemoryStream();
ms.Write(BitConverter.GetBytes((int)packet.Length)); ms.Write(BitConverter.GetBytes((int)packet.Length));
ms.Write(packet); ms.Write(packet);
foreach (var q in queuedSyncPackets) foreach (var q in queuedSyncPackets)
{ {
ms.Write(BitConverter.GetBytes((int)q.Length)); ms.Write(BitConverter.GetBytes((int)q.Length));
ms.Write(q); ms.Write(q);
base.Send(q); base.Send(q);
} }
queuedSyncPackets.Clear(); queuedSyncPackets.Clear();
ms.WriteTo(socket.GetStream()); ms.WriteTo(socket.GetStream());
} }
@@ -209,11 +211,13 @@ namespace OpenRA.Network
if (disposing) if (disposing)
if (socket != null) if (socket != null)
socket.Client.Close(); socket.Client.Close();
using (new PerfSample("Thread.Join")) using (new PerfSample("Thread.Join"))
{ {
if (!t.Join(1000)) if (!t.Join(1000))
return; return;
} }
base.Dispose(disposing); base.Dispose(disposing);
} }