Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix the win32 build for vc++

Browse Source
This commit is contained in:
Mark Vejvoda 2011-01-15 23:36:58 +00:00
parent 681db699a1
commit 61bc3902bb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/sources/feathery_ftp/ftpRuntime.c
View File

@ -247,9 +247,9 @@ if(VERBOSE_MODE_ENABLED) printf("ERROR: Connection refused; Session limit reache
*/ */
int ftpShutdown(void) int ftpShutdown(void)
{ {
if(VERBOSE_MODE_ENABLED) printf("About to Shutdown Feathery FTP-Server server [%d]\n",server);
int n; int n;
if(VERBOSE_MODE_ENABLED) printf("About to Shutdown Feathery FTP-Server server [%d]\n",server);
ftpUntrackSocket(server); ftpUntrackSocket(server);
ftpCloseSocket(&server); ftpCloseSocket(&server);
//ftpCloseSocket(serverPassivePort); //ftpCloseSocket(serverPassivePort);

6
source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c
View File

@ -211,8 +211,9 @@ int ftpRemoveDir(const char* path)
int ftpCloseSocket(socket_t *s) int ftpCloseSocket(socket_t *s)
{ {
int ret = 0;
if(VERBOSE_MODE_ENABLED) printf("\nClosing socket: %d\n",*s); if(VERBOSE_MODE_ENABLED) printf("\nClosing socket: %d\n",*s);
int ret = 0;
if(*s > 0) { if(*s > 0) {
shutdown((SOCKET)*s,2); shutdown((SOCKET)*s,2);
ret = closesocket((SOCKET)*s); ret = closesocket((SOCKET)*s);
@ -340,6 +341,7 @@ socket_t ftpAcceptDataConnection(socket_t listner)
struct sockaddr_in clientinfo; struct sockaddr_in clientinfo;
unsigned len; unsigned len;
SOCKET dataSocket; SOCKET dataSocket;
ip_t remoteIP;
len = sizeof(clientinfo); len = sizeof(clientinfo);
@ -352,7 +354,7 @@ socket_t ftpAcceptDataConnection(socket_t listner)
ftpCloseSocket(&listner); // Server-Socket wird nicht mehr gebrauch deshalb schließen ftpCloseSocket(&listner); // Server-Socket wird nicht mehr gebrauch deshalb schließen
ip_t remoteIP = ntohl(clientinfo.sin_addr.s_addr); remoteIP = ntohl(clientinfo.sin_addr.s_addr);
if(ftpIsValidClient && ftpIsValidClient(remoteIP) == 0) if(ftpIsValidClient && ftpIsValidClient(remoteIP) == 0)
{ {
if(VERBOSE_MODE_ENABLED) printf("Connection with %s is NOT a valid trusted client, dropping connection.\n", inet_ntoa(clientinfo.sin_addr)); if(VERBOSE_MODE_ENABLED) printf("Connection with %s is NOT a valid trusted client, dropping connection.\n", inet_ntoa(clientinfo.sin_addr));