Skip to content

Commit

Permalink
cleanup code a bit (fix compilation on unity)
Browse files Browse the repository at this point in the history
  • Loading branch information
RevenantX committed May 26, 2021
1 parent 4a67b09 commit 7d01bc1
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions LiteNetLib/NetSocket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ internal sealed class NetSocket
private Socket _udpSocketv6;
private Thread _threadv4;
private Thread _threadv6;
private byte[] _receiveBufferv4;
private byte[] _receiveBufferv6;
private IPEndPoint _bufferEndPointv4;
private IPEndPoint _bufferEndPointv6;

Expand Down Expand Up @@ -167,14 +165,13 @@ private bool ProcessError(SocketException ex, EndPoint bufferEndPoint)

public void ManualReceive()
{
ManualReceive(_udpSocketv4, _bufferEndPointv4, _receiveBufferv4);
ManualReceive(_udpSocketv4, _bufferEndPointv4);
if (_udpSocketv6 != null && _udpSocketv6 != _udpSocketv4)
ManualReceive(_udpSocketv6, _bufferEndPointv6, _receiveBufferv6);
ManualReceive(_udpSocketv6, _bufferEndPointv6);
}

private bool ManualReceive(Socket socket, EndPoint bufferEndPoint, byte[] receiveBuffer)
private bool ManualReceive(Socket socket, EndPoint bufferEndPoint)
{
int result;
//Reading data
try
{
Expand All @@ -186,7 +183,7 @@ private bool ManualReceive(Socket socket, EndPoint bufferEndPoint, byte[] receiv
var packet = _listener.NetPacketPool.GetPacket(NetConstants.MaxPacketSize);
packet.Size = socket.ReceiveFrom(packet.RawData, 0, NetConstants.MaxPacketSize, SocketFlags.None,
ref bufferEndPoint);
NetDebug.Write(NetLogLevel.Trace, "[R]Received data from {0}, result: {1}", bufferEndPoint.ToString(), result);
NetDebug.Write(NetLogLevel.Trace, "[R]Received data from {0}, result: {1}", bufferEndPoint.ToString(), packet.Size);
_listener.OnMessageReceived(packet, 0, (IPEndPoint)bufferEndPoint);
available -= packet.Size;
}
Expand All @@ -209,7 +206,6 @@ private void ReceiveLogic(object state)

while (IsActive())
{
int result;
NetPacket packet;

//Reading data
Expand All @@ -233,7 +229,7 @@ private void ReceiveLogic(object state)
}

//All ok!
NetDebug.Write(NetLogLevel.Trace, "[R]Received data from {0}, result: {1}", bufferEndPoint.ToString(), result);
NetDebug.Write(NetLogLevel.Trace, "[R]Received data from {0}, result: {1}", bufferEndPoint.ToString(), packet.Size);
_listener.OnMessageReceived(packet, 0, (IPEndPoint)bufferEndPoint);
}
}
Expand Down Expand Up @@ -288,7 +284,6 @@ public bool Bind(IPAddress addressIPv4, IPAddress addressIPv6, int port, bool re
}
else
{
_receiveBufferv4 = new byte[NetConstants.MaxPacketSize];
_bufferEndPointv4 = new IPEndPoint(IPAddress.Any, 0);
}

Expand All @@ -302,7 +297,6 @@ public bool Bind(IPAddress addressIPv4, IPAddress addressIPv6, int port, bool re
{
if (manualMode)
{
_receiveBufferv6 = new byte[NetConstants.MaxPacketSize];
_bufferEndPointv6 = new IPEndPoint(IPAddress.IPv6Any, 0);
}
else
Expand Down

0 comments on commit 7d01bc1

Please sign in to comment.