X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Frequest.c;h=c5e89efc98de16e41eac0c22e51382d8ff75ee78;hb=7681237dd0061c95dd4b22ca1b5c8c3c8b8fae2e;hp=df6e5c5596c1a0d1d99ca3d0533676cc686e36fa;hpb=02cbaac1233be9c5228973a787431fa5e0aa178e;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/request.c b/AcessNative/ld-acess_src/request.c
index df6e5c55..c5e89efc 100644
--- a/AcessNative/ld-acess_src/request.c
+++ b/AcessNative/ld-acess_src/request.c
@@ -14,7 +14,11 @@
 #include "request.h"
 #include "../syscalls.h"
 
-#define	SERVER_PORT	0xACE
+#define USE_TCP	0
+
+// === PROTOTYPES ===
+void	SendData(void *Data, int Length);
+ int	ReadData(void *Dest, int MaxLen, int Timeout);
 
 // === GLOBALS ===
 #ifdef __WIN32__
@@ -26,13 +30,12 @@ SOCKET	gSocket = INVALID_SOCKET;
 #endif
 // Client ID to pass to server
 // TODO: Implement such that each thread gets a different one
-static int	siSyscall_ClientID = 0;
+ int	giSyscall_ClientID = 0;
+struct sockaddr_in	gSyscall_ServerAddr;
 
 // === CODE ===
 int _InitSyscalls()
 {
-	struct sockaddr_in	server;
-	struct sockaddr_in	client;
 	
 	#ifdef __WIN32__
 	/* Open windows connection */
@@ -43,10 +46,13 @@ int _InitSyscalls()
 	}
 	#endif
 	
+	#if USE_TCP
 	// Open TCP Connection
 	gSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	#else
 	// Open UDP Connection
-	//gSocket = socket(AF_INET, SOCK_DGRAM, 0);
+	gSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	#endif
 	if (gSocket == INVALID_SOCKET)
 	{
 		fprintf(stderr, "Could not create socket.\n");
@@ -57,18 +63,21 @@ int _InitSyscalls()
 	}
 	
 	// Set server address
-	memset((void *)&server, '\0', sizeof(struct sockaddr_in));
-	server.sin_family = AF_INET;
-	server.sin_port = htons(SERVER_PORT);
-	server.sin_addr.s_addr = htonl(0x7F00001);
+	memset((void *)&gSyscall_ServerAddr, '\0', sizeof(struct sockaddr_in));
+	gSyscall_ServerAddr.sin_family = AF_INET;
+	gSyscall_ServerAddr.sin_port = htons(SERVER_PORT);
+	gSyscall_ServerAddr.sin_addr.s_addr = htonl(0x7F000001);
 	
+	#if 0
 	// Set client address
 	memset((void *)&client, '\0', sizeof(struct sockaddr_in));
 	client.sin_family = AF_INET;
 	client.sin_port = htons(0);
-	client.sin_addr.s_addr = htonl(0x7F00001);
+	client.sin_addr.s_addr = htonl(0x7F000001);
+	#endif
 	
-	if( connect(gSocket, (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0 )
+	#if USE_TCP
+	if( connect(gSocket, (struct sockaddr *)&gSyscall_ServerAddr, sizeof(struct sockaddr_in)) < 0 )
 	{
 		fprintf(stderr, "Cannot connect to server (localhost:%i)\n", SERVER_PORT);
 		perror("_InitSyscalls");
@@ -80,6 +89,7 @@ int _InitSyscalls()
 		#endif
 		exit(0);
 	}
+	#endif
 	
 	#if 0
 	// Bind
@@ -96,118 +106,146 @@ int _InitSyscalls()
 	}
 	#endif
 	
+	#if !USE_TCP
+	// Ask server for a client ID
+	{
+		tRequestHeader	req;
+		 int	len;
+		req.ClientID = 0;
+		req.CallID = 0;
+		req.NParams = 0;
+		
+		SendData(&req, sizeof(req));
+		
+		len = ReadData(&req, sizeof(req), 5);
+		if( len == 0 ) {
+			fprintf(stderr, "Unable to connect to server (localhost:%i)\n", SERVER_PORT);
+			exit(-1);
+		}
+		
+		giSyscall_ClientID = req.ClientID;
+	}
+	#endif
+	
 	return 0;
 }
 
