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

- commented console output for FTP progress

This commit is contained in:
Mark Vejvoda 2011-01-16 03:44:55 +00:00
parent b54faa93f9
commit 1cc5f8c70e
5 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/include/feathery_ftp/ftp.h
View File

@ -189,4 +189,7 @@ extern int ftpSelect(int poll);
extern int ftpGetPassivePort();
extern int ftpGetListenPort();
extern int getLastSocketError();
extern const char * getLastSocketErrorText(int *errNumber);
#endif /* FTP_H_ */

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

@ -205,7 +205,9 @@ if(VERBOSE_MODE_ENABLED) printf("ERROR: Connection refused; Session limit reache
LEN_RXBUF - pSession->rxBufWriteIdx);
if(len <= 0) // has client shutdown the connection?
{
if(VERBOSE_MODE_ENABLED) printf("ftpExecute ERROR ON RECEIVE for socket = %d\n",ctrlSocket);
int errorNumber = len; //getLastSocketError();
const char *errText = getLastSocketErrorText(&errorNumber);
if(VERBOSE_MODE_ENABLED) printf("ftpExecute ERROR ON RECEIVE for socket = %d, data len = %d, error = %d [%s]\n",ctrlSocket,(LEN_RXBUF - pSession->rxBufWriteIdx),errorNumber,errText);
ftpUntrackSocket(ctrlSocket);
ftpCloseSession(n);

11
source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c
View File

@ -36,6 +36,7 @@
#include "ftpTypes.h"
#include "ftpConfig.h"
#include "ftp.h"
#include "errno.h"
ip_t ownIp;
@ -446,4 +447,14 @@ int ftpSelect(int poll)
}
}
int getLastSocketError() {
return errno;
}
const char * getLastSocketErrorText(int *errNumber) {
int errId = (errNumber != NULL ? *errNumber : getLastSocketError());
return strerror(errId);
}
#endif

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

@ -480,4 +480,13 @@ int ftpSelect(int poll)
}
}
int getLastSocketError() {
return WSAGetLastError();
}
const char * getLastSocketErrorText(int *errNumber) {
int errId = (errNumber != NULL ? *errNumber : getLastSocketError());
return WSAGetLastErrorMessage("",errId);
}
#endif

2
source/shared_lib/sources/platform/posix/miniftpclient.cpp
View File

@ -162,7 +162,7 @@ static long file_is_downloaded(void *data) {
}
int file_progress(struct FtpFile *out,double download_total, double download_now, double upload_total,double upload_now) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf(" download progress [%f][%f][%f][%f] ",download_total,download_now,upload_total,upload_now);
//if(SystemFlags::VERBOSE_MODE_ENABLED) printf(" download progress [%f][%f][%f][%f] ",download_total,download_now,upload_total,upload_now);
SystemFlags::OutputDebug(SystemFlags::debugNetwork," download progress [%f][%f][%f][%f] ",download_total,download_now,upload_total,upload_now);
if(out != NULL &&