Merge pull request #183 from kiraly533/v1.4

TimeActivatedControl before wait check and fixes for file-upload issues.

src/iec61850/inc/iec61850_server.h

@@ -1194,6 +1194,16 @@ ControlAction_getClientConnection(ControlAction self);
 LIB61850_API DataObject*
 ControlAction_getControlObject(ControlAction self);
 
+/**
+ * \brief Gets the time of the control, if it's a timeActivatedControl, returns 0, if it's not.
+ *
+ * \param self the control action instance
+ *
+ * \return the controllable data object instance
+ */
+LIB61850_API uint64_t
+ControlAction_getControlTime(ControlAction self);
+
 /**
  * \brief Control model callback to perform the static tests (optional).
  *

src/iec61850/server/mms_mapping/control.c

@@ -1581,6 +1581,15 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
                     controlObject->interlockCheck = interlockCheck;
                     controlObject->mmsConnection = connection;
 
+                    CheckHandlerResult checkResult = CONTROL_ACCEPTED;
+                    if (controlObject->checkHandler != NULL) { /* perform operative tests */
+
+                        checkResult = controlObject->checkHandler((ControlAction) controlObject,
+                            controlObject->checkHandlerParameter, ctlVal, testCondition, interlockCheck);
+
+                    }
+
+                    if(checkResult == CONTROL_ACCEPTED){
                         initiateControlTask(controlObject);
 
                         setState(controlObject, STATE_WAIT_FOR_ACTIVATION_TIME);
@@ -1590,6 +1599,13 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
 
                         indication = DATA_ACCESS_ERROR_SUCCESS;
                     }
+                    else{
+                        indication = (MmsDataAccessError) checkResult;
+                    }
+                }
+            }
+            else{
+                controlObject->operateTime = 0;
             }
 
             MmsValue_update(controlObject->oper, value);
@@ -1681,7 +1697,6 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
         if (controlObject->timeActivatedOperate) {
             controlObject->timeActivatedOperate = false;
             abortControlOperation(controlObject);
-            indication = DATA_ACCESS_ERROR_SUCCESS;
             goto free_and_return;
         }
     }
@@ -1762,5 +1777,13 @@ ControlAction_getControlObject(ControlAction self)
     return controlObject->dataObject;
 }
 
+uint64_t
+ControlAction_getControlTime(ControlAction self)
+{
+    ControlObject* controlObject = (ControlObject*) self;
+
+    return controlObject->operateTime;
+}
+
 #endif /* (CONFIG_IEC61850_CONTROL_SERVICE == 1) */
 

src/mms/iso_mms/client/mms_client_files.c

@@ -210,8 +210,10 @@ mmsClient_handleFileCloseRequest(
         if (frsm->obtainRequest)
             frsm->obtainRequest->timeout = Hal_getTimeInMs() + connection->requestTimeout;
 
+        if(frsm->fileHandle){
             FileSystem_closeFile(frsm->fileHandle);
             frsm->fileHandle = NULL;
+        }
         frsm->frsmId = 0;
         frsm->obtainRequest = NULL;
 

src/mms/iso_mms/server/mms_file_service.c

@@ -426,8 +426,10 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                     task->state = MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_SOURCE;
 
+                    if(task->fileHandle){
                         FileSystem_closeFile(task->fileHandle);
                         task->fileHandle = NULL;
+                    }
                     deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename);
                 }
             }
@@ -443,6 +445,7 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 mmsClient_createFileReadRequest(task->lastRequestInvokeId, request, task->frmsId);
 
+                task->state = MMS_FILE_UPLOAD_STATE_FILE_READ_SENT;
                 IsoConnection_sendMessage(task->connection->isoConnection, request);
 
                 MmsServer_releaseTransmitBuffer(self);
@@ -450,8 +453,6 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
                 IsoConnection_unlock(task->connection->isoConnection);
 
                 task->nextTimeout = Hal_getTimeInMs() + 2000; /* timeout 2000 ms */
