diff --git a/src/d_net.c b/src/d_net.c index b55861d13..d86be582a 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -179,6 +179,12 @@ typedef struct // ack return to send (like sliding window protocol) UINT8 firstacktosend; + // when no consecutive packets are received we keep in mind what packets + // we already received in a queue + UINT8 acktosend_head; + UINT8 acktosend_tail; + UINT8 acktosend[MAXACKTOSEND]; + // automatically send keep alive packet when not enough trafic tic_t lasttimeacktosend_sent; // detect connection lost @@ -273,9 +279,10 @@ static void RemoveAck(INT32 i) } // We have got a packet, proceed the ack request and ack return -static boolean Processackpak(void) +static int Processackpak(void) { - boolean goodpacket = true; + INT32 i; + int goodpacket = 0; node_t *node = &nodes[doomcom->remotenode]; // Received an ack return, so remove the ack in the list @@ -283,7 +290,7 @@ static boolean Processackpak(void) { node->remotefirstack = netbuffer->ackreturn; // Search the ackbuffer and free it - for (INT32 i = 0; i < MAXACKPACKETS; i++) + for (i = 0; i < MAXACKPACKETS; i++) if (ackpak[i].acknum && ackpak[i].destinationnode == doomcom->remotenode && cmpack(ackpak[i].acknum, netbuffer->ackreturn) <= 0) { @@ -300,33 +307,128 @@ static boolean Processackpak(void) { DEBFILE(va("Discard(1) ack %d (duplicated)\n", ack)); duppacket++; - goodpacket = false; // Discard packet (duplicate) + goodpacket = 1; // Discard packet (duplicate) } else { - // Is a good packet so increment the acknowledge number, - // Then search for a "hole" in the queue - UINT8 nextfirstack = (UINT8)(node->firstacktosend + 1); - if (!nextfirstack) - nextfirstack = 1; + // Check if it is not already in the queue + for (i = node->acktosend_tail; i != node->acktosend_head; i = (i+1) % MAXACKTOSEND) + if (node->acktosend[i] == ack) + { + DEBFILE(va("Discard(2) ack %d (duplicated)\n", ack)); + duppacket++; + goodpacket = 1; // Discard packet (duplicate) + break; + } + if (goodpacket == 0) + { + // Is a good packet so increment the acknowledge number, + // Then search for a "hole" in the queue + UINT8 nextfirstack = (UINT8)(node->firstacktosend + 1); + if (!nextfirstack) + nextfirstack = 1; - if (ack == nextfirstack) - { - node->firstacktosend = nextfirstack; - } - else // Out of order packet - { - // Don't increment firsacktosend, put it in asktosend queue - // Will be incremented when the nextfirstack comes (code above) - DEBFILE(va("out of order packet (%d expected)\n", nextfirstack)); - goodpacket = false; + if (ack == nextfirstack) + { + UINT8 hm1; // head - 1 + boolean change = true; + + node->firstacktosend = nextfirstack++; + if (!nextfirstack) + nextfirstack = 1; + hm1 = (UINT8)((node->acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND); + while (change) + { + change = false; + for (i = node->acktosend_tail; i != node->acktosend_head; + i = (i+1) % MAXACKTOSEND) + { + if (cmpack(node->acktosend[i], nextfirstack) <= 0) + { + if (node->acktosend[i] == nextfirstack) + { + node->firstacktosend = nextfirstack++; + if (!nextfirstack) + nextfirstack = 1; + change = true; + } + if (i == node->acktosend_tail) + { + node->acktosend[node->acktosend_tail] = 0; + node->acktosend_tail = (UINT8)((i+1) % MAXACKTOSEND); + } + else if (i == hm1) + { + node->acktosend[hm1] = 0; + node->acktosend_head = hm1; + hm1 = (UINT8)((hm1-1+MAXACKTOSEND) % MAXACKTOSEND); + } + } + } + } + } + else // Out of order packet + { + // Don't increment firsacktosend, put it in asktosend queue + // Will be incremented when the nextfirstack comes (code above) + UINT8 newhead = (UINT8)((node->acktosend_head+1) % MAXACKTOSEND); + DEBFILE(va("out of order packet (%d expected)\n", nextfirstack)); + if (newhead != node->acktosend_tail) + { + node->acktosend[node->acktosend_head] = ack; + node->acktosend_head = newhead; + } + 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; + } + } } } } + // return values: 0 = ok, 1 = duplicate, 2 = out of order return goodpacket; } #endif +// send special packet with only ack on it +void Net_SendAcks(INT32 node) +{ +#ifdef NONET + (void)node; +#else + netbuffer->packettype = PT_NOTHING; + M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND); + HSendPacket(node, false, 0, MAXACKTOSEND); +#endif +} + +#ifndef NONET +static void GotAcks(void) +{ + INT32 i, j; + + for (j = 0; j < MAXACKTOSEND; j++) + if (netbuffer->u.textcmd[j]) + for (i = 0; i < MAXACKPACKETS; i++) + if (ackpak[i].acknum && ackpak[i].destinationnode == doomcom->remotenode) + { + if (ackpak[i].acknum == netbuffer->u.textcmd[j]) + RemoveAck(i); + // nextacknum is first equal to acknum, then when receiving bigger ack + // there is big chance the packet is lost + // When resent, nextacknum = nodes[node].nextacknum + // will redo the same but with different value + else if (cmpack(ackpak[i].nextacknum, netbuffer->u.textcmd[j]) <= 0 + && ackpak[i].senttime > 0) + { + ackpak[i].senttime--; // hurry up + } + } +} +#endif + void Net_ConnectionTimeout(INT32 node) { // Don't timeout several times @@ -386,6 +488,11 @@ void Net_AckTicker(void) // This is something like node open flag if (nodes[i].firstacktosend) { + // We haven't sent a packet for a long time + // Acknowledge packet if needed + if (nodes[i].lasttimeacktosend_sent + ACKTOSENDTIMEOUT < I_GetTime()) + Net_SendAcks(i); + if (!(nodes[i].flags & NF_CLOSE) && nodes[i].lasttimepacketreceived + connectiontimeout < I_GetTime()) { @@ -403,12 +510,37 @@ void Net_UnAcknowledgePacket(INT32 node) #ifdef NONET (void)node; #else + INT32 hm1 = (nodes[node].acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND; DEBFILE(va("UnAcknowledge node %d\n", node)); if (!node) return; - nodes[node].firstacktosend--; - if (!nodes[node].firstacktosend) - nodes[node].firstacktosend = UINT8_MAX; + if (nodes[node].acktosend[hm1] == netbuffer->ack) + { + nodes[node].acktosend[hm1] = 0; + nodes[node].acktosend_head = (UINT8)hm1; + } + else if (nodes[node].firstacktosend == netbuffer->ack) + { + nodes[node].firstacktosend--; + if (!nodes[node].firstacktosend) + nodes[node].firstacktosend = UINT8_MAX; + } + else + { + while (nodes[node].firstacktosend != netbuffer->ack) + { + nodes[node].acktosend_tail = (UINT8) + ((nodes[node].acktosend_tail-1+MAXACKTOSEND) % MAXACKTOSEND); + nodes[node].acktosend[nodes[node].acktosend_tail] = nodes[node].firstacktosend; + + nodes[node].firstacktosend--; + if (!nodes[node].firstacktosend) + nodes[node].firstacktosend = UINT8_MAX; + } + nodes[node].firstacktosend++; + if (!nodes[node].firstacktosend) + nodes[node].firstacktosend = 1; + } #endif } @@ -460,6 +592,8 @@ void Net_WaitAllAckReceived(UINT32 timeout) static void InitNode(node_t *node) { + node->acktosend_head = node->acktosend_tail = 0; + memset(node->acktosend, 0, sizeof(node->acktosend)); node->firstacktosend = 0; node->nextacknum = 1; node->remotefirstack = 0; @@ -531,11 +665,11 @@ void Net_CloseConnection(INT32 node) nodes[node].flags |= NF_CLOSE; - if (nodes[node].firstacktosend) + // try to Send ack back (two army problem) + if (GetAcktosend(node)) { - // send a PT_NOTHING back to acknowledge the packet - netbuffer->packettype = PT_NOTHING; - HSendPacket(node, false, 0, 0); + Net_SendAcks(node); + Net_SendAcks(node); } // check if we are waiting for an ack from this node @@ -980,6 +1114,7 @@ boolean HGetPacket(void) while(true) { //nodejustjoined = I_NetGet(); + int goodpacket; I_NetGet(); if (doomcom->remotenode == -1) // No packet received @@ -1024,12 +1159,22 @@ boolean HGetPacket(void) }*/ // Proceed the ack and ackreturn field - if (!Processackpak()) + 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); continue; // discarded (duplicated) + } // A packet with just ackreturn if (netbuffer->packettype == PT_NOTHING) + { + GotAcks(); continue; + } break; } #endif // ifndef NONET diff --git a/src/d_net.h b/src/d_net.h index ea6ff8133..b419df033 100644 --- a/src/d_net.h +++ b/src/d_net.h @@ -63,6 +63,7 @@ void Net_UnAcknowledgePacket(INT32 node); void Net_CloseConnection(INT32 node); void Net_ConnectionTimeout(INT32 node); void Net_AbortPacketType(UINT8 packettype); +void Net_SendAcks(INT32 node); void Net_WaitAllAckReceived(UINT32 timeout); const char *Net_GetPacketName(UINT8 packettype); diff --git a/src/d_netfil.c b/src/d_netfil.c index a1eee13fc..f9464277c 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -977,7 +977,7 @@ void Got_Filetxpak(void) if (filenum >= fileneedednum) { - DEBFILE(va("filefragment not needed %d>%d\n", filenum, fileneedednum)); + DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum)); //I_Error("Received an unneeded file fragment (file id received: %d, file id needed: %d)\n", filenum, fileneedednum); return; } @@ -1048,13 +1048,10 @@ void Got_Filetxpak(void) } I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s); } - // Send ack back quickly if (++filetime == 3) { - // send a PT_NOTHING back to acknowledge the packet - netbuffer->packettype = PT_NOTHING; - HSendPacket(servernode, false, 0, 0); + Net_SendAcks(servernode); filetime = 0; }