CVS: rdesktop configure.ac, 1.33, 1.34 rdesktop.h, 1.34, 1.35 rdpdr.c, 1.44, 1.45 scard.c, 1.6, 1.7

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23850

Modified Files:
	configure.ac rdesktop.h rdpdr.c scard.c 
Log Message:
clean up smartcard debugging


Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** configure.ac	1 Nov 2006 21:23:08 -0000	1.33
--- configure.ac	2 Nov 2006 20:48:28 -0000	1.34
***************
*** 820,824 ****
          then
  		if test x"$WITH_SCARD" = "x1"; then
! 			AC_DEFINE(WITH_SCARD_DEBUG,1)
  		fi
  	fi
--- 820,824 ----
          then
  		if test x"$WITH_SCARD" = "x1"; then
! 			AC_DEFINE(WITH_DEBUG_SCARD,1)
  		fi
  	fi

Index: rdesktop.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** rdesktop.h	13 Sep 2006 12:10:13 -0000	1.34
--- rdesktop.h	2 Nov 2006 20:48:28 -0000	1.35
***************
*** 64,67 ****
--- 64,73 ----
  #endif
  
+ #ifdef WITH_DEBUG_SCARD
+ #define DEBUG_SCARD(args) printf args;
+ #else
+ #define DEBUG_SCARD(args)
+ #endif
+ 
  #define STRNCPY(dst,src,n)	{ strncpy(dst,src,n-1); dst[n-1] = 0; }
  

Index: rdpdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpdr.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** rdpdr.c	1 Nov 2006 20:52:00 -0000	1.44
--- rdpdr.c	2 Nov 2006 20:48:28 -0000	1.45
***************
*** 680,689 ****
  			out.data = out.p = buffer;
  			out.size = sizeof(buffer);
! #ifdef  WITH_SCARD_DEBUG
! 			printf("[SMART-CARD TRACE]\n");
! 			printf("device 0x%.8x\n", device);
! 			printf("file   0x%.8x\n", file);
! 			printf("id     0x%.8x\n", id);
! #endif
  #ifdef WITH_SCARD
  			scardSetInfo(device, id, bytes_out + 0x14);
--- 680,688 ----
  			out.data = out.p = buffer;
  			out.size = sizeof(buffer);
! 
! 			DEBUG_SCARD(("[SMART-CARD TRACE]\n"));
! 			DEBUG_SCARD(("device 0x%.8x\n", device));
! 			DEBUG_SCARD(("file   0x%.8x\n", file));
! 			DEBUG_SCARD(("id     0x%.8x\n", id));
  #ifdef WITH_SCARD
  			scardSetInfo(device, id, bytes_out + 0x14);
***************
*** 691,697 ****
  			status = fns->device_control(file, request, s, &out);
  			result = buffer_len = out.p - out.data;
! #ifdef  WITH_SCARD_DEBUG
! 			printf("[SMART-CARD TRACE] OUT 0x%.8x\n", status);
! #endif
  			/* Serial SERIAL_WAIT_ON_MASK */
  			if (status == STATUS_PENDING)
--- 690,696 ----
  			status = fns->device_control(file, request, s, &out);
  			result = buffer_len = out.p - out.data;
! 
! 			DEBUG_SCARD(("[SMART-CARD TRACE] OUT 0x%.8x\n", status));
! 
  			/* Serial SERIAL_WAIT_ON_MASK */
  			if (status == STATUS_PENDING)

Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** scard.c	2 Nov 2006 11:09:35 -0000	1.6
--- scard.c	2 Nov 2006 20:48:28 -0000	1.7
***************
*** 127,131 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		printf("[SMART CARD: PCSC service not available]\n");
  		return 0;
  	}
--- 127,131 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		error("[SMART CARD: PCSC service not available]\n");
  		return 0;
[...1532 lines suppressed...]
  	while (cur)
--- 2550,2554 ----
  	PThreadListElement cur = threadList, last = threadList;
  
! 	DEBUG_SCARD(("[THREAD COUNT %d]\n", threadCount));
  
  	while (cur)
***************
*** 2658,2662 ****
  	if (0 != Result)
  	{
! 		printf("[THREAD CREATE ERROR 0x%.8x]\n", Result);
  		SC_xfree(&threadListHandle, cur);
  		SC_destroyThreadData(data);
--- 2583,2587 ----
  	if (0 != Result)
  	{
! 		error("[THREAD CREATE ERROR 0x%.8x]\n", Result);
  		SC_xfree(&threadListHandle, cur);
  		SC_destroyThreadData(data);


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642