From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 22 Dec 2008 17:15:00 +0000 (+0000)
Subject: STABLE14-rx-idledead-only-ignore-keepalives-20081222
X-Git-Tag: openafs-stable-1_4_9pre1~81
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=89fb2d77c06854f0d4c7884ebf03ffa563b71564;p=packages%2Fo%2Fopenafs.git

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 245527cd2..c16aec29d 100644
--- 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;
 }