From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 28 Jul 2007 03:51:16 +0000 (+0000)
Subject: DEVEL15-windows-rdrtimeout-20070727
X-Git-Tag: openafs-devel-1_5_22~25
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1c120980579b74bc0c1a4b8ec141dcf22ac13afc;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-rdrtimeout-20070727


RDRtimeout is seconds.  need to convert to milliseconds for comparison


(cherry picked from commit 0ba1a6275755e7df19cab1cf20fb1b7aaf176c61)
---

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index e3061aff6..88f75dba6 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -4389,7 +4389,7 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou
                                                       scp->bulkStatProgress)) {
                     /* Don't bulk stat if risking timeout */
                     int now = GetTickCount();
-                    if (now - req.startTime > RDRtimeout) {
+                    if (now - req.startTime > RDRtimeout * 1000) {
                         scp->bulkStatProgress = thyper;
                         scp->flags &= ~CM_SCACHEFLAG_BULKSTATTING;
                         dsp->flags &= ~SMB_DIRSEARCH_BULKST;
diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 2680215b6..eba779add 100644
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -4978,7 +4978,7 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
                     LargeIntegerGreaterThanOrEqualTo(thyper, scp->bulkStatProgress)) {
                     /* Don't bulk stat if risking timeout */
                     DWORD now = GetTickCount();
-                    if (now - req.startTime > RDRtimeout) {
+                    if (now - req.startTime > RDRtimeout * 1000) {
                         scp->bulkStatProgress = thyper;
                         scp->flags &= ~CM_SCACHEFLAG_BULKSTATTING;
                         dsp->flags &= ~SMB_DIRSEARCH_BULKST;