mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

channels/smartcard: cleanup debug output

This commit is contained in:
Marc-André Moreau 2015-01-20 11:16:37 -05:00
parent 4fe932f21f
commit ee51da8500
4 changed files with 302 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/smartcard/client/smartcard_main.c
View File

@ -23,10 +23,6 @@
#include "config.h" #include "config.h"
#endif #endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <winpr/crt.h> #include <winpr/crt.h>
#include <winpr/smartcard.h> #include <winpr/smartcard.h>
#include <winpr/environment.h> #include <winpr/environment.h>
@ -385,7 +381,7 @@ void smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp)
} }
else else
{ {
WLog_ERR(TAG, "Unexpected SmartCard IRP: MajorFunction 0x%08X MinorFunction: 0x%08X", WLog_ERR(TAG, "Unexpected SmartCard IRP: MajorFunction 0x%08X MinorFunction: 0x%08X",
irp->MajorFunction, irp->MinorFunction); irp->MajorFunction, irp->MinorFunction);
irp->IoStatus = STATUS_NOT_SUPPORTED; irp->IoStatus = STATUS_NOT_SUPPORTED;
@ -521,8 +517,6 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
smartcard->name = name; smartcard->name = name;
} }
smartcard->log = WLog_Get("com.freerdp.channel.smartcard.client");
smartcard->IrpQueue = MessageQueue_New(NULL); smartcard->IrpQueue = MessageQueue_New(NULL);
smartcard->CompletedIrpQueue = Queue_New(TRUE, -1, -1); smartcard->CompletedIrpQueue = Queue_New(TRUE, -1, -1);

2
channels/smartcard/client/smartcard_main.h
View File

