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

- changed server side getFileDirectory service to return flat file directory

Browse Source
pull/6/head
Michael Zillgith 10 years ago
parent 758615a3f8
commit 2daa5fdec4
6 changed files with 84 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
CHANGELOG
Unescape Escape View File

@ -1,5 +1,7 @@
Changes to version 0.8.7
------------------------
- extended beoglebone demo (write access to GAPC settings, ...)
- File service: support for wildcard character ('*') in requests
- server: changed signature of WriteAccessHandler: Handler now return MmsDataAccessError instead of boolean value!
- server: added function IedModel_setIedNameForDynamicModel

2
src/goose/goose_publisher.c
Unescape Escape View File

@ -201,7 +201,7 @@ prepareGooseBuffer(GoosePublisher self, CommParameters* parameters, const char*
int bufPos = 12;
#if 0
#if 1
/* Priority tag - IEEE 802.1Q */
self->buffer[bufPos++] = 0x81;
self->buffer[bufPos++] = 0x00;

2
src/hal/filesystem/linux/file_provider_linux.c
Unescape Escape View File

@ -123,7 +123,7 @@ FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModific
{
struct stat fileStats;
char fullPath[sizeof(CONFIG_VIRTUAL_FILESTORE_BASEPATH) + 255];
char fullPath[sizeof(CONFIG_VIRTUAL_FILESTORE_BASEPATH) + 256];
createFullPathFromFileName(fullPath, filename);

2
src/hal/filesystem/win32/file_provider_win32.c
Unescape Escape View File

@ -96,7 +96,7 @@ FileSystem_closeFile(FileHandle handle)
bool
FileSystem_getFileInfo(char* filename, uint32_t* fileSize, uint64_t* lastModificationTimestamp)
{
char fullPath[sizeof(CONFIG_VIRTUAL_FILESTORE_BASEPATH) + 255];
char fullPath[sizeof(CONFIG_VIRTUAL_FILESTORE_BASEPATH) + 256];
createFullPathFromFileName(fullPath, filename);

4
src/hal/inc/hal_filesystem.h
Unescape Escape View File

@ -133,6 +133,10 @@ FileSystem_openDirectory(char* directoryName);
/**
* \brief read the next directory entry
*
* This function returns the next directory entry. The entry is only a valid pointer as long as the
* FileSystem_closeDirectory or another FileSystem_readDirectory function is not called for the given
* DirectoryHandle.
*
* \param directory the handle to identify the directory
* \param isDirectory return value that indicates if the directory entry is itself a directory (true)
*

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

@ -214,11 +214,11 @@ mmsServer_handleFileDeleteRequest(
filename[length] = 0;
if (DEBUG_MMS_SERVER)
printf("mms_file_service.c: Delete file (%s)\n", filename);
printf("MMS_SERVER: mms_file_service.c: Delete file (%s)\n", filename);
if (!FileSystem_getFileInfo(filename, NULL, NULL)) {
if (DEBUG_MMS_SERVER)
printf("mms_file_service.c: File (%s) not found\n", filename);
printf("MMS_SERVER: mms_file_service.c: File (%s) not found\n", filename);
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_FILE_FILE_NON_EXISTENT);
return;
@ -226,7 +226,7 @@ mmsServer_handleFileDeleteRequest(
if (!FileSystem_deleteFile(filename)) {
if (DEBUG_MMS_SERVER)
printf("mms_file_service.c: Delete file (%s) failed\n", filename);
printf("MMS_SERVER: mms_file_service.c: Delete file (%s) failed\n", filename);
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_FILE_FILE_ACCESS_DENIED);
return;
@ -381,7 +381,7 @@ mmsServer_handleFileReadRequest(
int32_t frsmId = (int32_t) BerDecoder_decodeUint32(buffer, maxBufPos - bufPos, bufPos);
if (DEBUG_MMS_SERVER)
printf("mmsServer_handleFileReadRequest read request for frsmId: %i\n", frsmId);
printf("MMS_SERVER: mmsServer_handleFileReadRequest read request for frsmId: %i\n", frsmId);
MmsFileReadStateMachine* frsm = getFrsm(connection, frsmId);
@ -436,107 +436,106 @@ encodeFileSpecification(uint8_t tag, char* fileSpecification, uint8_t* buffer, i
}
}
static void
createFileDirectoryResponse(uint32_t invokeId, ByteBuffer* response, char* directoryName, char* continueAfterFileName)
static int
addFileEntriesToResponse(uint8_t* buffer, int bufPos, int maxBufSize, char* directoryName, char* continueAfterFileName, bool* moreFollows)
{
int maxSize = response->maxSize - 3; /* reserve space for moreFollows */
uint8_t* buffer = response->buffer;
bool moreFollows = false;
int tempStartPos = 30; /* estimated header part with safety margin */
int tempCurPos = tempStartPos;
int tempEncoded = 0;
char extendedFileName[300];
int directoryNameLength = strlen(directoryName);
DirectoryHandle directory = FileSystem_openDirectory(directoryName);
if (continueAfterFileName != NULL) {
if (strlen(continueAfterFileName) == 0)
continueAfterFileName = NULL;
}
if (directory != NULL) {
bool isDirectory;
char* fileName = FileSystem_readDirectory(directory, &isDirectory);
while (fileName != NULL) {
if (isDirectory) {
strcpy(extendedFileName, fileName);
strcat(extendedFileName, "/");
fileName = extendedFileName;
}
directoryName[directoryNameLength] = 0;
if (continueAfterFileName != NULL) {
if (strcmp(continueAfterFileName, fileName) == 0)
continueAfterFileName = NULL;
}
else {
uint64_t msTime;
if (directoryNameLength > 0)
strcat(directoryName, "/");
char fullPath[CONFIG_MMS_FILE_SERVICE_MAX_FILENAME_LENGTH];
strcat(directoryName, fileName);
if (directoryName != NULL) {
int directoryLen = strlen(directoryName);
if (isDirectory) {
bufPos = addFileEntriesToResponse(buffer, bufPos, maxBufSize, directoryName, continueAfterFileName, moreFollows);
strcpy(fullPath, directoryName);
if (*moreFollows == true)
break;
}
else {
if (continueAfterFileName != NULL) {
if (strcmp(continueAfterFileName, directoryName) == 0)
continueAfterFileName = NULL;
}
else {
uint64_t msTime;
if (directoryName[directoryLen - 1] != CONFIG_SYSTEM_FILE_SEPARATOR) {
fullPath[directoryLen] = CONFIG_SYSTEM_FILE_SEPARATOR;
fullPath[directoryLen + 1] = 0;
}
uint32_t fileSize;
strcat(fullPath, fileName);
}
else {
strncpy(fullPath, fileName, CONFIG_MMS_FILE_SERVICE_MAX_FILENAME_LENGTH - 1);
fullPath[CONFIG_MMS_FILE_SERVICE_MAX_FILENAME_LENGTH - 1] = 0;
}
FileSystem_getFileInfo(directoryName, &fileSize, &msTime);
uint32_t fileSize;
char gtString[30];
FileSystem_getFileInfo(fullPath, &fileSize, &msTime);
Conversions_msTimeToGeneralizedTime(msTime, (uint8_t*) gtString);
char gtString[30];
int fileAttributesSize = encodeFileAttributes(0xa1, fileSize, gtString, NULL, 0);
Conversions_msTimeToGeneralizedTime(msTime, (uint8_t*) gtString);
int filenameSize = encodeFileSpecification(0xa0, directoryName, NULL, 0);
int fileAttributesSize = encodeFileAttributes(0xa1, fileSize, gtString, NULL, 0);
int dirEntrySize = 2 + fileAttributesSize + filenameSize;
int filenameSize = encodeFileSpecification(0xa0, fileName, NULL, 0);
int overallEntrySize = 1 + BerEncoder_determineLengthSize(dirEntrySize) + dirEntrySize;
int dirEntrySize = 2 + fileAttributesSize + filenameSize;
int bufferSpaceLeft = maxBufSize - bufPos;
int overallEntrySize = 1 + BerEncoder_determineLengthSize(dirEntrySize) + dirEntrySize;
if (overallEntrySize > bufferSpaceLeft) {
int bufferSpaceLeft = maxSize - tempCurPos;
*moreFollows = true;
break;
}
if (overallEntrySize > bufferSpaceLeft) {
moreFollows = true;
break;
}
bufPos = BerEncoder_encodeTL(0x30, dirEntrySize, buffer, bufPos); /* SEQUENCE (DirectoryEntry) */
bufPos = encodeFileSpecification(0xa0, directoryName, buffer, bufPos); /* fileName */
bufPos = encodeFileAttributes(0xa1, fileSize, gtString, buffer, bufPos); /* file attributes */
tempCurPos = BerEncoder_encodeTL(0x30, dirEntrySize, buffer, tempCurPos); /* SEQUENCE (DirectoryEntry) */
tempCurPos = encodeFileSpecification(0xa0, fileName, buffer, tempCurPos); /* fileName */
tempCurPos = encodeFileAttributes(0xa1, fileSize, gtString, buffer, tempCurPos); /* file attributes */
}
}
fileName = FileSystem_readDirectory(directory, &isDirectory);
}
FileSystem_closeDirectory(directory);
}
else {
//TODO check if it is a directory
directoryName[directoryNameLength] = 0;
return bufPos;
}
static void
createFileDirectoryResponse(uint32_t invokeId, ByteBuffer* response, char* directoryName, char* continueAfterFileName)
{
int maxSize = response->maxSize - 3; /* reserve space for moreFollows */
uint8_t* buffer = response->buffer;
bool moreFollows = false;
int tempStartPos = 30; /* estimated header part with safety margin */
int tempCurPos = tempStartPos;
int tempEncoded = 0;
if (continueAfterFileName != NULL) {
if (strlen(continueAfterFileName) == 0)
continueAfterFileName = NULL;
}
tempCurPos = addFileEntriesToResponse(buffer, tempCurPos, maxSize, directoryName, continueAfterFileName, &moreFollows);
if (tempCurPos < 0) {
if (DEBUG_MMS_SERVER)
printf("Error opening directory!\n");
printf("MMS_SERVER: Error opening directory!\n");
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_FILE_FILE_NON_EXISTENT);
@ -611,7 +610,7 @@ mmsServer_handleFileRenameRequest(
return;
if (DEBUG_MMS_SERVER)
printf("currentFileName: (%s)\n", currentFileName);
printf("MMS_SERVER: currentFileName: (%s)\n", currentFileName);
break;
@ -620,12 +619,12 @@ mmsServer_handleFileRenameRequest(
return;
if (DEBUG_MMS_SERVER)
printf("newFileName: (%s)\n", newFileName);
printf("MMS_SERVER: newFileName: (%s)\n", newFileName);
break;
default: /* ignore unknown tag */
if (DEBUG_MMS_SERVER)
printf("unknown tag: (%02x)\n", tag);
printf("MMS_SERVER: unknown tag: (%02x)\n", tag);
bufPos += length;
break;
@ -640,7 +639,7 @@ mmsServer_handleFileRenameRequest(
else
{
if (DEBUG_MMS_SERVER)
printf("rename file failed!\n");
printf("MMS_SERVER: rename file failed!\n");
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_FILE_OTHER);
}
@ -658,7 +657,7 @@ mmsServer_handleFileDirectoryRequest(
ByteBuffer* response)
{
if (DEBUG_MMS_SERVER)
printf("handleFileDirectoryRequest bufPos:%i, maxBufPus:%i\n", bufPos, maxBufPos);
printf("MMS_SERVER: handleFileDirectoryRequest bufPos:%i, maxBufPus:%i\n", bufPos, maxBufPos);
char filename[256] = "";
@ -683,7 +682,8 @@ mmsServer_handleFileDirectoryRequest(
return;
/* check for wildcard character(*) */
if (strcmp(filename, "*") == 0) filename[0] = 0;
if ((strcmp(filename, "*") == 0) || (strcmp(filename, "/") == 0) || (strcmp(filename, "\\") == 0))
filename[0] = 0;
break;
@ -697,7 +697,7 @@ mmsServer_handleFileDirectoryRequest(
default: /* unrecognized parameter */
if (DEBUG_MMS_SERVER)
printf("handleFileDirectoryRequest: unrecognized parameter\n");
printf("MMS_SERVER: handleFileDirectoryRequest: unrecognized parameter\n");
mmsServer_writeMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response);
return;
}

Write Preview
Loading…
Cancel
Save