Sleep between close and data reset

2025-04-12 10:48:40 +03:00 · 2019-03-27 11:40:53 +01:00
parent 4ebd06afbe
commit 110f2d0163
17 changed files with 6 additions and 3 deletions
--- a/build/modules/auth.o
+++ b/build/modules/auth.o
--- a/build/modules/configRead.o
+++ b/build/modules/configRead.o
--- a/build/modules/connection.o
+++ b/build/modules/connection.o
--- a/build/modules/daemon.o
+++ b/build/modules/daemon.o
--- a/build/modules/dynamicMemory.o
+++ b/build/modules/dynamicMemory.o
--- a/build/modules/dynamicVectors.o
+++ b/build/modules/dynamicVectors.o
--- a/build/modules/errorHandling.o
+++ b/build/modules/errorHandling.o
--- a/build/modules/fileManagement.o
+++ b/build/modules/fileManagement.o
--- a/build/modules/ftpCommandElaborate.o
+++ b/build/modules/ftpCommandElaborate.o
--- a/build/modules/ftpData.o
+++ b/build/modules/ftpData.o
--- a/build/modules/ftpServer.o
+++ b/build/modules/ftpServer.o
--- a/build/modules/logFunctions.o
+++ b/build/modules/logFunctions.o
--- a/build/modules/openSsl.o
+++ b/build/modules/openSsl.o
--- a/build/modules/signals.o
+++ b/build/modules/signals.o
--- a/build/uFTP
+++ b/build/uFTP
--- a/ftpData.c
+++ b/ftpData.c
@ -632,9 +632,11 @@ void resetClientData(ftpDataType *data, int clientId, int isInitialization)
 {
    if (isInitialization != 1)
    {
-	if (data->clients[clientId].workerData.threadIsAlive == 1)
+	if (data->clients[clientId].workerData.threadIsAlive == 1){
 		pthread_cancel(data->clients[clientId].workerData.workerThread);
-
+		usleep(10000);
+		printf("Thread had ben cancelled!");
+	}
 	pthread_mutex_destroy(&data->clients[clientId].conditionMutex);
 	pthread_cond_destroy(&data->clients[clientId].conditionVariable);

--- a/library/connection.c
+++ b/library/connection.c
@ -597,7 +597,8 @@ void closeClient(ftpDataType * ftpData, int processingSocket)
    if (ftpData->clients[processingSocket].workerData.threadIsAlive == 1)
    {
 		pthread_cancel(ftpData->clients[processingSocket].workerData.workerThread);
-		//printf("\nQuit command received the Pasv Thread has been cancelled.");
+		printf("\nQuit command received the Pasv Thread has been cancelled!!!");
+		usleep(10000);
    }

    FD_CLR(ftpData->clients[processingSocket].socketDescriptor, &ftpData->connectionData.rsetAll);