X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Frequest.c;h=62e70e8bd853a13945280adff9efa2fd439eccfa;hb=5b5ee32779c93bf44c03d91ea6476eb9a711d231;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..62e70e8b 100644 --- a/AcessNative/ld-acess_src/request.c +++ b/AcessNative/ld-acess_src/request.c @@ -1,8 +1,19 @@ /* */ +#define DEBUG 1 + + +#if DEBUG +# define DEBUG_S printf +#else +# define DEBUG_S(...) +# define DONT_INCLUDE_SYSCALL_NAMES +#endif + #include #include #include +#include #ifdef __WIN32__ # include # include @@ -14,7 +25,11 @@ #include "request.h" #include "../syscalls.h" -#define SERVER_PORT 0xACE +#define USE_TCP 1 + +// === PROTOTYPES === +void SendData(void *Data, int Length); + int ReadData(void *Dest, int MaxLen, int Timeout); // === GLOBALS === #ifdef __WIN32__ @@ -26,14 +41,21 @@ 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() +void Request_Preinit(void) +{ + // Set server address + 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); +} + +int _InitSyscalls(void) { - struct sockaddr_in server; - struct sockaddr_in client; - #ifdef __WIN32__ /* Open windows connection */ if (WSAStartup(0x0101, &gWinsock) != 0) @@ -43,10 +65,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"); @@ -56,23 +81,13 @@ int _InitSyscalls() exit(0); } - // 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); - - // 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); - - 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); + fprintf(stderr, "[ERROR -] Cannot connect to server (localhost:%i)\n", SERVER_PORT); perror("_InitSyscalls"); #if __WIN32__ + fprintf(stderr, "[ERROR -] - WSAGetLastError said %i", WSAGetLastError()); closesocket(gSocket); WSACleanup(); #else @@ -80,8 +95,14 @@ int _InitSyscalls() #endif exit(0); } + #endif #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(0x7F000001); // Bind if( bind(gSocket, (struct sockaddr *)&client, sizeof(struct sockaddr_in)) == -1 ) { @@ -96,118 +117,238 @@ int _InitSyscalls() } #endif + #if USE_TCP + { + tRequestAuthHdr auth; + auth.pid = giSyscall_ClientID; + auth.key = 0; + SendData(&auth, sizeof(auth)); + int len = ReadData(&auth, sizeof(auth), 5); + if( len == 0 ) { + fprintf(stderr, "Timeout waiting for auth response\n"); + exit(-1); + } + giSyscall_ClientID = auth.pid; + } + #else + // Ask server for a client ID + if( !giSyscall_ClientID ) + { + 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) +/** + * \brief Close the syscall socket + * \note Used in acess_fork to get a different port number + */ +void _CloseSyscalls(void) +{ + #if __WIN32__ + closesocket(gSocket); + WSACleanup(); + #else + close(gSocket); + #endif +} + +int SendRequest(tRequestHeader *Request, int RequestSize, int ResponseSize) { - 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; + Request->ClientID = giSyscall_ClientID; - // Set parameters - for( i = 0; i < NumOutput; i ++ ) + #if 0 { - switch(Output[i]->Type) + for(i=0;iType = 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; + printf("%02x ", ((uint8_t*)Request)[i]); + if( i % 16 == 15 ) printf("\n"); } - value->Length = Output[i]->Length; - - memcpy(data, Output[i]->Data, Output[i]->Length); - - value ++; - data += Output[i]->Length; + printf("\n"); } - - // Set return values - for( i = 0; i < NumInput; i ++ ) + #endif + #if DEBUG { - switch(Input[i]->Type) + int i; + char *data = (char*)&Request->Params[Request->NParams]; + DEBUG_S("Request #%i (%s) -", Request->CallID, casSYSCALL_NAMES[Request->CallID]); + for( i = 0; i < Request->NParams; i ++ ) { - 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); + switch(Request->Params[i].Type) + { + case ARG_TYPE_INT32: + DEBUG_S(" 0x%08x", *(uint32_t*)data); + data += sizeof(uint32_t); + break; + case ARG_TYPE_INT64: + DEBUG_S(" 0x%016"PRIx64"", *(uint64_t*)data); + data += sizeof(uint64_t); + break; + case ARG_TYPE_STRING: + DEBUG_S(" '%s'", (char*)data); + data += Request->Params[i].Length; + break; + case ARG_TYPE_DATA: + DEBUG_S(" %p:0x%x", (char*)data, Request->Params[i].Length); + if( !(Request->Params[i].Flags & ARG_FLAG_ZEROED) ) + data += Request->Params[i].Length; + break; + } + } + DEBUG_S("\n"); + } + #endif + + // Send it off + SendData(Request, RequestSize); + + if( Request->CallID == SYS_EXIT ) return 0; + + // Wait for a response (no timeout) + 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; } - value->Length = Input[i]->Length; - value ++; + recvbytes += len; + ptr += len; } - #if 0 - printf("value = %p\n", value); + if( recvbytes > expbytes ) { + // TODO: Warning + } + + #if DEBUG { - for(i=0;iParams[Request->NParams]; + DEBUG_S(" Reply:"); + for( i = 0; i < Request->NParams; i ++ ) { - printf("%02x ", ((uint8_t*)request)[i]); - if( i % 16 == 15 ) printf("\n"); + switch(Request->Params[i].Type) + { + case ARG_TYPE_INT32: + DEBUG_S(" 0x%08x", *(uint32_t*)data); + data += sizeof(uint32_t); + break; + case ARG_TYPE_INT64: + DEBUG_S(" 0x%016"PRIx64"", *(uint64_t*)data); + data += sizeof(uint64_t); + break; + case ARG_TYPE_STRING: + DEBUG_S(" '%s'", (char*)data); + data += Request->Params[i].Length; + break; + case ARG_TYPE_DATA: + DEBUG_S(" %p:0x%x", (char*)data, Request->Params[i].Length); + if( !(Request->Params[i].Flags & ARG_FLAG_ZEROED) ) + data += Request->Params[i].Length; + break; + } } - printf("\n"); + DEBUG_S("\n"); } #endif + return recvbytes; +} + +void SendData(void *Data, int Length) +{ + int len; - // Send it off - if( send(gSocket, request, requestLen, 0) != requestLen ) { - fprintf(stderr, "SendRequest: send() failed\n"); - perror("SendRequest - send"); - free( request ); - return -1; + #if USE_TCP + len = send(gSocket, Data, Length, 0); + #else + len = sendto(gSocket, Data, Length, 0, + (struct sockaddr*)&gSyscall_ServerAddr, sizeof(gSyscall_ServerAddr)); + #endif + + if( len != Length ) { + fprintf(stderr, "[ERROR %i] ", giSyscall_ClientID); + perror("SendData"); + exit(-1); } +} + +int ReadData(void *Dest, int MaxLength, int Timeout) +{ + int ret; + fd_set fds; + struct timeval tv; + struct timeval *timeoutPtr; - // 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; + FD_ZERO(&fds); + FD_SET(gSocket, &fds); + + if( Timeout ) { + tv.tv_sec = Timeout; + tv.tv_usec = 0; + timeoutPtr = &tv; + } + else { + timeoutPtr = NULL; } - // 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; + ret = select(gSocket+1, &fds, NULL, NULL, timeoutPtr); + if( ret == -1 ) { + fprintf(stderr, "[ERROR %i] ", giSyscall_ClientID); + perror("ReadData - select"); + exit(-1); } - // Free memory - free( request ); + if( !ret ) { + printf("[ERROR %i] Timeout reading from socket\n", giSyscall_ClientID); + return -2; // Timeout + } - return 0; + #if USE_TCP + ret = recv(gSocket, Dest, MaxLength, 0); + #else + ret = recvfrom(gSocket, Dest, MaxLength, 0, NULL, 0); + #endif + + if( ret < 0 ) { + fprintf(stderr, "[ERROR %i] ", giSyscall_ClientID); + perror("ReadData"); + exit(-1); + } + if( ret == 0 ) { + fprintf(stderr, "[ERROR %i] Connection closed.\n", giSyscall_ClientID); + #if __WIN32__ + closesocket(gSocket); + #else + close(gSocket); + #endif + exit(0); + } + + DEBUG_S("%i bytes read from socket\n", ret); + + return ret; }