From fc585499137f4b99cb55f2978f49e482ca321934 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Thu, 17 Dec 2015 23:58:01 +0100 Subject: [PATCH] =?UTF-8?q?Corrections=20d'affichage/fonctionnement=20rest?= =?UTF-8?q?e=20uniquement=20=C3=A0=20g=C3=A9rer=20le=20"core=20dump"=20du?= =?UTF-8?q?=20socket=20de=20serveur=20FTP=20invalide?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dep/server.c | 3 +-- dep/utility.c | 6 +++--- dep/utility.h | 1 + proxy_ftp.h | 2 +- test | Bin 22983 -> 22930 bytes 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dep/server.c b/dep/server.c index b1b8e63..93bb19b 100644 --- a/dep/server.c +++ b/dep/server.c @@ -186,7 +186,6 @@ void MANAGE_REQUEST(char* pRequest, int* USER_SOCKET, int* FTP_SOCKET, int* DUSE strcat(newRequest, "USER "); strcat(newRequest, userName); strcat(newRequest, "\r\n"); - printf("NEW REQ: [[%s]]\n", newRequest); strcpy(response, "USER xdrm\r\n"); } @@ -359,7 +358,7 @@ void MANAGE_RESPONSE(char* pAnswer, int* USER_SOCKET, int* FTP_SOCKET, int* DUSE /* 5. On vide le BUS DE COMMANDE du serveur FTP */ /* A. On définit un TIMEOUT (1 sec) */ - setSocketTimeout(FTP_SOCKET, 1); + setSocketTimeout(FTP_SOCKET, 0, 50); /* B. On attends une réponse */ tmp[2] = sread(FTP_SOCKET, BUFFER); diff --git a/dep/utility.c b/dep/utility.c index 80c7c75..faecd69 100644 --- a/dep/utility.c +++ b/dep/utility.c @@ -120,11 +120,11 @@ int sread(int* pSocket, char* pBuffer){ } -void setSocketTimeout(int* pSocket, const int pTimeout){ +void setSocketTimeout(int* pSocket, const int pSec, const int pUSec){ /* 1. On créé la structure contenant le timeout */ struct timeval timeout; - timeout.tv_sec = pTimeout; - timeout.tv_usec = 0; + timeout.tv_sec = pSec; + timeout.tv_usec = pUSec; setsockopt(*pSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(struct timeval)); diff --git a/dep/utility.h b/dep/utility.h index d27ba60..b6ef223 100644 --- a/dep/utility.h +++ b/dep/utility.h @@ -31,6 +31,7 @@ void splitFtpResponse(char* pAnswer, char* ftpCode, char* ftpText); */ int indexOf(char* haystack, char needle); +void setSocketTimeout(int* pSocket, const int pSec, const int pUSec); /* read/write socket */ diff --git a/proxy_ftp.h b/proxy_ftp.h index 9d5ab2e..1847708 100644 --- a/proxy_ftp.h +++ b/proxy_ftp.h @@ -33,7 +33,7 @@ #define THR 0x40 // FILTRE pour THREADS // possibilité de cumuler les DEBUGMODES -#define DEBUGMOD SCK // REVEALS + HEADER + THREADS +#define DEBUGMOD THREADS // REVEALS + HEADER + THREADS /* vars */ diff --git a/test b/test index 5d01d9c8abbe332a8886a42e68ee35830f71488a..4c9d26dc9246b3b55eea7bb2bec1f4e74b1dac37 100755 GIT binary patch delta 5601 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