Revert "Merge pull request #151 from Indev450/fixdupeacks"
This reverts commit1fabc14ac9, reversing changes made tod9492eee28.
This commit is contained in:
1 parent
badb8c7914
commit
10f1507366
1 file changed
+7
-16
+7
-16
@@ -325,10 +325,10 @@ static void RemoveAck(INT32 i)
|
||||
}
|
||||
|
||||
// We have got a packet, proceed the ack request and ack return
|
||||
static int Processackpak(void)
|
||||
static boolean Processackpak(void)
|
||||
{
|
||||
INT32 i;
|
||||
int goodpacket = 0;
|
||||
boolean goodpacket = true;
|
||||
node_t *node = &nodes[doomcom->remotenode];
|
||||
|
||||
// Received an ack return, so remove the ack in the list
|
||||
@@ -353,7 +353,7 @@ static int Processackpak(void)
|
||||
{
|
||||
DEBFILE(va("Discard(1) ack %d (duplicated)\n", ack));
|
||||
duppacket++;
|
||||
goodpacket = 1; // Discard packet (duplicate)
|
||||
goodpacket = false; // Discard packet (duplicate)
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -363,10 +363,10 @@ static int Processackpak(void)
|
||||
{
|
||||
DEBFILE(va("Discard(2) ack %d (duplicated)\n", ack));
|
||||
duppacket++;
|
||||
goodpacket = 1; // Discard packet (duplicate)
|
||||
goodpacket = false; // Discard packet (duplicate)
|
||||
break;
|
||||
}
|
||||
if (goodpacket == 0)
|
||||
if (goodpacket)
|
||||
{
|
||||
// Is a good packet so increment the acknowledge number,
|
||||
// Then search for a "hole" in the queue
|
||||
@@ -427,13 +427,12 @@ static int Processackpak(void)
|
||||
else // Buffer full discard packet, sender will resend it
|
||||
{ // We can admit the packet but we will not detect the duplication after :(
|
||||
DEBFILE("no more freeackret\n");
|
||||
goodpacket = 2;
|
||||
goodpacket = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// return values: 0 = ok, 1 = duplicate, 2 = out of order
|
||||
return goodpacket;
|
||||
}
|
||||
#endif
|
||||
@@ -1160,7 +1159,6 @@ boolean HGetPacket(void)
|
||||
while(true)
|
||||
{
|
||||
//nodejustjoined = I_NetGet();
|
||||
int goodpacket;
|
||||
I_NetGet();
|
||||
|
||||
if (doomcom->remotenode == -1) // No packet received
|
||||
@@ -1205,15 +1203,8 @@ boolean HGetPacket(void)
|
||||
}*/
|
||||
|
||||
// Proceed the ack and ackreturn field
|
||||
goodpacket = Processackpak();
|
||||
if (goodpacket != 0)
|
||||
{
|
||||
// resend the ACK in case the previous ACK didn't reach the client.
|
||||
// prevents the client's netbuffer from locking up.
|
||||
if (goodpacket == 1)
|
||||
Net_SendAcks(doomcom->remotenode);
|
||||
if (!Processackpak())
|
||||
continue; // discarded (duplicated)
|
||||
}
|
||||
|
||||
// A packet with just ackreturn
|
||||
if (netbuffer->packettype == PT_NOTHING)
|
||||
|
||||
Reference in new issue
Block a user