-
-                task->state = MMS_FILE_UPLOAD_STATE_FILE_READ_SENT;
             }
 
             break;
@@ -465,8 +466,10 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 task->state = MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_SOURCE;
 
+                if(task->fileHandle){
                     FileSystem_closeFile(task->fileHandle);
                     task->fileHandle = NULL;
+                }
                 deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename);
             }
 
@@ -482,6 +485,8 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 mmsClient_createFileCloseRequest(task->lastRequestInvokeId, request, task->frmsId);
 
+                task->state = MMS_FILE_UPLOAD_STATE_FILE_CLOSE_SENT;
+
                 IsoConnection_sendMessage(task->connection->isoConnection, request);
 
                 MmsServer_releaseTransmitBuffer(self);
@@ -490,7 +495,6 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 task->nextTimeout = Hal_getTimeInMs() + 2000; /* timeout 2000 ms */
 
-                task->state = MMS_FILE_UPLOAD_STATE_FILE_CLOSE_SENT;
             }
             break;
 
@@ -527,8 +531,10 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 IsoConnection_unlock(task->connection->isoConnection);
 
+                if(task->fileHandle){
                     FileSystem_closeFile(task->fileHandle);
                     task->fileHandle = NULL;
+                }
                 deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename);
 
                 if (DEBUG_MMS_SERVER)
@@ -578,6 +584,8 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 createObtainFileResponse(task->obtainFileRequestInvokeId, response);
 
+                task->state = MMS_FILE_UPLOAD_STATE_NOT_USED;
+
                 IsoConnection_sendMessage(task->connection->isoConnection, response);
 
                 MmsServer_releaseTransmitBuffer(self);
@@ -586,8 +594,6 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task)
 
                 if (self->getFileCompleteHandler)
                     self->getFileCompleteHandler(self->getFileCompleteHandlerParameter, task->connection, task->destinationFilename);
-
-                task->state = MMS_FILE_UPLOAD_STATE_NOT_USED;
             }
             break;
         case MMS_FILE_UPLOAD_STATE_INTERRUPTED:

src/mms/iso_mms/server/mms_server_connection.c

@@ -464,9 +464,14 @@ mmsFileReadHandler(uint32_t invokeId, void* parameter, MmsError mmsError, int32_
     if (mmsError == MMS_ERROR_NONE) {
         if (DEBUG_MMS_SERVER)
             printf("MMS_SERVER:  file %i received %i bytes\n", task->frmsId, bytesReceived);
-
+            if(task->fileHandle){
                 FileSystem_writeFile(task->fileHandle, buffer, bytesReceived);
             }
+            else{
+                if (DEBUG_MMS_SERVER)
+                    printf("MMS_SERVER: problem reading file %i file already closed\n", task->frmsId);
+            }
+    }
     else {
         if (DEBUG_MMS_SERVER)
             printf("MMS_SERVER:  problem reading file %i (error code: %i)\n", task->frmsId, mmsError);
@@ -549,6 +554,10 @@ handleConfirmedResponsePdu(
 
                         bool moreFollows;
 
+                        if(fileTask->fileHandle == NULL){
+                            fileTask->state = MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_DESTINATION;
+                        }
+                        else{
                             if (mmsMsg_parseFileReadResponse(buffer, startBufPos, maxBufPos, invokeId, fileTask->frmsId, &moreFollows, mmsFileReadHandler, (void*) fileTask)) {
 
                                 if (moreFollows) {
@@ -565,6 +574,7 @@ handleConfirmedResponsePdu(
                                     printf("MMS_SERVER: error parsing file-read-response\n");
                             }
                         }
+                    }
                     else {
                         /* ignore */
 
@@ -583,7 +593,9 @@ handleConfirmedResponsePdu(
                     MmsObtainFileTask fileTask = getUploadTaskByInvokeId(self->server, invokeId);
 
                     if (fileTask != NULL) {
+                        if(fileTask->fileHandle){
                             FileSystem_closeFile(fileTask->fileHandle);
+                        }
                         fileTask->state = MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_RESPONSE;
                     }
                     else {