X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Frequest.c;h=5bcf8cd302c65b9e9e73fcc9f5c3ef3aed350540;hb=590ae24e57553f79a92d6ef52c0468c07aa5de22;hp=7a9b3b39cb23234171de7e05c4975031f101b2c1;hpb=5e2eec749173135a9639e5732f229e002c0b02d0;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/request.c b/AcessNative/ld-acess_src/request.c
index 7a9b3b39..5bcf8cd3 100644
--- a/AcessNative/ld-acess_src/request.c
+++ b/AcessNative/ld-acess_src/request.c
@@ -190,6 +190,7 @@ int SendRequest(tRequestHeader *Request, int RequestSize, int ResponseSize)
 		printf("\n");
 	}
 	#endif
+	#if DEBUG
 	{
 		 int	i;
 		char	*data = (char*)&Request->Params[Request->NParams];
@@ -219,6 +220,7 @@ int SendRequest(tRequestHeader *Request, int RequestSize, int ResponseSize)
 		}
 		DEBUG_S("\n");
 	}
+	#endif
 	
 	// Send it off
 	SendData(Request, RequestSize);
@@ -226,7 +228,23 @@ int SendRequest(tRequestHeader *Request, int RequestSize, int ResponseSize)
 	if( Request->CallID == SYS_EXIT )	return 0;
 
 	// Wait for a response (no timeout)
-	return ReadData(Request, ResponseSize, 0);
+	ReadData(Request, sizeof(*Request), 0);
+	// TODO: Sanity
+	size_t	recvbytes = sizeof(*Request), expbytes = Request->MessageLength;
+	char	*ptr = (void*)Request->Params;
+	while( recvbytes < expbytes )
+	{
+		size_t	len = ReadData(ptr, expbytes - recvbytes, 1000);
+		if( len == -1 ) {
+			return -1;
+		}
+		recvbytes += len;
+		ptr += len;
+	}
+	if( recvbytes > expbytes ) {
+		// TODO: Warning
+	}
+	return recvbytes;
 }
 
 void SendData(void *Data, int Length)
@@ -275,7 +293,7 @@ int ReadData(void *Dest, int MaxLength, int Timeout)
 	
 	if( !ret ) {
 		printf("[ERROR %i] Timeout reading from socket\n", giSyscall_ClientID);
-		return 0;	// Timeout
+		return -2;	// Timeout
 	}
 	
 	#if USE_TCP
@@ -289,6 +307,11 @@ int ReadData(void *Dest, int MaxLength, int Timeout)
 		perror("ReadData");
 		exit(-1);
 	}
+	if( ret == 0 ) {
+		fprintf(stderr, "[ERROR %i] Connection closed.\n", giSyscall_ClientID);
+		close(gSocket);
+		exit(0);
+	}
 	
 	DEBUG_S("%i bytes read from socket\n", ret);