@@ -735,12 +735,12 @@ bool ReliabilityLayer::HandleSocketReceiveFromConnectedPlayer(
735
735
}
736
736
for (i=0 ; i<incomingAcks.ranges .Size ();i++)
737
737
{
738
- if (incomingAcks.ranges [i].minIndex >incomingAcks.ranges [i].maxIndex )
738
+ if (incomingAcks.ranges [i].minIndex >incomingAcks.ranges [i].maxIndex || (incomingAcks. ranges [i]. maxIndex == ( uint24_t )( 0xFFFFFFFF )) )
739
739
{
740
740
RakAssert (incomingAcks.ranges [i].minIndex <=incomingAcks.ranges [i].maxIndex );
741
741
742
742
for (unsigned int messageHandlerIndex=0 ; messageHandlerIndex < messageHandlerList.Size (); messageHandlerIndex++)
743
- messageHandlerList[messageHandlerIndex]->OnReliabilityLayerNotification (" incomingAcks minIndex > maxIndex" , BYTES_TO_BITS (length), systemAddress, true );
743
+ messageHandlerList[messageHandlerIndex]->OnReliabilityLayerNotification (" incomingAcks minIndex > maxIndex or maxIndex is max value " , BYTES_TO_BITS (length), systemAddress, true );
744
744
return false ;
745
745
}
746
746
for (datagramNumber=incomingAcks.ranges [i].minIndex ; datagramNumber >= incomingAcks.ranges [i].minIndex && datagramNumber <= incomingAcks.ranges [i].maxIndex ; datagramNumber++)
@@ -3191,22 +3191,24 @@ InternalPacket * ReliabilityLayer::BuildPacketFromSplitPacketList( SplitPacketCh
3191
3191
#else
3192
3192
unsigned int j;
3193
3193
InternalPacket * internalPacket, *splitPacket;
3194
- int splitPacketPartLength;
3194
+ // int splitPacketPartLength;
3195
3195
3196
3196
// Reconstruct
3197
3197
internalPacket = CreateInternalPacketCopy ( splitPacketChannel->splitPacketList [0 ], 0 , 0 , time );
3198
3198
internalPacket->dataBitLength =0 ;
3199
3199
for (j=0 ; j < splitPacketChannel->splitPacketList .Size (); j++)
3200
3200
internalPacket->dataBitLength +=splitPacketChannel->splitPacketList [j]->dataBitLength ;
3201
- splitPacketPartLength=BITS_TO_BYTES (splitPacketChannel->firstPacket ->dataBitLength );
3201
+ // splitPacketPartLength=BITS_TO_BYTES(splitPacketChannel->firstPacket->dataBitLength);
3202
3202
3203
3203
internalPacket->data = (unsigned char *) rakMalloc_Ex ( (size_t ) BITS_TO_BYTES ( internalPacket->dataBitLength ), _FILE_AND_LINE_ );
3204
3204
internalPacket->allocationScheme =InternalPacket::NORMAL;
3205
3205
3206
+ BitSize_t offset = 0 ;
3206
3207
for (j=0 ; j < splitPacketChannel->splitPacketList .Size (); j++)
3207
3208
{
3208
3209
splitPacket=splitPacketChannel->splitPacketList [j];
3209
- memcpy (internalPacket->data +splitPacket->splitPacketIndex *splitPacketPartLength, splitPacket->data , (size_t ) BITS_TO_BYTES (splitPacketChannel->splitPacketList [j]->dataBitLength ));
3210
+ memcpy (internalPacket->data + BITS_TO_BYTES (offset), splitPacket->data , (size_t )BITS_TO_BYTES (splitPacketChannel->splitPacketList [j]->dataBitLength ));
3211
+ offset += splitPacketChannel->splitPacketList [j]->dataBitLength ;
3210
3212
}
3211
3213
3212
3214
for (j=0 ; j < splitPacketChannel->splitPacketList .Size (); j++)
0 commit comments