windows-rdrtimeout-20070727
authorJeffrey Altman <jaltman@secure-endpoints.com>
Sat, 28 Jul 2007 03:50:23 +0000 (03:50 +0000)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Sat, 28 Jul 2007 03:50:23 +0000 (03:50 +0000)
RDRtimeout is seconds.  need to convert to milliseconds for comparison

src/WINNT/afsd/smb.c
src/WINNT/afsd/smb3.c

index fddacf1..8f2e722 100644 (file)
@@ -4109,7 +4109,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;
index cecf316..981725b 100644 (file)
@@ -4972,7 +4972,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;