Wait for thread cancel

dbpaul · Mar 27, 2019 · 2a7ca60 · 2a7ca60
1 parent 1822494
commit 2a7ca60
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 4 deletions.
diff --git a/build/modules/auth.o b/build/modules/auth.o
diff --git a/build/modules/configRead.o b/build/modules/configRead.o
diff --git a/build/modules/connection.o b/build/modules/connection.o
diff --git a/build/modules/daemon.o b/build/modules/daemon.o
diff --git a/build/modules/dynamicMemory.o b/build/modules/dynamicMemory.o
diff --git a/build/modules/dynamicVectors.o b/build/modules/dynamicVectors.o
diff --git a/build/modules/errorHandling.o b/build/modules/errorHandling.o
diff --git a/build/modules/fileManagement.o b/build/modules/fileManagement.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/modules/ftpServer.o b/build/modules/ftpServer.o
diff --git a/build/modules/logFunctions.o b/build/modules/logFunctions.o
diff --git a/build/modules/openSsl.o b/build/modules/openSsl.o
diff --git a/build/modules/signals.o b/build/modules/signals.o
diff --git a/build/uFTP b/build/uFTP
diff --git a/ftpCommandElaborate.c b/ftpCommandElaborate.c
@@ -501,7 +501,7 @@ int parseCommandPasv(ftpDataType * data, int socketId)
 		{
     		printf("\nQuit command received the Pasv Thread has been cancelled!!!");
     		usleep(10000);
-		} while (ftpData->clients[socketId].workerData.threadIsAlive == 1);
+		} while (data->clients[socketId].workerData.threadIsAlive == 1);
     }
 
     if (data->clients[socketId].workerData.threadHasBeenCreated == 1)
@@ -542,7 +542,7 @@ int parseCommandPort(ftpDataType * data, int socketId)
 		{
     		printf("\nQuit command received the Pasv Thread has been cancelled!!!");
     		usleep(10000);
-		} while (ftpData->clients[socketId].workerData.threadIsAlive == 1);
+		} while (data->clients[socketId].workerData.threadIsAlive == 1);
     }
     if (data->clients[socketId].workerData.threadHasBeenCreated == 1)
     {
@@ -580,7 +580,7 @@ int parseCommandAbor(ftpDataType * data, int socketId)
     		{
         		printf("\nQuit command received the Pasv Thread has been cancelled!!!");
         		usleep(10000);
-    		} while (ftpData->clients[socketId].workerData.threadIsAlive == 1);
+    		} while (data->clients[socketId].workerData.threadIsAlive == 1);
         }
 
         returnCode = socketPrintf(data, socketId, "s", "426 ABORT\r\n");

diff --git a/ftpData.c b/ftpData.c
@@ -638,7 +638,7 @@ void resetClientData(ftpDataType *data, int clientId, int isInitialization)
 		{
     		printf("\nQuit command received the Pasv Thread has been cancelled!!!");
     		usleep(10000);
-		} while (ftpData->clients[clientId].workerData.threadIsAlive == 1);
+		} while (data->clients[clientId].workerData.threadIsAlive == 1);
 
 	}
 	pthread_mutex_destroy(&data->clients[clientId].conditionMutex);