CVS: winex/dlls/winsock socket.c, 1.47, 1.48 ws2_32.spec, 1.14, 1.15

Subject: winex/dlls/winsock socket.c,1.47,1.48 ws2_32.spec,1.14,1.15Update of /var/lib/cvsd/cvsroot/winex/dlls/winsock
In directory agravaine:/tmp/cvs-serv25431/dlls/winsock

Modified Files:
	socket.c ws2_32.spec 
Log Message:

- add winsocktext debug channel to dump out packets as text (compliments winsockhex)


Index: socket.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/winsock/socket.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- socket.c	31 Jul 2007 17:32:09 -0000	1.47
+++ socket.c	31 Jul 2007 18:02:29 -0000	1.48
@@ -109,6 +109,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 WINE_DECLARE_DEBUG_CHANNEL(winsockhex);
+WINE_DECLARE_DEBUG_CHANNEL(winsocktext);
 
 /* critical section to protect some non-rentrant net function */
 extern CRITICAL_SECTION csWSgetXXXbyYYY;
@@ -816,12 +817,16 @@
     WSASetLastError(iError);
 }
 
-static void debug_hexdump(void *data, unsigned long len)
+static void debug_hexdump(void *data, unsigned long len, BOOL Sent)
 {
     unsigned int i;
     char *cdata = (char *)data;
     char textout[16];
 
+    if (WINE_TRACE_ON (winsocktext))
+       DPRINTF ("winsocktext (%s): %.*s\n", (Sent ? "send" : "recv"),
+                (int)len, cdata);
+
     if (!WINE_TRACE_ON(winsockhex))
        return;
 
@@ -1265,7 +1270,7 @@
         dump_sockaddr (lpFrom);
 
     if (n > 0)
-       debug_hexdump (iov[0].iov_base, n);
+       debug_hexdump (iov[0].iov_base, n, FALSE);
 
 out:
 
@@ -1354,7 +1359,7 @@
     hdr.msg_controllen = 0;
     hdr.msg_flags = 0;
 
-    debug_hexdump (hdr.msg_iov[0].iov_base, hdr.msg_iov[0].iov_len);
+    debug_hexdump (hdr.msg_iov[0].iov_base, hdr.msg_iov[0].iov_len, TRUE);
 
     n = sendmsg (fd, &hdr, dwFlags);
 

Index: ws2_32.spec
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/winsock/ws2_32.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ws2_32.spec	31 Jul 2007 17:32:24 -0000	1.14
+++ ws2_32.spec	31 Jul 2007 18:02:29 -0000	1.15
@@ -11,7 +11,7 @@
 import kernel32.dll
 import ntdll.dll
 
-debug_channels (winsock winsockhex)
+debug_channels (winsock winsockhex winsocktext)
 
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WS_accept