RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- MMS server: fixed potential deadlock in multi-thread mode

Browse Source
pull/162/head
Michael Zillgith 6 years ago
parent e09d46ffff
commit 355e88ea8b
9 changed files with 117 additions and 43 deletions
Show Stats Download Patch File Download Diff File

12
src/iec61850/server/mms_mapping/reporting.c
Unescape Escape View File

@ -351,6 +351,8 @@ sendReportSegment(ReportControl* self, bool isIntegrity, bool isGI)
if (self->clientConnection == NULL)
return false;
IsoConnection_lock(self->clientConnection->isoConnection);
int maxMmsPduSize = MmsServerConnection_getMaxMmsPduSize(self->clientConnection);
int estimatedSegmentSize = 19; /* maximum size of header information (header can have 13-19 byte) */
estimatedSegmentSize += 8; /* reserve space for more-segments-follow (3 byte) and sub-seq-num (3-5 byte) */
@ -670,10 +672,12 @@ sendReportSegment(ReportControl* self, bool isIntegrity, bool isGI)
reportBuffer->size = bufPos;
MmsServerConnection_sendMessage(self->clientConnection, reportBuffer, false);
MmsServerConnection_sendMessage(self->clientConnection, reportBuffer);
MmsServer_releaseTransmitBuffer(self->server->mmsServer);
IsoConnection_unlock(self->clientConnection->isoConnection);
if (moreFollows == false) {
/* reset sub sequence number */
segmented = false;
@ -2841,6 +2845,8 @@ sendNextReportEntrySegment(ReportControl* self)
ReportControl_unlockNotify(self);
IsoConnection_lock(self->clientConnection->isoConnection);
ByteBuffer* reportBuffer = MmsServer_reserveTransmitBuffer(self->server->mmsServer);
uint8_t* buffer = reportBuffer->buffer;
@ -3029,10 +3035,12 @@ sendNextReportEntrySegment(ReportControl* self)
reportBuffer->size = bufPos;
MmsServerConnection_sendMessage(self->clientConnection, reportBuffer, false);
MmsServerConnection_sendMessage(self->clientConnection, reportBuffer);
MmsServer_releaseTransmitBuffer(self->server->mmsServer);
IsoConnection_unlock(self->clientConnection->isoConnection);
if (moreFollows == false) {
/* reset sub sequence number */
segmented = false;

8
src/mms/inc/iso_server.h
Unescape Escape View File

@ -72,6 +72,12 @@ IsoConnection_getPeerAddress(IsoConnection self);
void
IsoConnection_close(IsoConnection self);
void
IsoConnection_lock(IsoConnection self);
void
IsoConnection_unlock(IsoConnection self);
void
IsoConnection_installListener(IsoConnection self, MessageReceivedHandler handler,
void* parameter);
@ -86,7 +92,7 @@ IsoConnection_getSecurityToken(IsoConnection self);
* (handlerMode)
*/
void
IsoConnection_sendMessage(IsoConnection self, ByteBuffer* message, bool handlerMode);
IsoConnection_sendMessage(IsoConnection self, ByteBuffer* message);
IsoServer
IsoServer_create(TLSConfiguration tlsConfiguration);

2
src/mms/inc_private/mms_server_connection.h
Unescape Escape View File

@ -52,7 +52,7 @@ int
MmsServerConnection_getMaxMmsPduSize(MmsServerConnection self);
void
MmsServerConnection_sendMessage(MmsServerConnection self, ByteBuffer* message, bool handlerMode);
MmsServerConnection_sendMessage(MmsServerConnection self, ByteBuffer* message);
bool
MmsServerConnection_addNamedVariableList(MmsServerConnection self, MmsNamedVariableList variableList);

40
src/mms/iso_mms/server/mms_file_service.c
Unescape Escape View File

@ -434,16 +434,20 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
case MMS_FILE_UPLOAD_STATE_SEND_FILE_READ:
{
IsoConnection_lock(task->connection->isoConnection);
ByteBuffer* request = MmsServer_reserveTransmitBuffer(self);
task->lastRequestInvokeId = MmsServerConnection_getNextRequestInvokeId(task->connection);
mmsClient_createFileReadRequest(task->lastRequestInvokeId, request, task->frmsId);
IsoConnection_sendMessage(task->connection->isoConnection, request, false);
IsoConnection_sendMessage(task->connection->isoConnection, request);
MmsServer_releaseTransmitBuffer(self);
IsoConnection_unlock(task->connection->isoConnection);
task->nextTimeout = Hal_getTimeInMs() + 2000; /* timeout 2000 ms */
task->state = MMS_FILE_UPLOAD_STATE_FILE_READ_SENT;
@ -468,16 +472,20 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
case MMS_FILE_UPLOAD_STATE_SEND_FILE_CLOSE:
{
IsoConnection_lock(task->connection->isoConnection);
ByteBuffer* request = MmsServer_reserveTransmitBuffer(self);
task->lastRequestInvokeId = MmsServerConnection_getNextRequestInvokeId(task->connection);
mmsClient_createFileCloseRequest(task->lastRequestInvokeId, request, task->frmsId);
IsoConnection_sendMessage(task->connection->isoConnection, request, false);
IsoConnection_sendMessage(task->connection->isoConnection, request);
MmsServer_releaseTransmitBuffer(self);
IsoConnection_unlock(task->connection->isoConnection);
task->nextTimeout = Hal_getTimeInMs() + 2000; /* timeout 2000 ms */
task->state = MMS_FILE_UPLOAD_STATE_FILE_CLOSE_SENT;
@ -504,17 +512,21 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
{
/* send ObtainFileError */
IsoConnection_lock(task->connection->isoConnection);
ByteBuffer* response = MmsServer_reserveTransmitBuffer(self);
createServiceErrorObtainFileError(task->obtainFileRequestInvokeId, response, MMS_ERROR_FILE_FILE_NON_EXISTENT, 0);
IsoConnection_sendMessage(task->connection->isoConnection, response, false);
IsoConnection_sendMessage(task->connection->isoConnection, response);
MmsServer_releaseTransmitBuffer(self);
IsoConnection_unlock(task->connection->isoConnection);
FileSystem_closeFile(task->fileHandle);
deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename);
MmsServer_releaseTransmitBuffer(self);
if (DEBUG_MMS_SERVER)
printf("MMS_SERVER: ObtainFile service: failed to open file from client\n");
@ -526,11 +538,17 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
{
/* send ObtainFileError */
IsoConnection_lock(task->connection->isoConnection);
ByteBuffer* response = MmsServer_reserveTransmitBuffer(self);
createServiceErrorObtainFileError(task->obtainFileRequestInvokeId, response, MMS_ERROR_FILE_OTHER, 1);
IsoConnection_sendMessage(task->connection->isoConnection, response, false);
IsoConnection_sendMessage(task->connection->isoConnection, response);
MmsServer_releaseTransmitBuffer(self);
IsoConnection_unlock(task->connection->isoConnection);
if (task->fileHandle) {
FileSystem_closeFile(task->fileHandle);
@ -539,8 +557,6 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename);
}
MmsServer_releaseTransmitBuffer(self);
if (DEBUG_MMS_SERVER)
printf("MMS_SERVER: ObtainFile service: failed to create local file\n");
@ -551,14 +567,18 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
case MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_RESPONSE:
{
IsoConnection_lock(task->connection->isoConnection);
ByteBuffer* response = MmsServer_reserveTransmitBuffer(self);
createObtainFileResponse(task->obtainFileRequestInvokeId, response);
IsoConnection_sendMessage(task->connection->isoConnection, response, false);
IsoConnection_sendMessage(task->connection->isoConnection, response);
MmsServer_releaseTransmitBuffer(self);
IsoConnection_unlock(task->connection->isoConnection);
if (self->getFileCompleteHandler)
self->getFileCompleteHandler(self->getFileCompleteHandlerParameter, task->connection, task->destinationFilename);
@ -678,7 +698,7 @@ mmsServer_handleObtainFileRequest(
mmsClient_createFileOpenRequest(task->lastRequestInvokeId, request, sourceFilename, 0);
IsoConnection_sendMessage(task->connection->isoConnection, request, true);
IsoConnection_sendMessage(task->connection->isoConnection, request);
MmsServer_releaseTransmitBuffer(connection->server);

37
src/mms/iso_mms/server/mms_information_report.c
Unescape Escape View File

@ -59,6 +59,11 @@ MmsServerConnection_sendInformationReportSingleVariableVMDSpecific(MmsServerConn
if (DEBUG_MMS_SERVER) printf("MMS_SERVER: sendInfReportSingle variable: %s\n", itemId);
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false)
IsoConnection_lock(self->isoConnection);
#endif
ByteBuffer* reportBuffer = MmsServer_reserveTransmitBuffer(self->server);
uint8_t* buffer = reportBuffer->buffer;
@ -80,10 +85,15 @@ MmsServerConnection_sendInformationReportSingleVariableVMDSpecific(MmsServerConn
reportBuffer->size = bufPos;
IsoConnection_sendMessage(self->isoConnection, reportBuffer, handlerMode);
IsoConnection_sendMessage(self->isoConnection, reportBuffer);
MmsServer_releaseTransmitBuffer(self->server);
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false)
IsoConnection_unlock(self->isoConnection);
#endif
exit_function:
return;
}
@ -152,6 +162,11 @@ MmsServerConnection_sendInformationReportListOfVariables(
goto exit_function;
}
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false)
IsoConnection_lock(self->isoConnection);
#endif
/* encode message */
ByteBuffer* reportBuffer = MmsServer_reserveTransmitBuffer(self->server);
@ -212,10 +227,16 @@ MmsServerConnection_sendInformationReportListOfVariables(
reportBuffer->size = bufPos;
IsoConnection_sendMessage(self->isoConnection, reportBuffer, handlerMode);
IsoConnection_sendMessage(self->isoConnection, reportBuffer);
MmsServer_releaseTransmitBuffer(self->server);
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false) {
IsoConnection_unlock(self->isoConnection);
}
#endif
exit_function:
return;
}
@ -265,6 +286,11 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
goto exit_function;
}
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false)
IsoConnection_lock(self->isoConnection);
#endif
ByteBuffer* reportBuffer = MmsServer_reserveTransmitBuffer(self->server);
uint8_t* buffer = reportBuffer->buffer;
@ -293,10 +319,15 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
reportBuffer->size = bufPos;
IsoConnection_sendMessage(self->isoConnection, reportBuffer, false);
IsoConnection_sendMessage(self->isoConnection, reportBuffer);
MmsServer_releaseTransmitBuffer(self->server);
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false)
IsoConnection_unlock(self->isoConnection);
#endif
exit_function:
return;
}

