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

- IEC 61850 server: fixed problem when "ResvTms" is missing in BRCB

Browse Source
pull/147/head
Michael Zillgith 7 years ago
parent 45fd6919a8
commit 0e7fcb0c29
5 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File

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

@ -1616,7 +1616,8 @@ checkReservationTimeout(ReportControl* rc)
#if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1) #if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1)
MmsValue* resvTmsVal = ReportControl_getRCBValue(rc, "ResvTms"); MmsValue* resvTmsVal = ReportControl_getRCBValue(rc, "ResvTms");
MmsValue_setInt16(resvTmsVal, rc->resvTms); if (resvTmsVal)
MmsValue_setInt16(resvTmsVal, rc->resvTms);
#endif #endif
rc->reservationTimeout = 0; rc->reservationTimeout = 0;
@ -1673,7 +1674,8 @@ reserveRcb(ReportControl* rc, MmsServerConnection connection)
#if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1) #if (CONFIG_IEC61850_BRCB_WITH_RESVTMS == 1)
MmsValue* resvTmsVal = ReportControl_getRCBValue(rc, "ResvTms"); MmsValue* resvTmsVal = ReportControl_getRCBValue(rc, "ResvTms");
MmsValue_setInt16(resvTmsVal, rc->resvTms); if (resvTmsVal)
MmsValue_setInt16(resvTmsVal, rc->resvTms);
#endif #endif
rc->reservationTimeout = Hal_getTimeInMs() + (RESV_TMS_IMPLICIT_VALUE * 1000); rc->reservationTimeout = Hal_getTimeInMs() + (RESV_TMS_IMPLICIT_VALUE * 1000);
@ -2078,6 +2080,7 @@ Reporting_deactivateReportsForConnection(MmsMapping* self, MmsServerConnection c
rc->reserved = false; rc->reserved = false;
if (rc->buffered == false) { if (rc->buffered == false) {
MmsValue* resv = ReportControl_getRCBValue(rc, "Resv"); MmsValue* resv = ReportControl_getRCBValue(rc, "Resv");
MmsValue_setBoolean(resv, false); MmsValue_setBoolean(resv, false);

2
src/mms/iso_mms/client/mms_client_files.c
Unescape Escape View File

@ -734,10 +734,12 @@ mmsMsg_parseFileReadResponse(uint8_t* buffer, int bufPos, int maxBufPos, int frs
bufPos += length; bufPos += length;
break; break;
case 0x81: /* moreFollows */ case 0x81: /* moreFollows */
*moreFollows = BerDecoder_decodeBoolean(buffer, bufPos); *moreFollows = BerDecoder_decodeBoolean(buffer, bufPos);
bufPos += length; bufPos += length;
break; break;
default: default:
bufPos += length; bufPos += length;
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)

50
src/mms/iso_mms/common/mms_value.c
Unescape Escape View File

@ -130,7 +130,7 @@ MmsValue_equals(const MmsValue* self, const MmsValue* otherValue)
return true; return true;
break; break;
case MMS_INTEGER: case MMS_INTEGER:
case MMS_UNSIGNED: case MMS_UNSIGNED:
return Asn1PrimitivaValue_compare(self->value.integer, otherValue->value.integer); return Asn1PrimitivaValue_compare(self->value.integer, otherValue->value.integer);
break; break;
case MMS_UTC_TIME: case MMS_UTC_TIME:
@ -162,7 +162,7 @@ MmsValue_equals(const MmsValue* self, const MmsValue* otherValue)
break; break;
case MMS_VISIBLE_STRING: case MMS_VISIBLE_STRING:
case MMS_STRING: case MMS_STRING:
if (self->value.visibleString.buf != NULL) { if (self->value.visibleString.buf != NULL) {
if (otherValue->value.visibleString.buf != NULL) { if (otherValue->value.visibleString.buf != NULL) {
if (strcmp(self->value.visibleString.buf, otherValue->value.visibleString.buf) == 0) if (strcmp(self->value.visibleString.buf, otherValue->value.visibleString.buf) == 0)
@ -586,7 +586,6 @@ MmsValue*
MmsValue_newIntegerFromInt8(int8_t integer) MmsValue_newIntegerFromInt8(int8_t integer)
{ {
MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue)); MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
;
self->type = MMS_INTEGER; self->type = MMS_INTEGER;
self->value.integer = BerInteger_createFromInt32((int32_t) integer); self->value.integer = BerInteger_createFromInt32((int32_t) integer);
@ -598,7 +597,6 @@ MmsValue*
MmsValue_newIntegerFromInt16(int16_t integer) MmsValue_newIntegerFromInt16(int16_t integer)
{ {
MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue)); MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
;
self->type = MMS_INTEGER; self->type = MMS_INTEGER;
self->value.integer = BerInteger_createFromInt32((int32_t) integer); self->value.integer = BerInteger_createFromInt32((int32_t) integer);
@ -832,7 +830,6 @@ MmsValue*
MmsValue_newUnsignedFromUint32(uint32_t integer) MmsValue_newUnsignedFromUint32(uint32_t integer)
{ {
MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue)); MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
;
if (self == NULL) if (self == NULL)
return NULL; return NULL;
@ -847,7 +844,6 @@ MmsValue*
MmsValue_newIntegerFromInt64(int64_t integer) MmsValue_newIntegerFromInt64(int64_t integer)
{ {
MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue)); MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
;
if (self == NULL) if (self == NULL)
return NULL; return NULL;
@ -913,8 +909,6 @@ MmsValue_toFloat(const MmsValue* self)
return val; return val;
} }
} }
else
printf("MmsValue_toFloat: conversion error. Wrong type!\n");
return 0.f; return 0.f;
} }
@ -966,7 +960,7 @@ MmsValue_getSizeInMemory(const MmsValue* self)
switch (self->type) switch (self->type)
{ {
case MMS_ARRAY: case MMS_ARRAY:
case MMS_STRUCTURE: case MMS_STRUCTURE:
{ {
memorySize += (MemoryAllocator_getAlignedSize(sizeof(MmsValue*)) * self->value.structure.size); memorySize += (MemoryAllocator_getAlignedSize(sizeof(MmsValue*)) * self->value.structure.size);
@ -981,7 +975,7 @@ MmsValue_getSizeInMemory(const MmsValue* self)
break; break;
case MMS_INTEGER: case MMS_INTEGER:
case MMS_UNSIGNED: case MMS_UNSIGNED:
memorySize += MemoryAllocator_getAlignedSize(sizeof(Asn1PrimitiveValue)); memorySize += MemoryAllocator_getAlignedSize(sizeof(Asn1PrimitiveValue));
memorySize += MemoryAllocator_getAlignedSize(self->value.integer->maxSize); memorySize += MemoryAllocator_getAlignedSize(self->value.integer->maxSize);
break; break;
@ -1037,7 +1031,7 @@ MmsValue_cloneToBuffer(const MmsValue* self, uint8_t* destinationAddress)
break; break;
case MMS_INTEGER: case MMS_INTEGER:
case MMS_UNSIGNED: case MMS_UNSIGNED:
{ {
newValue->value.integer = (Asn1PrimitiveValue*) destinationAddress; newValue->value.integer = (Asn1PrimitiveValue*) destinationAddress;
Asn1PrimitiveValue* newAsn1Value = (Asn1PrimitiveValue*) destinationAddress; Asn1PrimitiveValue* newAsn1Value = (Asn1PrimitiveValue*) destinationAddress;
@ -1066,7 +1060,7 @@ MmsValue_cloneToBuffer(const MmsValue* self, uint8_t* destinationAddress)
break; break;
case MMS_STRING: case MMS_STRING:
case MMS_VISIBLE_STRING: case MMS_VISIBLE_STRING:
newValue->value.visibleString.buf = (char*) destinationAddress; newValue->value.visibleString.buf = (char*) destinationAddress;
newValue->value.visibleString.size = self->value.visibleString.size; newValue->value.visibleString.size = self->value.visibleString.size;
strcpy((char*) destinationAddress, self->value.visibleString.buf); strcpy((char*) destinationAddress, self->value.visibleString.buf);
@ -1099,7 +1093,7 @@ MmsValue_clone(const MmsValue* self)
{ {
case MMS_ARRAY: case MMS_ARRAY:
case MMS_STRUCTURE: case MMS_STRUCTURE:
{ {
int componentCount = self->value.structure.size; int componentCount = self->value.structure.size;
newValue->value.structure.size = componentCount; newValue->value.structure.size = componentCount;
@ -1113,7 +1107,7 @@ MmsValue_clone(const MmsValue* self)
break; break;
case MMS_INTEGER: case MMS_INTEGER:
case MMS_UNSIGNED: case MMS_UNSIGNED:
newValue->value.integer = Asn1PrimitiveValue_clone(self->value.integer); newValue->value.integer = Asn1PrimitiveValue_clone(self->value.integer);
break; break;
@ -1154,7 +1148,7 @@ MmsValue_clone(const MmsValue* self)
break; break;
case MMS_VISIBLE_STRING: case MMS_VISIBLE_STRING:
case MMS_STRING: case MMS_STRING:
size = self->value.visibleString.size; size = self->value.visibleString.size;
newValue->value.visibleString.buf = (char*) GLOBAL_MALLOC(size + 1); newValue->value.visibleString.buf = (char*) GLOBAL_MALLOC(size + 1);
newValue->value.visibleString.size = size; newValue->value.visibleString.size = size;
@ -1169,7 +1163,7 @@ MmsValue_clone(const MmsValue* self)
break; break;
} }
exit_function: exit_function:
return newValue; return newValue;
} }
@ -1195,7 +1189,7 @@ MmsValue_delete(MmsValue* self)
switch (self->type) switch (self->type)
{ {
case MMS_INTEGER: case MMS_INTEGER:
case MMS_UNSIGNED: case MMS_UNSIGNED:
Asn1PrimitiveValue_destroy(self->value.integer); Asn1PrimitiveValue_destroy(self->value.integer);
break; break;
case MMS_FLOAT: case MMS_FLOAT:
@ -1208,12 +1202,12 @@ MmsValue_delete(MmsValue* self)
GLOBAL_FREEMEM(self->value.octetString.buf); GLOBAL_FREEMEM(self->value.octetString.buf);
break; break;
case MMS_VISIBLE_STRING: case MMS_VISIBLE_STRING:
case MMS_STRING: case MMS_STRING:
if (self->value.visibleString.buf != NULL) if (self->value.visibleString.buf != NULL)
GLOBAL_FREEMEM(self->value.visibleString.buf); GLOBAL_FREEMEM(self->value.visibleString.buf);
break; break;
case MMS_ARRAY: case MMS_ARRAY:
case MMS_STRUCTURE: case MMS_STRUCTURE:
{ {
int componentCount = self->value.structure.size; int componentCount = self->value.structure.size;
int i; int i;
@ -1241,7 +1235,7 @@ MmsValue_deleteConditional(MmsValue* self)
switch (self->type) switch (self->type)
{ {
case MMS_INTEGER: case MMS_INTEGER:
case MMS_UNSIGNED: case MMS_UNSIGNED:
Asn1PrimitiveValue_destroy(self->value.integer); Asn1PrimitiveValue_destroy(self->value.integer);
break; break;
case MMS_FLOAT: case MMS_FLOAT:
@ -1254,12 +1248,12 @@ MmsValue_deleteConditional(MmsValue* self)
GLOBAL_FREEMEM(self->value.octetString.buf); GLOBAL_FREEMEM(self->value.octetString.buf);
break; break;
case MMS_VISIBLE_STRING: case MMS_VISIBLE_STRING:
case MMS_STRING: case MMS_STRING:
if (self->value.visibleString.buf != NULL) if (self->value.visibleString.buf != NULL)
GLOBAL_FREEMEM(self->value.visibleString.buf); GLOBAL_FREEMEM(self->value.visibleString.buf);
break; break;
case MMS_ARRAY: case MMS_ARRAY:
case MMS_STRUCTURE: case MMS_STRUCTURE:
{ {
int componentCount = self->value.structure.size; int componentCount = self->value.structure.size;
int i; int i;
@ -1530,7 +1524,7 @@ setVisibleStringValue(MmsValue* self, const char* string)
self->value.visibleString.buf[0] = 0; self->value.visibleString.buf[0] = 0;
} }
exit_function: exit_function:
return; return;
} }
@ -1744,7 +1738,7 @@ MmsValue_newStringFromByteArray(const uint8_t* byteArray, int size, MmsType type
self = NULL; self = NULL;
} }
exit_function: exit_function:
return self; return self;
} }
@ -1813,7 +1807,7 @@ MmsValue_newUtcTime(uint32_t timeval)
valueArray[3] = timeArray[3]; valueArray[3] = timeArray[3];
#endif #endif
exit_function: exit_function:
return self; return self;
} }
@ -1860,7 +1854,7 @@ MmsValue_createArray(MmsVariableSpecification* elementType, int size)
} }
} }
exit_function: exit_function:
return self; return self;
} }
@ -1887,7 +1881,7 @@ MmsValue_createEmptyArray(int size)
self->value.structure.components[i] = NULL; self->value.structure.components[i] = NULL;
} }
exit_function: exit_function:
return self; return self;
} }
@ -2027,7 +2021,7 @@ MmsValue_printToBuffer(const MmsValue* self, char* buffer, int bufferSize)
switch (MmsValue_getType(self)) switch (MmsValue_getType(self))
{ {
case MMS_STRUCTURE: case MMS_STRUCTURE:
case MMS_ARRAY: case MMS_ARRAY:
{ {
if (bufferSize == 0) if (bufferSize == 0)
break; break;

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

@ -253,7 +253,6 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
uint32_t informationReportContentSize = variableAccessSpecSize + listOfAccessResultSize; uint32_t informationReportContentSize = variableAccessSpecSize + listOfAccessResultSize;
informationReportSize = 1 + informationReportContentSize + informationReportSize = 1 + informationReportContentSize +
BerEncoder_determineLengthSize(informationReportContentSize); BerEncoder_determineLengthSize(informationReportContentSize);

20
src/mms/iso_mms/server/mms_server_common.c
Unescape Escape View File

@ -211,17 +211,17 @@ mmsMsg_createServiceErrorPdu(uint32_t invokeId, ByteBuffer* response, MmsError e
bool bool
mmsServer_isIndexAccess(AlternateAccess_t* alternateAccess) mmsServer_isIndexAccess(AlternateAccess_t* alternateAccess)
{ {
if (alternateAccess->list.array[0]->present == AlternateAccess__Member_PR_unnamed) { if (alternateAccess->list.array[0]->present == AlternateAccess__Member_PR_unnamed) {
if ((alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.present if ((alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.present
== AlternateAccessSelection__selectAccess_PR_index) || == AlternateAccessSelection__selectAccess_PR_index) ||
(alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.present (alternateAccess->list.array[0]->choice.unnamed->choice.selectAccess.present
== AlternateAccessSelection__selectAccess_PR_indexRange)) == AlternateAccessSelection__selectAccess_PR_indexRange))
{ {
return true; return true;
} }
} }
return false; return false;
} }
bool bool

Write Preview
Loading…
Cancel
Save