git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://localhost/acess2
[tpg/acess2.git]
/
AcessNative
/
ld-acess_src
/
request.c
diff --git
a/AcessNative/ld-acess_src/request.c
b/AcessNative/ld-acess_src/request.c
index
1560eb7
..
2fa481a
100644
(file)
--- a/
AcessNative/ld-acess_src/request.c
+++ b/
AcessNative/ld-acess_src/request.c
@@
-1,6
+1,6
@@
/*
*/
/*
*/
-#define DEBUG
0
+#define DEBUG
1
#if DEBUG
#if DEBUG
@@
-51,6
+51,7
@@
void Request_Preinit(void)
memset((void *)&gSyscall_ServerAddr, '\0', sizeof(struct sockaddr_in));
gSyscall_ServerAddr.sin_family = AF_INET;
gSyscall_ServerAddr.sin_port = htons(SERVER_PORT);
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)
}
int _InitSyscalls(void)
@@
-80,20
+81,13
@@
int _InitSyscalls(void)
exit(0);
}
exit(0);
}
- #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);
- #endif
-
#if USE_TCP
if( connect(gSocket, (struct sockaddr *)&gSyscall_ServerAddr, sizeof(struct sockaddr_in)) < 0 )
{
fprintf(stderr, "[ERROR -] Cannot connect to server (localhost:%i)\n", SERVER_PORT);
perror("_InitSyscalls");
#if __WIN32__
#if USE_TCP
if( connect(gSocket, (struct sockaddr *)&gSyscall_ServerAddr, sizeof(struct sockaddr_in)) < 0 )
{
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
closesocket(gSocket);
WSACleanup();
#else
@@
-104,6
+98,11
@@
int _InitSyscalls(void)
#endif
#if 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 )
{
// Bind
if( bind(gSocket, (struct sockaddr *)&client, sizeof(struct sockaddr_in)) == -1 )
{
@@
-293,7
+292,7
@@
int ReadData(void *Dest, int MaxLength, int Timeout)
if( !ret ) {
printf("[ERROR %i] Timeout reading from socket\n", giSyscall_ClientID);
if( !ret ) {
printf("[ERROR %i] Timeout reading from socket\n", giSyscall_ClientID);
- return
0;
// Timeout
+ return
-2;
// Timeout
}
#if USE_TCP
}
#if USE_TCP
@@
-307,6
+306,15
@@
int ReadData(void *Dest, int MaxLength, int Timeout)
perror("ReadData");
exit(-1);
}
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);
DEBUG_S("%i bytes read from socket\n", ret);
UCC
git Repository :: git.ucc.asn.au