STABLE14-rx-idledead-only-ignore-keepalives-20081222

LICENSE IPL10

critical to not ignore e.g. other acks

(cherry picked from commit c69fa8fef4de43182d9e6ebad1d5c1db71148d6d)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 245527cd2084dee5e419613f25b115bc799adf05..c16aec29daa4b7973d625e829355c94893c23ff1 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -5380,7 +5380,7 @@ rxi_Send(register struct rx_call *call, register struct rx_packet *p,
      * idle connections) */
     conn->lastSendTime = call->lastSendTime = clock_Sec();
     /* Don't count keepalives here, so idleness can be tracked. */
-    if (p->header.type != RX_PACKET_TYPE_ACK)
+    if ((p->header.type != RX_PACKET_TYPE_ACK) || (((struct rx_ackPacket *)rx_DataOf(p))->reason != RX_ACK_PING))
        call->lastSendData = call->lastSendTime;
 }