/*
*/
+#define DEBUG 0
+
+
+#if DEBUG
+# define DEBUG_S printf
+#else
+# define DEBUG_S(...)
+# define DONT_INCLUDE_SYSCALL_NAMES
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#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);
+ fprintf(stderr, "[ERROR -] ", giSyscall_ClientID);
perror("_InitSyscalls");
#if __WIN32__
closesocket(gSocket);
#endif
exit(0);
}
+ giSyscall_ClientID = gSocket; // A bit of a hack really :(
#endif
#if 0
#if !USE_TCP
// Ask server for a client ID
+ if( !giSyscall_ClientID )
{
tRequestHeader req;
int len;
req.ClientID = 0;
req.CallID = 0;
req.NParams = 0;
- req.NReturn = 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;
}
return 0;
}
-int SendRequest(int RequestID, int NumOutput, tOutValue **Output, int NumInput, tInValue **Input)
+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 = giSyscall_ClientID;
- request->CallID = RequestID; // Syscall
- request->NParams = NumOutput;
- request->NReturn = NumInput;
+ Request->ClientID = giSyscall_ClientID;
- // 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;
- }
-
- // 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];
+ DEBUG_S("Request #%i (%s) -", Request->CallID, casSYSCALL_NAMES[Request->CallID]);
+ for( i = 0; i < Request->NParams; i ++ )
+ {
+ 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%016llx", *(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");
+ }
// Send it off
- SendData(request, requestLen);
-
+ SendData(Request, RequestSize);
+
+ if( Request->CallID == SYS_EXIT ) return 0;
+
// Wait for a response (no timeout)
- requestLen = ReadData(request, requestLen, -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;
- }
-
- // Free memory
- free( request );
-
- return 0;
+ return ReadData(Request, ResponseSize, 0);
}
void SendData(void *Data, int Length)
#endif
if( len != Length ) {
+ fprintf(stderr, "[ERROR %i] ", giSyscall_ClientID);
perror("SendData");
exit(-1);
}
int ret;
fd_set fds;
struct timeval tv;
+ struct timeval *timeoutPtr;
FD_ZERO(&fds);
FD_SET(gSocket, &fds);
- tv.tv_sec = Timeout;
- tv.tv_usec = 0;
+ if( Timeout ) {
+ tv.tv_sec = Timeout;
+ tv.tv_usec = 0;
+ timeoutPtr = &tv;
+ }
+ else {
+ timeoutPtr = NULL;
+ }
- ret = select(1, &fds, NULL, NULL, &tv);
+ ret = select(gSocket+1, &fds, NULL, NULL, timeoutPtr);
if( ret == -1 ) {
+ fprintf(stderr, "[ERROR %i] ", giSyscall_ClientID);
perror("ReadData - select");
exit(-1);
}
if( !ret ) {
- printf("Timeout reading from socket\n");
+ printf("[ERROR %i] Timeout reading from socket\n", giSyscall_ClientID);
return 0; // Timeout
}
#endif
if( ret < 0 ) {
+ fprintf(stderr, "[ERROR %i] ", giSyscall_ClientID);
perror("ReadData");
exit(-1);
}
+ DEBUG_S("%i bytes read from socket\n", ret);
+
return ret;
}