X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=AcessNative%2Fld-acess_src%2Frequest.c;h=7a9b3b39cb23234171de7e05c4975031f101b2c1;hb=510431249326d5a44fc502ed5cf798b79a442ce8;hp=2117591db8795443077c1aa7bde52577021dd902;hpb=6d32a3c22e659994d7ae6164ba3722ab12d11421;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/request.c b/AcessNative/ld-acess_src/request.c
index 2117591d..7a9b3b39 100644
--- a/AcessNative/ld-acess_src/request.c
+++ b/AcessNative/ld-acess_src/request.c
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <inttypes.h>
 #ifdef __WIN32__
 # include <windows.h>
 # include <winsock.h>
@@ -24,7 +25,7 @@
 #include "request.h"
 #include "../syscalls.h"
 
-#define USE_TCP	0
+#define USE_TCP	1
 
 // === PROTOTYPES ===
 void	SendData(void *Data, int Length);
@@ -91,7 +92,6 @@ int _InitSyscalls(void)
 	if( connect(gSocket, (struct sockaddr *)&gSyscall_ServerAddr, sizeof(struct sockaddr_in)) < 0 )
 	{
 		fprintf(stderr, "[ERROR -] Cannot connect to server (localhost:%i)\n", SERVER_PORT);
-		fprintf(stderr, "[ERROR -] ", giSyscall_ClientID);
 		perror("_InitSyscalls");
 		#if __WIN32__
 		closesocket(gSocket);
@@ -118,7 +118,20 @@ int _InitSyscalls(void)
 	}
 	#endif
 	
-	#if !USE_TCP
+	#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 )
 	{
@@ -190,7 +203,7 @@ int SendRequest(tRequestHeader *Request, int RequestSize, int ResponseSize)
 				data += sizeof(uint32_t);
 				break;
 			case ARG_TYPE_INT64:
-				DEBUG_S(" 0x%016llx", *(uint64_t*)data);
+				DEBUG_S(" 0x%016"PRIx64"", *(uint64_t*)data);
 				data += sizeof(uint64_t);
 				break;
 			case ARG_TYPE_STRING:
@@ -221,7 +234,7 @@ void SendData(void *Data, int Length)
 	 int	len;
 	
 	#if USE_TCP
-	len = send(Data, Length, 0);
+	len = send(gSocket, Data, Length, 0);
 	#else
 	len = sendto(gSocket, Data, Length, 0,
 		(struct sockaddr*)&gSyscall_ServerAddr, sizeof(gSyscall_ServerAddr));