From bfe3d3335544553f599c8c14e461bd16effd9cbe Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 16 Dec 2015 11:11:11 +0100 Subject: [PATCH] =?UTF-8?q?M=C3=AAme=20pb=20=C3=A0=20r=C3=A9gler=20au=20ni?= =?UTF-8?q?veau=20du=20BUFFER=20post=20transaction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dep/client.c | 2 +- dep/server.c | 19 ++++++++++--------- proxy_ftp.c | 2 +- proxy_ftp.h | 2 +- test | Bin 22955 -> 22902 bytes 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dep/client.c b/dep/client.c index 35e3f22..ffd70b8 100644 --- a/dep/client.c +++ b/dep/client.c @@ -169,7 +169,7 @@ void CONNECT_CLIENT(char* serverHost, char* serverPort, int* pSocket){ void CLIENT_SEND(int* pSocket, char* pRequest, char** pAnswer){ - if( DEBUGMOD&HDR ) printf("====== CLIENT_SEND(%d, %s, %s) ======\n\n", *pSocket, pRequest, *pRequest); + if( DEBUGMOD&HDR ) printf("====== CLIENT_SEND(%d, %s, %s) ======\n\n", *pSocket, pRequest, *pAnswer); char BUFFER[maxBuffLen] = {0}; /* [5] On écrit sur la socket diff --git a/dep/server.c b/dep/server.c index 13707dc..0a39bed 100644 --- a/dep/server.c +++ b/dep/server.c @@ -92,8 +92,8 @@ void DROP_SERVER(char* serverHost, char** givenPort, int* listenSocket){ if( getInfo == -1 ) return; - if( DEBUGMOD&SCKL ) printf("Server host: %s\n", infoHost); - if( DEBUGMOD&SCKL ) printf("Server port: %s\n", infoPort); + if( DEBUGMOD&SCK ) printf("Server host: %s\n", infoHost); + if( DEBUGMOD&SCK ) printf("Server port: %s\n", infoPort); // on a plus besoin des infos de l'adresse @@ -271,10 +271,8 @@ void MANAGE_RESPONSE(int* USER_SOCKET, int* FTP_SOCKET, char* pAnswer, int* DUSE char BUFFER[maxBuffLen]; /* 1. Envoi au client de l'écoute de la réponse (associée) du BUS DE DONNEES */ - sread(FTP_SOCKET, BUFFER); - if( DEBUGMOD&CMD ) xPrint("F->P: %s\n", BUFFER); - swrite(USER_SOCKET, "150 Connection établie!\n"); - if( DEBUGMOD&CMD ) xPrint("P->C: %s\n", "150 Connection établie!\n"); + // sread(FTP_SOCKET, BUFFER); + // if( DEBUGMOD&CMD ) xPrint("F->P: %s\n", BUFFER); /* 2. On lit la SOCKET FTP (BUS DE DONNEES)*/ int nbRead = WAIT_SOCKET_UPDATE(DFTP_SOCKET, BUFFER); @@ -299,10 +297,13 @@ void MANAGE_RESPONSE(int* USER_SOCKET, int* FTP_SOCKET, char* pAnswer, int* DUSE // on vide les SOCKET FTP des 2 BUS - // WAIT_SOCKET_UPDATE(FTP_SOCKET, BUFFER); // command - // WAIT_SOCKET_UPDATE(DFTP_SOCKET, BUFFER); // données - // printf("") + WAIT_SOCKET_UPDATE(FTP_SOCKET, BUFFER); // command + if( DEBUGMOD&SCK ) printf("FTP[CMD] vidé: %s\n", BUFFER); + WAIT_SOCKET_UPDATE(DFTP_SOCKET, BUFFER); // données + if( DEBUGMOD&SCK ) printf("FTP[DAT] vidé: %s\n", BUFFER); + swrite(USER_SOCKET, "150 Connection établie!\n"); + if( DEBUGMOD&CMD ) xPrint("P->C: %s\n", "150 Connection établie!\n"); // fin de la transaction strcpy(response, "226 Données reçues!\n"); diff --git a/proxy_ftp.c b/proxy_ftp.c index f280052..d64fdeb 100644 --- a/proxy_ftp.c +++ b/proxy_ftp.c @@ -102,7 +102,7 @@ static void* testServer(char* localPort){ /* [5] Redirection vers le serveur FTP ============================================================================*/ - xPrint("P->F: %s\n\n", BUFFER); + if( DEBUGMOD&CMD ) xPrint("P->F: %s\n\n", BUFFER); CLIENT_SEND(&FTP_SOCKET, BUFFER, &ftp_response); if( DEBUGMOD&CMD ) xPrint("F->P: %s\n", ftp_response); diff --git a/proxy_ftp.h b/proxy_ftp.h index 8da8114..d5d7782 100644 --- a/proxy_ftp.h +++ b/proxy_ftp.h @@ -29,7 +29,7 @@ #define BUF 0x10 // FILTRE pour ONLY_BUFFERS #define HDR 0x20 // FILTRE pour ONLY_HEADERS -#define DEBUGMOD ONLY_SOCKETS +#define DEBUGMOD ONLY_REVEALS /* vars */ diff --git a/test b/test index 548c9f7e6fd3d899dc154c6b705a000e8b9882b5..12a900291586ae6ca6ff9f665a4d687cddcb84a8 100755 GIT binary patch delta 5866 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 Pt3GvEg;?LV{G#r^eJT`| delta 7833 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