davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-17 23:56:30 +09:00
Code Issues Releases Activity

Bug not detecting multiple sends of same message fixed

Browse Source
This commit is contained in:
lidgren
2011-05-29 15:31:39 +00:00
parent bccfaa77ef
commit 604ab334f5
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Lidgren.Network/NetPeer.Send.cs
View File

@@ -45,6 +45,8 @@ namespace Lidgren.Network
if (msg.m_isSent) if (msg.m_isSent)
throw new NetException("This message has already been sent! Use NetPeer.SendMessage() to send to multiple recipients efficiently"); throw new NetException("This message has already been sent! Use NetPeer.SendMessage() to send to multiple recipients efficiently");
msg.m_isSent = true;
int len = msg.LengthBytes; int len = msg.LengthBytes;
if (len <= recipient.m_currentMTU) if (len <= recipient.m_currentMTU)
{ {
@@ -91,6 +93,8 @@ namespace Lidgren.Network
int mtu = GetMTU(recipients); int mtu = GetMTU(recipients);
msg.m_isSent = true;
int len = msg.LengthBytes; int len = msg.LengthBytes;
if (len <= m_configuration.MaximumTransmissionUnit) if (len <= m_configuration.MaximumTransmissionUnit)
{ {
@@ -158,6 +162,7 @@ namespace Lidgren.Network
throw new NetException("Unconnected messages too long! Must be shorter than NetConfiguration.MaximumTransmissionUnit (currently " + m_configuration.MaximumTransmissionUnit + ")"); throw new NetException("Unconnected messages too long! Must be shorter than NetConfiguration.MaximumTransmissionUnit (currently " + m_configuration.MaximumTransmissionUnit + ")");
msg.m_messageType = NetMessageType.Unconnected; msg.m_messageType = NetMessageType.Unconnected;
msg.m_isSent = true;
Interlocked.Increment(ref msg.m_recyclingCount); Interlocked.Increment(ref msg.m_recyclingCount);
m_unsentUnconnectedMessages.Enqueue(new NetTuple<IPEndPoint, NetOutgoingMessage>(recipient, msg)); m_unsentUnconnectedMessages.Enqueue(new NetTuple<IPEndPoint, NetOutgoingMessage>(recipient, msg));
@@ -178,6 +183,7 @@ namespace Lidgren.Network
throw new NetException("Unconnected messages too long! Must be shorter than NetConfiguration.MaximumTransmissionUnit (currently " + m_configuration.MaximumTransmissionUnit + ")"); throw new NetException("Unconnected messages too long! Must be shorter than NetConfiguration.MaximumTransmissionUnit (currently " + m_configuration.MaximumTransmissionUnit + ")");
msg.m_messageType = NetMessageType.Unconnected; msg.m_messageType = NetMessageType.Unconnected;
msg.m_isSent = true;
Interlocked.Add(ref msg.m_recyclingCount, recipients.Count); Interlocked.Add(ref msg.m_recyclingCount, recipients.Count);
foreach(IPEndPoint ep in recipients) foreach(IPEndPoint ep in recipients)

12
UnitTests/Program.cs
View File

@@ -27,6 +27,18 @@ namespace UnitTests
EncryptionTests.Run(peer); EncryptionTests.Run(peer);
var om = peer.CreateMessage();
peer.SendUnconnectedMessage(om, new IPEndPoint(IPAddress.Loopback, 14242));
try
{
peer.SendUnconnectedMessage(om, new IPEndPoint(IPAddress.Loopback, 14242));
}
catch (NetException nex)
{
if (nex.Message != "This message has already been sent! Use NetPeer.SendMessage() to send to multiple recipients efficiently")
throw nex;
}
peer.Shutdown("bye"); peer.Shutdown("bye");
// read all message // read all message