-int SendRequest(int RequestID, int NumOutput, tOutValue **Output, int NumInput, tInValue **Input)
+int SendRequest(tRequestHeader *Request, int RequestSize)
 {
-	tRequestHeader	*request;
-	tRequestValue	*value;
-	char	*data;
-	 int	requestLen;
-	 int	i;
-	
 	if( gSocket == INVALID_SOCKET )
 	{
 		_InitSyscalls();		
 	}
 	
-	// See ../syscalls.h for details of request format
-	requestLen = sizeof(tRequestHeader) + (NumOutput + NumInput) * sizeof(tRequestValue);
-	
-	// Get total param length
-	for( i = 0; i < NumOutput; i ++ )
-		requestLen += Output[i]->Length;
-	
-	// Allocate request
-	request = malloc( requestLen );
-	value = request->Params;
-	data = (char*)&request->Params[ NumOutput + NumInput ];
-	
 	// Set header
-	request->ClientID = siSyscall_ClientID;
-	request->CallID = RequestID;	// Syscall
-	request->NParams = NumOutput;
-	request->NReturn = NumInput;
-	
-	// Set parameters
-	for( i = 0; i < NumOutput; i ++ )
-	{
-		switch(Output[i]->Type)
-		{
-		case 'i':	value->Type = ARG_TYPE_INT32;	break;
-		case 'I':	value->Type = ARG_TYPE_INT64;	break;
-		case 'd':	value->Type = ARG_TYPE_DATA;	break;
-		case 's':	value->Type = ARG_TYPE_DATA;	break;
-		default:
-			fprintf(stderr, __FILE__" SendRequest: Unknown output type '%c'\n",
-				Output[i]->Type);
-			return -1;
-		}
-		value->Length = Output[i]->Length;
-		
-		memcpy(data, Output[i]->Data, Output[i]->Length);
-		
-		value ++;
-		data += Output[i]->Length;
-	}
+	Request->ClientID = giSyscall_ClientID;
 	
-	// Set return values
-	for( i = 0; i < NumInput; i ++ )
-	{
-		switch(Input[i]->Type)
-		{
-		case 'i':	value->Type = ARG_TYPE_INT32;	break;
-		case 'I':	value->Type = ARG_TYPE_INT64;	break;
-		case 'd':	value->Type = ARG_TYPE_DATA;	break;
-		default:
-			fprintf(stderr, " SendRequest: Unknown input type '%c'\n",
-				Input[i]->Type);
-			return -1;
-		}
-		value->Length = Input[i]->Length;
-		value ++;
-	}
 	#if 0
-	printf("value = %p\n", value);
 	{
-		for(i=0;i<requestLen;i++)
+		for(i=0;i<RequestSize;i++)
 		{
-			printf("%02x ", ((uint8_t*)request)[i]);
+			printf("%02x ", ((uint8_t*)Request)[i]);
 			if( i % 16 == 15 )	printf("\n");
 		}
 		printf("\n");
 	}
 	#endif
+	{
+		 int	i;
+		char	*data = (char*)&Request->Params[Request->NParams];
+		printf("Request #%i\n", Request->CallID);
+		for( i = 0; i < Request->NParams; i ++ )
+		{
+			printf("%i: ", i);
+			switch(Request->Params[i].Type)
+			{
+			case ARG_TYPE_INT32:
+				printf("INT32 %x", *(uint32_t*)data);
+				data += sizeof(uint32_t);
+				break;
+			case ARG_TYPE_INT64:
+				printf("INT64 %llx", *(uint64_t*)data);
+				data += sizeof(uint64_t);
+				break;
+			case ARG_TYPE_STRING:
+				printf("STRING '%s'", (char*)data);
+				data += Request->Params[i].Length;
+				break;
+			case ARG_TYPE_DATA:
+				printf("DATA %i %p", Request->Params[i].Length, (char*)data);
+				data += Request->Params[i].Length;
+				break;
+			}
+			printf("\n");
+		}
+	}
 	
 	// Send it off
-	if( send(gSocket, request, requestLen, 0) != requestLen ) {
-		fprintf(stderr, "SendRequest: send() failed\n");
-		perror("SendRequest - send");
-		free( request );
-		return -1;
+	SendData(Request, RequestSize);
+	
+	// Wait for a response (no timeout)
+	return ReadData(Request, RequestSize, 0);
+}
+
+void SendData(void *Data, int Length)
+{
+	 int	len;
+	
+	#if USE_TCP
+	len = send(Data, Length, 0);
+	#else
+	len = sendto(gSocket, Data, Length, 0,
+		(struct sockaddr*)&gSyscall_ServerAddr, sizeof(gSyscall_ServerAddr));
+	#endif
+	
+	if( len != Length ) {
+		perror("SendData");
+		exit(-1);
+	}
+}
+
+int ReadData(void *Dest, int MaxLength, int Timeout)
+{
+	 int	ret;
+	fd_set	fds;
+	struct timeval	tv;
+	struct timeval	*timeoutPtr;
+	
+	FD_ZERO(&fds);
+	FD_SET(gSocket, &fds);
+	
+	if( Timeout ) {
+		tv.tv_sec = Timeout;
+		tv.tv_usec = 0;
+		timeoutPtr = &tv;
+	}
+	else {
+		timeoutPtr = NULL;
 	}
 	
-	// Wait for a response
-	requestLen = recv(gSocket, request, requestLen, 0);
-	if( requestLen < 0 ) {
-		fprintf(stderr, "SendRequest: revc() failed\n");
-		perror("SendRequest - recv");
-		free( request );
-		return -1;
+	ret = select(gSocket+1, &fds, NULL, NULL, timeoutPtr);
+	if( ret == -1 ) {
+		perror("ReadData - select");
+		exit(-1);
 	}
 	
-	// Parse response out
-	if( request->NParams != NumInput ) {
-		fprintf(stderr, "SendRequest: Unexpected number of values retured (%i, exp %i)\n",
-			request->NParams, NumInput
-			);
-		free( request );
-		return -1;
+	if( !ret ) {
+		printf("Timeout reading from socket\n");
+		return 0;	// Timeout
 	}
 	
-	// Free memory
-	free( request );
+	#if USE_TCP
+	ret = recv(gSocket, Dest, MaxLength, 0);
+	#else
+	ret = recvfrom(gSocket, Dest, MaxLength, 0, NULL, 0);
+	#endif
 	
-	return 0;
+	if( ret < 0 ) {
+		perror("ReadData");
+		exit(-1);
+	}
+	
+	printf("%i bytes read from socket\n", ret);
+	
+	return ret;
 }