From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 9 Apr 2013 01:51:48 +0000 (-0400)
Subject: Windows: Runtime RDR Trace Toggle
X-Git-Tag: upstream/1.8.0_pre1^2~1231
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1eccf8df16d9216a4c09e99d4123a86cbcf610a0;p=packages%2Fo%2Fopenafs.git

Windows: Runtime RDR Trace Toggle

Modify the IOCTL_AFS_CONFIG_LIBRARY_TRACE DeviceIoControl message
to pass an AFSDebugTraceConfigCB which is used to toggle the value
of the Library's AFSDebugTraceFnc pointer.   When the trace log is
enabled, the AFSDbgLogMsg parameter is non-NULL and when the log is
disabled, the parameter is NULL.

Change-Id: I71b951f244b760487f2ece94409cefaa7a73ea31
Reviewed-on: http://gerrit.openafs.org/9748
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Rod Widdowson <rdw@steadingsoftware.com>
Reviewed-by: Peter Scott <pscott@kerneldrivers.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp
index 6bde1b459..bdde33832 100644
--- a/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp
+++ b/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp
@@ -945,10 +945,21 @@ AFSConfigLibraryDebug()
 
             if ( pDevExt->Specific.Control.LibraryDeviceObject != NULL)
             {
+
                 RtlZeroMemory( &stConfigLib,
                                sizeof( AFSDebugTraceConfigCB));
 
-                stConfigLib.AFSDbgLogMsg = AFSDebugTraceFnc;
+                if ( BooleanFlagOn( AFSDebugFlags, AFS_DBG_TRACE_TO_DEBUGGER) ||
+                     AFSDbgBufferLength > 0)
+                {
+
+                    stConfigLib.AFSDbgLogMsg = AFSDebugTraceFnc;
+                }
+                else
+                {
+
+                    stConfigLib.AFSDbgLogMsg = NULL;
+                }
 
                 ntStatus = AFSSendDeviceIoControl( pDevExt->Specific.Control.LibraryDeviceObject,
                                                    IOCTL_AFS_CONFIG_LIBRARY_TRACE,
diff --git a/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp
index b66e605a6..e330296d3 100644
--- a/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp
@@ -442,10 +442,21 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject,
 
             case IOCTL_AFS_CONFIG_LIBRARY_TRACE:
             {
+                AFSDebugTraceConfigCB *pConfigLib;
+
+                if ( pIrpSp->Parameters.DeviceIoControl.InputBufferLength != sizeof( AFSDebugTraceConfigCB))
+                {
+
+                    ntStatus = STATUS_INVALID_PARAMETER;
+
+                    break;
+                }
+
+                pConfigLib = (AFSDebugTraceConfigCB *)Irp->AssociatedIrp.SystemBuffer;
 
                 InterlockedCompareExchangePointer( (PVOID *)&AFSDebugTraceFnc,
-                                                   NULL,
-                                                   (void *)AFSDbgLogMsg);
+                                                   pConfigLib->AFSDbgLogMsg,
+                                                   (void *)pConfigLib->AFSDbgLogMsg);
 
                 break;
             }