removed double clean worker data

dbpaul · Feb 12, 2019 · 7e1826f · 7e1826f
1 parent 2a2961e
commit 7e1826f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/build/modules/connection.o b/build/modules/connection.o
diff --git a/build/modules/ftpCommandElaborate.o b/build/modules/ftpCommandElaborate.o
diff --git a/build/modules/ftpData.o b/build/modules/ftpData.o
diff --git a/build/uFTP b/build/uFTP
diff --git a/ftpCommandElaborate.c b/ftpCommandElaborate.c
@@ -1399,7 +1399,7 @@ long long int writeRetrFile(ftpDataType * data, int theSocketId, long long int s
       if (writtenSize <= 0)
       {
 
-    	  printf("\nError %d while writing retr file.");
+    	  printf("\nError %d while writing retr file.", writtenSize);
           fclose(retrFP);
           retrFP = NULL;
           return -1;

diff --git a/ftpData.c b/ftpData.c
@@ -568,6 +568,7 @@ void deleteListDataInfoVector(DYNV_VectorGenericDataType *theVector)
 void resetWorkerData(ftpDataType *data, int clientId, int isInitialization)
 {
 
+	  printf("\nReset of worker id: %d", clientId);
       data->clients[clientId].workerData.connectionPort = 0;
       data->clients[clientId].workerData.passiveModeOn = 0;
       data->clients[clientId].workerData.socketIsConnected = 0;

diff --git a/library/connection.c b/library/connection.c
@@ -192,8 +192,9 @@ int socketPrintf(ftpDataType * ftpData, int clientId, const char *__restrict __f
 	}
 	va_end(args);
 
-	if (ftpData->clients[clientId].socketIsConnected != 1)
-		return 0;
+	if (ftpData->clients[clientId].socketIsConnected != 1 ||
+		ftpData->clients[clientId].socketDescriptor == 0)
+		return -1;
 
 	if (ftpData->clients[clientId].tlsIsEnabled != 1)
 	{
@@ -638,7 +639,7 @@ void closeSocket(ftpDataType * ftpData, int processingSocket)
     theReturnCode = close(ftpData->clients[processingSocket].socketDescriptor);
 
     resetClientData(ftpData, processingSocket, 0);
-    resetWorkerData(ftpData, processingSocket, 0);
+    //resetWorkerData(ftpData, processingSocket, 0);
 
     //Update client connecteds
     ftpData->connectedClients--;