X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fserver.c;h=45806e2b4f03f52e8ff2cebb45f186cfcd565035;hb=8e1f78107cc9aa137de29e0c9df3a1fccb483b67;hp=82d4e700d54e7c09c8762517f223b7aa00d79a47;hpb=510431249326d5a44fc502ed5cf798b79a442ce8;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c
index 82d4e700..45806e2b 100644
--- a/AcessNative/acesskernel_src/server.c
+++ b/AcessNative/acesskernel_src/server.c
@@ -19,8 +19,7 @@ typedef int	socklen_t;
 # include <unistd.h>
 # include <sys/socket.h>
 # include <netinet/in.h>
-# include <arpa/inet.h>	// inet_ntop
-# include "include/windows_helpers.h"
+# include <netdb.h>	// getaddrinfo
 #endif
 #define DONT_INCLUDE_SYSCALL_NAMES
 #include "../syscalls.h"
@@ -137,7 +136,6 @@ int Server_WorkerThread(void *ClientPtr)
 	Log_Debug("Server", "Worker %p", ClientPtr);	
 
 	#if USE_TCP
-
 	while( *((volatile typeof(Client->Socket)*)&Client->Socket) == 0 )
 		;
 	Threads_SetThread( Client->ClientID );
@@ -154,7 +152,7 @@ int Server_WorkerThread(void *ClientPtr)
 			perror("select");
 			continue ;
 		}
-		Log_Debug("Server", "%p: rv=%i", Client, rv);		
+//		Log_Debug("Server", "%p: rv=%i", Client, rv);		
 
 		if( FD_ISSET(Client->Socket, &fds) )
 		{
@@ -162,8 +160,11 @@ int Server_WorkerThread(void *ClientPtr)
 			char	lbuf[sizeof(tRequestHeader) + ciMaxParamCount*sizeof(tRequestValue)];
 			tRequestHeader	*hdr = (void*)lbuf;
 			size_t	len = recv(Client->Socket, (void*)hdr, sizeof(*hdr), 0);
-			Log_Debug("Server", "%i bytes of header", len);
-			if( len == 0 )	break;
+//			Log_Debug("Server", "%i bytes of header", len);
+			if( len == 0 ) {
+				Log_Notice("Server", "Zero RX on %i (worker %p)", Client->Socket, Client);
+				break;
+			}
 			if( len == -1 ) {
 				perror("recv header");
 //				Log_Warning("Server", "recv() error - %s", strerror(errno));
@@ -186,7 +187,7 @@ int Server_WorkerThread(void *ClientPtr)
 			if( hdr->NParams > 0 )
 			{
 				len = recv(Client->Socket, (void*)hdr->Params, hdr->NParams*sizeof(tRequestValue), 0);
-				Log_Debug("Server", "%i bytes of params", len);
+//				Log_Debug("Server", "%i bytes of params", len);
 				if( len != hdr->NParams*sizeof(tRequestValue) ) {
 					// Oops.
 					perror("recv params");
@@ -196,7 +197,7 @@ int Server_WorkerThread(void *ClientPtr)
 			}
 			else
 			{
-				Log_Debug("Server", "No params?");
+//				Log_Debug("Server", "No params?");
 			}
 
 			// Get buffer size
@@ -222,7 +223,7 @@ int Server_WorkerThread(void *ClientPtr)
 				while( rem )
 				{
 					len = recv(Client->Socket, ptr, rem, 0);
-					Log_Debug("Server", "%i bytes of data", len);
+//					Log_Debug("Server", "%i bytes of data", len);
 					if( len == -1 ) {
 						// Oops?
 						perror("recv data");
@@ -236,8 +237,8 @@ int Server_WorkerThread(void *ClientPtr)
 					break;
 				}
 			}
-			else
-				Log_Debug("Server", "no data");
+//			else
+//				Log_Debug("Server", "no data");
 
 			 int	retlen;
 			tRequestHeader	*retHeader;