CVS: rdesktop channels.c,1.15.2.1,1.15.2.2 configure.ac,1.18,1.18.2.1 rdesktop.h,1.32.2.4,1.32.2.5

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

Modified Files:
      Tag: seamlessrdp-branch
	channels.c configure.ac rdesktop.h 
Log Message:
Give virtual channel debug output its own switch.


Index: channels.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/channels.c,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** channels.c	10 Mar 2006 08:50:43 -0000	1.15.2.1
--- channels.c	24 Mar 2006 15:34:32 -0000	1.15.2.2
***************
*** 88,92 ****
  	length = s->end - s->p - 8;
  
! 	DEBUG_CLIPBOARD(("channel_send, length = %d\n", length));
  
  	thislength = MIN(length, CHANNEL_CHUNK_LENGTH);
--- 88,92 ----
  	length = s->end - s->p - 8;
  
! 	DEBUG_CHANNEL(("channel_send, length = %d\n", length));
  
  	thislength = MIN(length, CHANNEL_CHUNK_LENGTH);
***************
*** 103,107 ****
  	out_uint32_le(s, flags);
  	data = s->end = s->p + thislength;
! 	DEBUG_CLIPBOARD(("Sending %d bytes with FLAG_FIRST\n", thislength));
  	sec_send_to_channel(s, g_encryption ? SEC_ENCRYPT : 0, channel->mcs_id);
  
--- 103,107 ----
  	out_uint32_le(s, flags);
  	data = s->end = s->p + thislength;
! 	DEBUG_CHANNEL(("Sending %d bytes with FLAG_FIRST\n", thislength));
  	sec_send_to_channel(s, g_encryption ? SEC_ENCRYPT : 0, channel->mcs_id);
  
***************
*** 115,119 ****
  			flags |= CHANNEL_FLAG_SHOW_PROTOCOL;
  
! 		DEBUG_CLIPBOARD(("Sending %d bytes with flags %d\n", thislength, flags));
  
  		s = sec_init(g_encryption ? SEC_ENCRYPT : 0, thislength + 8);
--- 115,119 ----
  			flags |= CHANNEL_FLAG_SHOW_PROTOCOL;
  
! 		DEBUG_CHANNEL(("Sending %d bytes with flags %d\n", thislength, flags));
  
  		s = sec_init(g_encryption ? SEC_ENCRYPT : 0, thislength + 8);

Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** configure.ac	27 Dec 2005 09:20:33 -0000	1.18
--- configure.ac	24 Mar 2006 15:34:32 -0000	1.18.2.1
***************
*** 680,683 ****
--- 680,692 ----
      ])
  
+ AC_ARG_WITH(debug-channel,
+     [  --with-debug-channel  enable debugging of virtual channel code],
+     [
+         if test $withval != "no";
+         then 
+             AC_DEFINE(WITH_DEBUG_CHANNEL,1)
+ 	fi
+     ])
+ 
  
  #

Index: rdesktop.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.h,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.5
diff -C2 -d -r1.32.2.4 -r1.32.2.5
*** rdesktop.h	21 Mar 2006 15:16:48 -0000	1.32.2.4
--- rdesktop.h	24 Mar 2006 15:34:32 -0000	1.32.2.5
***************
*** 58,61 ****
--- 58,67 ----
  #endif
  
+ #ifdef WITH_DEBUG_CHANNEL
+ #define DEBUG_CHANNEL(args) printf args;
+ #else
+ #define DEBUG_CHANNEL(args)
+ #endif
+ 
  #define STRNCPY(dst,src,n)	{ strncpy(dst,src,n-1); dst[n-1] = 0; }
  



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642