X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fserver.c;h=0930fd5888d04c7f939adc077a11e2a912722396;hb=d02a9dd1f6752a65efe6a8326a86a288a4165c94;hp=7919979878f67deeb1d67862f123131891788745;hpb=33de4e7776814ede6263b6563f5b8ff3ff20e33e;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c index 79199798..0930fd58 100644 --- a/AcessNative/acesskernel_src/server.c +++ b/AcessNative/acesskernel_src/server.c @@ -19,7 +19,7 @@ typedef int socklen_t; # include # include # include -# include // inet_ntop +# include // getaddrinfo #endif #define DONT_INCLUDE_SYSCALL_NAMES #include "../syscalls.h" @@ -136,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 ); @@ -153,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) ) { @@ -161,7 +160,7 @@ 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); +// Log_Debug("Server", "%i bytes of header", len); if( len == 0 ) break; if( len == -1 ) { perror("recv header"); @@ -185,7 +184,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"); @@ -195,7 +194,7 @@ int Server_WorkerThread(void *ClientPtr) } else { - Log_Debug("Server", "No params?"); +// Log_Debug("Server", "No params?"); } // Get buffer size @@ -221,7 +220,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"); @@ -235,8 +234,8 @@ int Server_WorkerThread(void *ClientPtr) break; } } - else - Log_Debug("Server", "no data"); +// else +// Log_Debug("Server", "no data"); int retlen; tRequestHeader *retHeader;