AcessNative - Fixed CLIShell

[tpg/acess2.git] / AcessNative / acesskernel_src / server.c

diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c
index 2e3f3a9..37694bf 100644 (file)
--- a/AcessNative/acesskernel_src/server.c
+++ b/AcessNative/acesskernel_src/server.c
@@ -118,6 +118,7 @@ tClient *Server_GetClient(int ClientID)
                ret->Mutex = SDL_CreateMutex();
                SDL_mutexP( ret->Mutex );
                #endif
+               Log_Debug("Server", "Creating worker for %p", ret);
                ret->WorkerThread = SDL_CreateThread( Server_WorkerThread, ret );
        }
        
@@ -127,32 +128,53 @@ tClient *Server_GetClient(int ClientID)
 int Server_WorkerThread(void *ClientPtr)
 {
        tClient *Client = ClientPtr;
-       
+
+       Log_Debug("Server", "Worker %p", ClientPtr);    
+
        #if USE_TCP
+
+       while( *((volatile typeof(Client->Socket)*)&Client->Socket) == 0 )
+               ;
+       Threads_SetThread( Client->ClientID );
+       
        for( ;; )
        {
                fd_set  fds;
-                int    nfd = Client->Socket;
+                int    nfd = Client->Socket+1;
                FD_ZERO(&fds);
                FD_SET(Client->Socket, &fds);
                
-               select(nfd, &fds, NULL, NULL, NULL);    // TODO: Timeouts?
-               
+               int rv = select(nfd, &fds, NULL, NULL, NULL);   // TODO: Timeouts?
+               if(rv < 0) {
+                       perror("select");
+                       continue ;
+               }
+               Log_Debug("Server", "%p: rv=%i", Client, rv);           
+
                if( FD_ISSET(Client->Socket, &fds) )
                {
                        const int       ciMaxParamCount = 6;
                        char    lbuf[sizeof(tRequestHeader) + ciMaxParamCount*sizeof(tRequestValue)];
                        tRequestHeader  *hdr = (void*)lbuf;
                        size_t  len = recv(Client->Socket, hdr, sizeof(*hdr), 0);
-                       if( len != sizeof(hdr) ) {
+                       Log_Debug("Server", "%i bytes of header", len);
+                       if( len == 0 )  break;
+                       if( len != sizeof(*hdr) ) {
                                // Oops?
+                               Log_Warning("Server", "FD%i bad sized (%i != exp %i)",
+                                       Client->Socket, len, sizeof(*hdr));
+                               continue ;
                        }
 
                        if( hdr->NParams > ciMaxParamCount ) {
                                // Oops.
+                               Log_Warning("Server", "FD%i too many params (%i > max %i)",
+                                       Client->Socket, hdr->NParams, ciMaxParamCount);
+                               continue ;
                        }
 
                        len = recv(Client->Socket, hdr->Params, hdr->NParams*sizeof(tRequestValue), 0);
+                       Log_Debug("Server", "%i bytes of params", len);
                        if( len != hdr->NParams*sizeof(tRequestValue) ) {
                                // Oops.
                        }
@@ -173,16 +195,24 @@ int Server_WorkerThread(void *ClientPtr)
                        // Allocate full buffer
                        hdr = malloc(bufsize);
                        memcpy(hdr, lbuf, hdrsize);
-                       len = recv(Client->Socket, hdr->Params + hdr->NParams, bufsize - hdrsize, 0);
-                       if( len != bufsize - hdrsize ) {
-                               // Oops?
+                       if( bufsize > hdrsize )
+                       {
+                               len = recv(Client->Socket, hdr->Params + hdr->NParams, bufsize - hdrsize, 0);
+                               Log_Debug("Server", "%i bytes of data", len);
+                               if( len != bufsize - hdrsize ) {
+                                       // Oops?
+                               }
                        }
+                       else
+                               Log_Debug("Server", "no data");
 
                         int    retlen;
                        tRequestHeader  *retHeader;
                        retHeader = SyscallRecieve(hdr, &retlen);
                        if( !retHeader ) {
                                // Some sort of error
+                               Log_Warning("Server", "SyscallRecieve failed?");
+                               continue ;
                        }
                        
                        send(Client->Socket, retHeader, retlen, 0); 
@@ -259,6 +289,8 @@ int Server_WorkerThread(void *ClientPtr)
                        free( retHeader );
        }
        #endif
+       Log_Notice("Server", "Terminated Worker %p", ClientPtr);        
+       return 0;
 }
 
 int SyscallServer(void)
@@ -335,7 +367,7 @@ int Server_ListenThread(void *Unused)
 
                char    addrstr[4*8+8+1];
                inet_ntop(clientaddr.sin_family, &clientaddr.sin_addr, addrstr, sizeof(addrstr));
-               Log_Debug("Server", "Client connection %s:%i\n", addrstr, ntohs(clientaddr.sin_port));
+               Log_Debug("Server", "Client connection %s:%i", addrstr, ntohs(clientaddr.sin_port));
                
                // Perform auth
                size_t  len;
@@ -343,8 +375,14 @@ int Server_ListenThread(void *Unused)
                len = recv(clientSock, &authhdr, sizeof(authhdr), 0);
                if( len != sizeof(authhdr) ) {
                        // Some form of error?
+                       Log_Warning("Server", "Client auth block bad size (%i != exp %i)",
+                               len, sizeof(authhdr));
+                       close(clientSock);
+                       continue ;
                }
                
+               Log_Debug("Server", "Client assumed PID %i", authhdr.pid);
+
                tClient *client;
                if( authhdr.pid == 0 ) {
                        // Allocate PID and client structure/thread
@@ -356,15 +394,23 @@ int Server_ListenThread(void *Unused)
                        // Get client structure and make sure it's unused
                        // - Auth token / verifcation?
                        client = Server_GetClient(authhdr.pid);
+                       if( !client ) {
+                               Log_Warning("Server", "Can't allocate a client struct for %s:%i",
+                                       addrstr, clientaddr.sin_port);
+                               close(clientSock);
+                               continue ;
+                       }
                        if( client->Socket != 0 ) {
                                Log_Warning("Server", "Client (%i)%p owned by FD%i but %s:%i tried to use it",
                                        authhdr.pid, client, addrstr, clientaddr.sin_port);
-                               authhdr.pid = 0;
+                               close(clientSock);
+                               continue;
                        }
                        else {
                                client->Socket = clientSock;
                        }
                }
+               Log_Debug("Server", "Client given PID %i - info %p", authhdr.pid, client);
                
                len = send(clientSock, &authhdr, sizeof(authhdr), 0);
                if( len != sizeof(authhdr) ) {