Applied-Software/uFTP
5
0
Fork 0
mirror of https://github.com/kingk85/uFTP.git synced 2025-07-14 15:56:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Working on mutex!

Browse Source
This commit is contained in:
Ugo Cirmignani
2019-03-02 16:12:48 +01:00
parent eda438894d
commit 45cd244172
10 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/modules/configRead.o
View File

Binary file not shown.

BIN
build/modules/connection.o
View File

Binary file not shown.

BIN
build/modules/ftpCommandElaborate.o
View File

Binary file not shown.

BIN
build/modules/ftpData.o
View File

Binary file not shown.

BIN
build/modules/ftpServer.o
View File

Binary file not shown.

BIN
build/uFTP
View File

Binary file not shown.

32
ftpCommandElaborate.c
View File

@ -632,12 +632,13 @@ int parseCommandList(ftpDataType * data, int socketId)
setDynamicStringDataType(&data->clients[socketId].listPath, data->clients[socketId].login.absolutePath.text, data->clients[socketId].login.absolutePath.textLen, &data->clients[socketId].memoryTable); setDynamicStringDataType(&data->clients[socketId].listPath, data->clients[socketId].login.absolutePath.text, data->clients[socketId].login.absolutePath.textLen, &data->clients[socketId].memoryTable);
} }
//pthread_mutex_trylock(&data->clients[socketId].workerData.conditionMutex); pthread_mutex_lock(&data->clients[socketId].conditionMutex);
memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE); memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE);
strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived); strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived);
data->clients[socketId].workerData.commandReceived = 1; data->clients[socketId].workerData.commandReceived = 1;
//pthread_mutex_unlock(&data->clients[socketId].workerData.conditionMutex); pthread_cond_signal(&data->clients[socketId].conditionVariable);
pthread_cond_signal(&data->clients[socketId].workerData.conditionVariable); pthread_mutex_unlock(&data->clients[socketId].conditionMutex);
return FTP_COMMAND_PROCESSED; return FTP_COMMAND_PROCESSED;
} }
@ -663,12 +664,14 @@ int parseCommandNlst(ftpDataType * data, int socketId)
setDynamicStringDataType(&data->clients[socketId].nlistPath, data->clients[socketId].login.absolutePath.text, data->clients[socketId].login.absolutePath.textLen, &data->clients[socketId].memoryTable); setDynamicStringDataType(&data->clients[socketId].nlistPath, data->clients[socketId].login.absolutePath.text, data->clients[socketId].login.absolutePath.textLen, &data->clients[socketId].memoryTable);
} }
//pthread_mutex_trylock(&data->clients[socketId].workerData.conditionMutex); pthread_mutex_lock(&data->clients[socketId].conditionMutex);
memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE); memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE);
strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived); strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived);
data->clients[socketId].workerData.commandReceived = 1; data->clients[socketId].workerData.commandReceived = 1;
//pthread_mutex_unlock(&data->clients[socketId].workerData.conditionMutex); pthread_cond_signal(&data->clients[socketId].conditionVariable);
pthread_cond_signal(&data->clients[socketId].workerData.conditionVariable); pthread_mutex_unlock(&data->clients[socketId].conditionMutex);
return FTP_COMMAND_PROCESSED; return FTP_COMMAND_PROCESSED;
} }
@ -688,12 +691,14 @@ int parseCommandRetr(ftpDataType * data, int socketId)
if (isSafePath == 1 && if (isSafePath == 1 &&
FILE_IsFile(data->clients[socketId].fileToRetr.text) == 1) FILE_IsFile(data->clients[socketId].fileToRetr.text) == 1)
{ {
//pthread_mutex_trylock(&data->clients[socketId].workerData.conditionMutex); pthread_mutex_lock(&data->clients[socketId].conditionMutex);
memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE); memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE);
strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived); strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived);
data->clients[socketId].workerData.commandReceived = 1; data->clients[socketId].workerData.commandReceived = 1;
//pthread_mutex_unlock(&data->clients[socketId].workerData.conditionMutex); pthread_cond_signal(&data->clients[socketId].conditionVariable);
pthread_cond_signal(&data->clients[socketId].workerData.conditionVariable); pthread_mutex_unlock(&data->clients[socketId].conditionMutex);
return FTP_COMMAND_PROCESSED; return FTP_COMMAND_PROCESSED;
} }
else else
@ -718,18 +723,19 @@ int parseCommandStor(ftpDataType * data, int socketId)
if (isSafePath == 1) if (isSafePath == 1)
{ {
//pthread_mutex_trylock(&data->clients[socketId].workerData.conditionMutex); pthread_mutex_lock(&data->clients[socketId].conditionMutex);
memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE); memset(data->clients[socketId].workerData.theCommandReceived, 0, CLIENT_COMMAND_STRING_SIZE);
strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived); strcpy(data->clients[socketId].workerData.theCommandReceived, data->clients[socketId].theCommandReceived);
data->clients[socketId].workerData.commandReceived = 1; data->clients[socketId].workerData.commandReceived = 1;
//pthread_mutex_unlock(&data->clients[socketId].workerData.conditionMutex); pthread_cond_signal(&data->clients[socketId].conditionVariable);
pthread_cond_signal(&data->clients[socketId].workerData.conditionVariable); pthread_mutex_unlock(&data->clients[socketId].conditionMutex);
} }
else else
{ {
return FTP_COMMAND_NOT_RECONIZED; return FTP_COMMAND_NOT_RECONIZED;
} }
return FTP_COMMAND_PROCESSED; return FTP_COMMAND_PROCESSED;
} }

