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

Fix for fragmented messages and ReliableOrdered

Browse Source
This commit is contained in:
lidgren
2010-06-15 22:37:30 +00:00
parent 5d44e391cb
commit a12fc42732
4 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Lidgren.Network/NetConnection.cs
View File

@@ -233,7 +233,7 @@ namespace Lidgren.Network
ptr = msg.Encode(now, buffer, ptr, this);
numIncludedMessages++;
// room to piggyback some acks?
if (m_acknowledgesToSend.Count > 0)
{
@@ -339,7 +339,7 @@ namespace Lidgren.Network
// Expected sequence number
AcceptMessage(mtp, isFragment, channelSequenceNumber, ptr, payloadLengthBits);
ExpectedReliableSequenceArrived(reliableSlot);
ExpectedReliableSequenceArrived(reliableSlot, isFragment);
return;
}
@@ -404,7 +404,7 @@ namespace Lidgren.Network
im.m_senderEndpoint = m_remoteEndpoint;
m_owner.LogVerbose("Withholding " + im + " (waiting for " + m_nextExpectedReliableSequence[reliableSlot] + ")");
wmList.Add(im);
return;
@@ -498,7 +498,10 @@ namespace Lidgren.Network
Buffer.BlockCopy(m_owner.m_receiveBuffer, ptr, im.m_data, offset, payloadLength);
im.m_bitLength = (8 * (offset + payloadLength));
// only enlarge message length if this is latest fragment received
int newBitLength = (8 * (offset + payloadLength));
if (newBitLength > im.m_bitLength)
im.m_bitLength = newBitLength;
info.Received[nr] = true;
info.TotalReceived++;
@@ -567,7 +570,7 @@ namespace Lidgren.Network
throw new NetException("Message has already been sent!");
NetException.Assert(sequenceChannel >= 0 && sequenceChannel < NetConstants.NetChannelsPerDeliveryMethod, "Sequence channel must be between 0 and NetConstants.NetChannelsPerDeliveryMethod (" + NetConstants.NetChannelsPerDeliveryMethod + ")");
msg.m_type = (NetMessageType)((int)method + sequenceChannel);
EnqueueOutgoingMessage(msg);
}
@@ -602,7 +605,7 @@ namespace Lidgren.Network
int numFragments = (msgLen + mtu - 1) / mtu;
for(int i=0;i<numFragments;i++)
for (int i = 0; i < numFragments; i++)
{
int flen = (i == numFragments - 1 ? (msgLen - (mtu * (numFragments - 1))) : mtu);
@@ -684,4 +687,4 @@ namespace Lidgren.Network
return "[NetConnection to " + m_remoteEndpoint + " Status: " + m_visibleStatus + "]";
}
}
}
}