From 9698333503f59d07ceb7d0b1bb89bacef05f37e8 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Wed, 3 Oct 2012 22:53:35 +0800
Subject: [PATCH] AcessNative - Fixed CLIShell

- NOTE: Bug with log output in worker threads? X crash
---
 AcessNative/acesskernel_src/server.c   | 28 +++++++++++++++++++-------
 AcessNative/acesskernel_src/syscalls.c |  2 +-
 AcessNative/ld-acess_src/exports.c     |  8 ++++----
 AcessNative/ld-acess_src/request.c     |  2 +-
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c
index 2f6b46fd..37694bfc 100644
--- 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 );
 	}
 	
@@ -133,7 +134,7 @@ int Server_WorkerThread(void *ClientPtr)
 	#if USE_TCP
 
 	while( *((volatile typeof(Client->Socket)*)&Client->Socket) == 0 )
-		SDL_Delay(10);
+		;
 	Threads_SetThread( Client->ClientID );
 	
 	for( ;; )
@@ -194,11 +195,16 @@ 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);
-			Log_Debug("Server", "%i bytes of data", len);
-			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;
@@ -361,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;
@@ -371,6 +377,7 @@ int Server_ListenThread(void *Unused)
 			// Some form of error?
 			Log_Warning("Server", "Client auth block bad size (%i != exp %i)",
 				len, sizeof(authhdr));
+			close(clientSock);
 			continue ;
 		}
 		
@@ -387,10 +394,17 @@ 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;
diff --git a/AcessNative/acesskernel_src/syscalls.c b/AcessNative/acesskernel_src/syscalls.c
index 9b9fda42..b945df81 100644
--- a/AcessNative/acesskernel_src/syscalls.c
+++ b/AcessNative/acesskernel_src/syscalls.c
@@ -4,7 +4,7 @@
  *
  * Syscall Distribution
  */
-#define DEBUG	0
+#define DEBUG	1
 #include <acess.h>
 #include <threads.h>
 #include <events.h>
diff --git a/AcessNative/ld-acess_src/exports.c b/AcessNative/ld-acess_src/exports.c
index 55606a8b..9ee04f17 100644
--- a/AcessNative/ld-acess_src/exports.c
+++ b/AcessNative/ld-acess_src/exports.c
@@ -118,8 +118,8 @@ int acess_finfo(int fd, t_sysFInfo *info, int maxacls) {
 		);
 }
 
-int acess_readdir(int fd, char *dest) {
-	DEBUG("readdir(%i, %p)", fd, dest);
+int acess_SysReadDir(int fd, char *dest) {
+	DEBUG("SysReadDir(%i, %p)", fd, dest);
 	return _Syscall(SYS_READDIR, ">i <d", fd, 256, dest);
 }
 
@@ -186,8 +186,8 @@ int acess_clone(int flags, void *stack)
 		if(ret == 0)
 		{
 			_CloseSyscalls();
-			_InitSyscalls();
 			giSyscall_ClientID = newID;
+			_InitSyscalls();
 			return 0;
 		}
 		
@@ -320,7 +320,7 @@ const tSym	caBuiltinSymbols[] = {
 	DEFSYM(tell),
 	DEFSYM(ioctl),
 	DEFSYM(finfo),
-	DEFSYM(readdir),
+	DEFSYM(SysReadDir),
 	DEFSYM(select),
 	DEFSYM(_SysOpenChild),
 	DEFSYM(_SysGetACL),
diff --git a/AcessNative/ld-acess_src/request.c b/AcessNative/ld-acess_src/request.c
index 670cc3d4..12a26d1a 100644
--- a/AcessNative/ld-acess_src/request.c
+++ b/AcessNative/ld-acess_src/request.c
@@ -1,6 +1,6 @@
 /*
  */
-#define DEBUG	1
+#define DEBUG	0
 
 
 #if DEBUG
-- 
2.20.1