35
ftpData.c
View File

@ -593,9 +593,6 @@ void resetWorkerData(ftpDataType *data, int clientId, int isInitialization)
/* wait main for action */ /* wait main for action */
if (isInitialization != 1) if (isInitialization != 1)
{ {
pthread_mutex_destroy(&data->clients[clientId].workerData.conditionMutex);
pthread_cond_destroy(&data->clients[clientId].workerData.conditionVariable);
if (data->clients[clientId].workerData.theStorFile != NULL) if (data->clients[clientId].workerData.theStorFile != NULL)
{ {
fclose(data->clients[clientId].workerData.theStorFile); fclose(data->clients[clientId].workerData.theStorFile);
@ -614,18 +611,6 @@ void resetWorkerData(ftpDataType *data, int clientId, int isInitialization)
data->clients[clientId].workerData.threadHasBeenCreated = 0; data->clients[clientId].workerData.threadHasBeenCreated = 0;
} }
if (pthread_mutex_init(&data->clients[clientId].workerData.conditionMutex, NULL) != 0)
{
// printf("\ndata->clients[clientId].workerData.conditionMutex init failed\n");
exit(0);
}
if (pthread_cond_init(&data->clients[clientId].workerData.conditionVariable, NULL) != 0)
{
// printf("\ndata->clients[clientId].workerData.conditionVariable init failed\n");
exit(0);
}
//Clear the dynamic vector structure //Clear the dynamic vector structure
int theSize = data->clients[clientId].workerData.directoryInfo.Size; int theSize = data->clients[clientId].workerData.directoryInfo.Size;
@ -645,12 +630,14 @@ void resetWorkerData(ftpDataType *data, int clientId, int isInitialization)
void resetClientData(ftpDataType *data, int clientId, int isInitialization) void resetClientData(ftpDataType *data, int clientId, int isInitialization)
{ {
if (isInitialization != 1) if (isInitialization != 1)
{ {
if (data->clients[clientId].workerData.threadIsAlive == 1) if (data->clients[clientId].workerData.threadIsAlive == 1)
pthread_cancel(data->clients[clientId].workerData.workerThread); pthread_cancel(data->clients[clientId].workerData.workerThread);
pthread_mutex_destroy(&data->clients[clientId].conditionMutex);
pthread_cond_destroy(&data->clients[clientId].conditionVariable);
pthread_mutex_destroy(&data->clients[clientId].writeMutex); pthread_mutex_destroy(&data->clients[clientId].writeMutex);
#ifdef OPENSSL_ENABLED #ifdef OPENSSL_ENABLED
@ -658,6 +645,10 @@ void resetClientData(ftpDataType *data, int clientId, int isInitialization)
//SSL_free(data->clients[clientId].workerData.ssl); //SSL_free(data->clients[clientId].workerData.ssl);
#endif #endif
} }
else
{
}
if (pthread_mutex_init(&data->clients[clientId].writeMutex, NULL) != 0) if (pthread_mutex_init(&data->clients[clientId].writeMutex, NULL) != 0)
{ {
@ -665,6 +656,18 @@ void resetClientData(ftpDataType *data, int clientId, int isInitialization)
exit(0); exit(0);
} }
if (pthread_mutex_init(&data->clients[clientId].conditionMutex, NULL) != 0)
{
printf("\ndata->clients[clientId].workerData.conditionMutex init failed\n");
exit(0);
}
if (pthread_cond_init(&data->clients[clientId].conditionVariable, NULL) != 0)
{
printf("\ndata->clients[clientId].workerData.conditionVariable init failed\n");
exit(0);
}
data->clients[clientId].tlsIsNegotiating = 0; data->clients[clientId].tlsIsNegotiating = 0;
data->clients[clientId].tlsIsEnabled = 0; data->clients[clientId].tlsIsEnabled = 0;
data->clients[clientId].dataChannelIsTls = 0; data->clients[clientId].dataChannelIsTls = 0;

5
ftpData.h
View File

@ -148,8 +148,6 @@ struct workerData
long long int retrRestartAtByte; long long int retrRestartAtByte;
/* The PASV thread will wait the signal before start */ /* The PASV thread will wait the signal before start */
pthread_mutex_t conditionMutex;
pthread_cond_t conditionVariable;
ftpCommandDataType ftpCommand; ftpCommandDataType ftpCommand;
DYNV_VectorGenericDataType directoryInfo; DYNV_VectorGenericDataType directoryInfo;
FILE *theStorFile; FILE *theStorFile;
@ -207,6 +205,9 @@ struct clientData
unsigned long long int connectionTimeStamp; unsigned long long int connectionTimeStamp;
unsigned long long int lastActivityTimeStamp; unsigned long long int lastActivityTimeStamp;
pthread_mutex_t conditionMutex;
pthread_cond_t conditionVariable;
DYNMEM_MemoryTable_DataType *memoryTable; DYNMEM_MemoryTable_DataType *memoryTable;
} typedef clientDataType; } typedef clientDataType;

6
ftpServer.c
View File

@ -264,12 +264,12 @@ void *connectionWorkerHandle(void * socketId)
{ {
//printf("\nWorker %d is waiting for commands!", theSocketId); //printf("\nWorker %d is waiting for commands!", theSocketId);
//Conditional lock on tconditionVariablehread actions //Conditional lock on tconditionVariablehread actions
pthread_mutex_lock(&ftpData.clients[theSocketId].workerData.conditionMutex); pthread_mutex_lock(&ftpData.clients[theSocketId].conditionMutex);
while (ftpData.clients[theSocketId].workerData.commandReceived == 0) while (ftpData.clients[theSocketId].workerData.commandReceived == 0)
{ {
pthread_cond_wait(&ftpData.clients[theSocketId].workerData.conditionVariable, &ftpData.clients[theSocketId].workerData.conditionMutex); pthread_cond_wait(&ftpData.clients[theSocketId].conditionVariable, &ftpData.clients[theSocketId].conditionMutex);
} }
pthread_mutex_unlock(&ftpData.clients[theSocketId].workerData.conditionMutex); pthread_mutex_unlock(&ftpData.clients[theSocketId].conditionMutex);
//printf("\nWorker %d unlocked", theSocketId); //printf("\nWorker %d unlocked", theSocketId);