X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fserver.c;h=45806e2b4f03f52e8ff2cebb45f186cfcd565035;hb=336ba8b200f6ca1d5d25f09a9d7ddac2e59b26d9;hp=489146705d01e2b1ae00fe5803a64fa889a00235;hpb=d5dd2208d51f71bbe084af41d924d381fa1d6866;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c index 48914670..45806e2b 100644 --- a/AcessNative/acesskernel_src/server.c +++ b/AcessNative/acesskernel_src/server.c @@ -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,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)); @@ -185,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"); @@ -195,7 +197,7 @@ int Server_WorkerThread(void *ClientPtr) } else { - Log_Debug("Server", "No params?"); +// Log_Debug("Server", "No params?"); } // Get buffer size @@ -221,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"); @@ -235,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;