@ -108,8 +108,6 @@ struct _SMARTCARD_DEVICE
{ {
DEVICE device; DEVICE device;
wLog* log;
char* name; char* name;
char* path; char* path;

50
channels/smartcard/client/smartcard_operations.c
View File

@ -23,9 +23,6 @@
#include "config.h" #include "config.h"
#endif #endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h> #include <assert.h>
#include <winpr/crt.h> #include <winpr/crt.h>
@ -1033,9 +1030,8 @@ static UINT32 smartcard_GetAttrib_Call(SMARTCARD_DEVICE* smartcard, SMARTCARD_OP
if (ret.ReturnCode) if (ret.ReturnCode)
{ {
WLog_Print(smartcard->log, WLOG_WARN, WLog_WARN(TAG, "SCardGetAttrib: %s (0x%08X) cbAttrLen: %d",
"SCardGetAttrib: %s (0x%08X) cbAttrLen: %d", SCardGetAttributeString(call->dwAttrId), call->dwAttrId, call->cbAttrLen);
SCardGetAttributeString(call->dwAttrId), call->dwAttrId, call->cbAttrLen);
Stream_Zero(irp->output, 256); Stream_Zero(irp->output, 256);
free(ret.pbAttr); free(ret.pbAttr);
@ -1060,7 +1056,7 @@ static UINT32 smartcard_AccessStartedEvent_Decode(SMARTCARD_DEVICE* smartcard, S
if (Stream_GetRemainingLength(irp->input) < 4) if (Stream_GetRemainingLength(irp->input) < 4)
{ {
WLog_Print(smartcard->log, WLOG_WARN, "AccessStartedEvent is too short: %d", WLog_WARN(TAG, "AccessStartedEvent is too short: %d",
(int) Stream_GetRemainingLength(irp->input)); (int) Stream_GetRemainingLength(irp->input));
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
@ -1207,7 +1203,7 @@ UINT32 smartcard_irp_device_control_decode(SMARTCARD_DEVICE* smartcard, SMARTCAR
if (Stream_GetRemainingLength(irp->input) < 32) if (Stream_GetRemainingLength(irp->input) < 32)
{ {
WLog_Print(smartcard->log, WLOG_WARN, "Device Control Request is too short: %d", WLog_WARN(TAG, "Device Control Request is too short: %d",
(int) Stream_GetRemainingLength(irp->input)); (int) Stream_GetRemainingLength(irp->input));
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
@ -1220,18 +1216,14 @@ UINT32 smartcard_irp_device_control_decode(SMARTCARD_DEVICE* smartcard, SMARTCAR
if (Stream_Length(irp->input) != (Stream_GetPosition(irp->input) + inputBufferLength)) if (Stream_Length(irp->input) != (Stream_GetPosition(irp->input) + inputBufferLength))
{ {
WLog_Print(smartcard->log, WLOG_WARN, WLog_WARN(TAG, "InputBufferLength mismatch: Actual: %d Expected: %d",
"InputBufferLength mismatch: Actual: %d Expected: %d", Stream_Length(irp->input), Stream_GetPosition(irp->input) + inputBufferLength);
Stream_Length(irp->input), Stream_GetPosition(irp->input) + inputBufferLength);
return SCARD_F_INTERNAL_ERROR; return SCARD_F_INTERNAL_ERROR;
} }
WLog_Print(smartcard->log, WLOG_DEBUG, "%s (0x%08X) FileId: %d CompletionId: %d",
smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, irp->FileId, irp->CompletionId);
#if 0
WLog_DBG(TAG, "%s (0x%08X) FileId: %d CompletionId: %d", WLog_DBG(TAG, "%s (0x%08X) FileId: %d CompletionId: %d",
smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, irp->FileId, irp->CompletionId); smartcard_get_ioctl_string(ioControlCode, TRUE),
#endif ioControlCode, irp->FileId, irp->CompletionId);
if ((ioControlCode != SCARD_IOCTL_ACCESSSTARTEDEVENT) && if ((ioControlCode != SCARD_IOCTL_ACCESSSTARTEDEVENT) &&
(ioControlCode != SCARD_IOCTL_RELEASESTARTEDEVENT)) (ioControlCode != SCARD_IOCTL_RELEASESTARTEDEVENT))
@ -1482,10 +1474,9 @@ UINT32 smartcard_irp_device_control_decode(SMARTCARD_DEVICE* smartcard, SMARTCAR
{ {
UINT32 difference; UINT32 difference;
difference = (int)(Stream_Length(irp->input) - Stream_GetPosition(irp->input)); difference = (int)(Stream_Length(irp->input) - Stream_GetPosition(irp->input));
WLog_Print(smartcard->log, WLOG_WARN, WLog_WARN(TAG, "IRP was not fully parsed %s (0x%08X): Actual: %d, Expected: %d, Difference: %d",
"IRP was not fully parsed %s (0x%08X): Actual: %d, Expected: %d, Difference: %d", smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode,
smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, (int) Stream_GetPosition(irp->input), (int) Stream_Length(irp->input), difference);
(int) Stream_GetPosition(irp->input), (int) Stream_Length(irp->input), difference);
winpr_HexDump(TAG, WLOG_WARN, Stream_Pointer(irp->input), difference); winpr_HexDump(TAG, WLOG_WARN, Stream_Pointer(irp->input), difference);
} }
@ -1493,10 +1484,9 @@ UINT32 smartcard_irp_device_control_decode(SMARTCARD_DEVICE* smartcard, SMARTCAR
{ {
UINT32 difference; UINT32 difference;
difference = (int)(Stream_GetPosition(irp->input) - Stream_Length(irp->input)); difference = (int)(Stream_GetPosition(irp->input) - Stream_Length(irp->input));
WLog_Print(smartcard->log, WLOG_WARN, WLog_WARN(TAG, "IRP was parsed beyond its end %s (0x%08X): Actual: %d, Expected: %d, Difference: %d",
"IRP was parsed beyond its end %s (0x%08X): Actual: %d, Expected: %d, Difference: %d", smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode,
smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, (int) Stream_GetPosition(irp->input), (int) Stream_Length(irp->input), difference);
(int) Stream_GetPosition(irp->input), (int) Stream_Length(irp->input), difference);
} }
if (status != SCARD_S_SUCCESS) if (status != SCARD_S_SUCCESS)
@ -1756,10 +1746,9 @@ UINT32 smartcard_irp_device_control_call(SMARTCARD_DEVICE* smartcard, SMARTCARD_
if ((result != SCARD_S_SUCCESS) && (result != SCARD_E_TIMEOUT) && if ((result != SCARD_S_SUCCESS) && (result != SCARD_E_TIMEOUT) &&
(result != SCARD_E_NO_READERS_AVAILABLE) && (result != SCARD_E_NO_SERVICE)) (result != SCARD_E_NO_READERS_AVAILABLE) && (result != SCARD_E_NO_SERVICE))
{ {
WLog_Print(smartcard->log, WLOG_WARN, WLog_WARN(TAG, "IRP failure: %s (0x%08X), status: %s (0x%08X)",
"IRP failure: %s (0x%08X), status: %s (0x%08X)", smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode,
smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, SCardGetErrorString(result), result);
SCardGetErrorString(result), result);
} }
irp->IoStatus = 0; irp->IoStatus = 0;
@ -1769,9 +1758,8 @@ UINT32 smartcard_irp_device_control_call(SMARTCARD_DEVICE* smartcard, SMARTCARD_
/* NTSTATUS error */ /* NTSTATUS error */
irp->IoStatus = result; irp->IoStatus = result;
Stream_SetPosition(irp->output, RDPDR_DEVICE_IO_RESPONSE_LENGTH); Stream_SetPosition(irp->output, RDPDR_DEVICE_IO_RESPONSE_LENGTH);
WLog_Print(smartcard->log, WLOG_WARN, WLog_WARN(TAG, "IRP failure: %s (0x%08X), ntstatus: 0x%08X",
"IRP failure: %s (0x%08X), ntstatus: 0x%08X", smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, result);
smartcard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, result);
} }
Stream_SealLength(irp->output); Stream_SealLength(irp->output);

599
channels/smartcard/client/smartcard_pack.c
View File

File diff suppressed because it is too large Load Diff