stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- extended server_example3.c to show Timestamp handling

Browse source 
- fixed server crash bug when whole LN is requested in a read request (bug #309)
This commit is contained in:
Michael Zillgith 2015-04-14 16:53:09 +02:00
parent b42aa358e9
commit 48b02ec1b0
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
examples/server_example3/server_example3.c
View file

@ -129,14 +129,26 @@ main(int argc, char** argv)
IedServer_lockDataModel(iedServer);
Timestamp iecTimestamp;
Timestamp_clearFlags(&iecTimestamp);
Timestamp_setTimeInMilliseconds(&iecTimestamp, timestamp);
/* toggle clock-not-synchronized flag in timestamp */
if (((int) t % 2) == 0)
Timestamp_setClockNotSynchronized(&iecTimestamp, true);
IedServer_updateFloatAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn1_mag_f, an1);
IedServer_updateUTCTimeAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn1_t, timestamp);
IedServer_updateTimestampAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn1_t, &iecTimestamp);
IedServer_updateFloatAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn2_mag_f, an2);
IedServer_updateUTCTimeAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn2_t, timestamp);
IedServer_updateTimestampAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn2_t, &iecTimestamp);
IedServer_updateFloatAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn3_mag_f, an3);
IedServer_updateUTCTimeAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn3_t, timestamp);
IedServer_updateTimestampAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn3_t, &iecTimestamp);
IedServer_updateFloatAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn4_mag_f, an4);
IedServer_updateUTCTimeAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn4_t, timestamp);
IedServer_updateTimestampAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_AnIn4_t, &iecTimestamp);
IedServer_unlockDataModel(iedServer);

7
src/iec61850/server/mms_mapping/mms_mapping.c
View file

@ -2156,10 +2156,13 @@ mmsReadAccessHandler (void* parameter, MmsDomain* domain, char* variableId, MmsS
if (DEBUG_IED_SERVER)
printf("IED_SERVER: mmsReadAccessHandler: Requested %s\n", variableId);
#if (CONFIG_IEC61850_SETTING_GROUPS == 1)
char* separator = strchr(variableId, '$');
if (separator == NULL)
return DATA_ACCESS_ERROR_SUCCESS;
#if (CONFIG_IEC61850_SETTING_GROUPS == 1)
if (isFunctionalConstraintSE(separator)) {
SettingGroup* sg = getSettingGroupByMmsDomain(self, domain);

8
src/mms/iso_cotp/cotp.c
View file

@ -577,7 +577,13 @@ parseCotpMessage(CotpConnection* self)
uint8_t tpduType;
len = buffer[0];
assert(len <= tpduLength);
if (len > tpduLength) {
if (DEBUG_COTP)
printf("COTP: parseCotpMessage: len=%d tpduLength=%d\n", len, tpduLength);
return COTP_ERROR;
}
tpduType = buffer[1];