4
src/mms/iso_mms/server/mms_server_connection.c
Unescape Escape View File

@ -749,9 +749,9 @@ MmsServerConnection_getMaxMmsPduSize(MmsServerConnection self)
}
void
MmsServerConnection_sendMessage(MmsServerConnection self, ByteBuffer* message, bool handlerMode)
MmsServerConnection_sendMessage(MmsServerConnection self, ByteBuffer* message)
{
IsoConnection_sendMessage(self->isoConnection, message, false);
IsoConnection_sendMessage(self->isoConnection, message);
}
#if (MMS_DYNAMIC_DATA_SETS == 1)

8
src/mms/iso_mms/server/mms_write_service.c
Unescape Escape View File

@ -83,15 +83,21 @@ mmsServer_createMmsWriteResponse(MmsServerConnection connection,
void
MmsServerConnection_sendWriteResponse(MmsServerConnection self, uint32_t invokeId, MmsDataAccessError indication, bool handlerMode)
{
if (handlerMode == false)
IsoConnection_lock(self->isoConnection);
ByteBuffer* response = MmsServer_reserveTransmitBuffer(self->server);
ByteBuffer_setSize(response, 0);
mmsServer_createMmsWriteResponse(self, invokeId, response, 1, &indication);
IsoConnection_sendMessage(self->isoConnection, response, handlerMode);
IsoConnection_sendMessage(self->isoConnection, response);
MmsServer_releaseTransmitBuffer(self->server);
if (handlerMode == false)
IsoConnection_unlock(self->isoConnection);
}
#if 0

48
src/mms/iso_server/iso_connection.c
Unescape Escape View File

@ -173,13 +173,13 @@ IsoConnection_handleTcpConnection(IsoConnection self)
printf("ISO_SERVER: COTP connection indication\n");
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_wait(self->conMutex);
IsoConnection_lock(self);
#endif
CotpConnection_sendConnectionResponseMessage(self->cotpConnection);
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_post(self->conMutex);
IsoConnection_unlock(self);
#endif
break;
@ -210,7 +210,7 @@ IsoConnection_handleTcpConnection(IsoConnection self)
if (aIndication == ACSE_ASSOCIATE) {
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_wait(self->conMutex);
IsoConnection_lock(self);
#endif
if (DEBUG_ISO_SERVER)
@ -273,7 +273,7 @@ IsoConnection_handleTcpConnection(IsoConnection self)
}
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_post(self->conMutex);
IsoConnection_unlock(self);
#endif
}
else {
@ -305,7 +305,7 @@ IsoConnection_handleTcpConnection(IsoConnection self)
#if (CONFIG_MMS_THREADLESS_STACK != 1)
IsoServer_userLock(self->isoServer);
Semaphore_wait(self->conMutex);
IsoConnection_lock(self);
#endif
ByteBuffer_wrap(&mmsResponseBuffer, self->sendBuffer, 0, SEND_BUF_SIZE);
@ -344,7 +344,7 @@ IsoConnection_handleTcpConnection(IsoConnection self)
}
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_post(self->conMutex);
IsoConnection_unlock(self);
IsoServer_userUnlock(self->isoServer);
#endif
}
@ -365,7 +365,7 @@ IsoConnection_handleTcpConnection(IsoConnection self)
#if (CONFIG_MMS_THREADLESS_STACK != 1)
IsoServer_userLock(self->isoServer);
Semaphore_wait(self->conMutex);
IsoConnection_lock(self);
#endif
struct sBufferChain acseBufferPartStruct;
@ -392,7 +392,7 @@ IsoConnection_handleTcpConnection(IsoConnection self)
CotpConnection_sendDataMessage(self->cotpConnection, sessionBufferPart);
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_post(self->conMutex);
IsoConnection_unlock(self);
IsoServer_userUnlock(self->isoServer);
#endif
}
@ -592,7 +592,23 @@ IsoConnection_getPeerAddress(IsoConnection self)
}
void
IsoConnection_sendMessage(IsoConnection self, ByteBuffer* message, bool handlerMode)
IsoConnection_lock(IsoConnection self)
{
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_wait(self->conMutex);
#endif
}
void
IsoConnection_unlock(IsoConnection self)
{
#if (CONFIG_MMS_THREADLESS_STACK != 1)
Semaphore_post(self->conMutex);
#endif
}
void
IsoConnection_sendMessage(IsoConnection self, ByteBuffer* message)
{
if (self->state == ISO_CON_STATE_STOPPED) {
if (DEBUG_ISO_SERVER)
@ -600,15 +616,6 @@ IsoConnection_sendMessage(IsoConnection self, ByteBuffer* message, bool handlerM
goto exit_error;
}
bool locked = false;
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (handlerMode == false) {
Semaphore_wait(self->conMutex);
locked = true;
}
#endif
struct sBufferChain payloadBufferStruct;
BufferChain payloadBuffer = &payloadBufferStruct;
payloadBuffer->length = message->size;
@ -642,11 +649,6 @@ IsoConnection_sendMessage(IsoConnection self, ByteBuffer* message, bool handlerM
printf("ISO_SERVER: IsoConnection_sendMessage success!\n");
}
#if (CONFIG_MMS_THREADLESS_STACK != 1)
if (locked)
Semaphore_post(self->conMutex);
#endif
exit_error:
return;
}

1
src/mms/iso_server/iso_server.c
Unescape Escape View File

@ -83,6 +83,7 @@ struct sIsoServer {
#endif /* (CONFIG_MAXIMUM_TCP_CLIENT_CONNECTIONS == -1) */
#if (CONFIG_MMS_THREADLESS_STACK != 1)
/* used to control access to server data model */
Semaphore userLock;
#endif

Write Preview
Loading…
Cancel
Save