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

- fixed problem with trailing characters in dataRef in buffered reports

Browse source 
- TimeOfEntry is stored for each buffered report entry in report buffer
This commit is contained in:
Michael Zillgith 2015-08-14 17:28:44 +02:00
parent 2e24ecb4eb
commit 3969e07256
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/iec61850/inc_private/reporting.h
View file

@ -29,6 +29,7 @@ typedef struct sReportBufferEntry ReportBufferEntry;
struct sReportBufferEntry {
uint8_t entryId[8];
uint8_t flags; /* bit 0 (1 = isIntegrityReport), bit 1 (1 = isGiReport) */
uint64_t timeOfEntry;
int entryLength;
ReportBufferEntry* next;
};

39
src/iec61850/server/mms_mapping/reporting.c
View file

@ -1420,7 +1420,6 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
if (rcbValue != NULL)
MmsValue_update(rcbValue, value);
else {
printf("AAAAAA\n");
retVal = DATA_ACCESS_ERROR_OBJECT_VALUE_INVALID;
goto exit_function;
}
@ -1520,7 +1519,7 @@ printReportId(ReportBufferEntry* report)
#endif
static void
enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI)
enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_t timeOfEntry)
{
if (DEBUG_IED_SERVER) printf("IED_SERVER: enqueueReport: RCB name: %s (SQN:%u) enabled:%i buffered:%i buffering:%i intg:%i GI:%i\n",
reportControl->name, (unsigned) reportControl->sqNum, reportControl->enabled,
@ -1746,15 +1745,17 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI)
ReportBufferEntry* entry = (ReportBufferEntry*) entryBufPos;
/* ENTRY_ID is set to system time in ms! */
uint64_t timestamp = Hal_getTimeInMs();
uint64_t entryId = timeOfEntry;
if (timestamp <= reportControl->lastEntryId)
timestamp = reportControl->lastEntryId + 1;
if (entryId <= reportControl->lastEntryId)
entryId = reportControl->lastEntryId + 1;
entry->timeOfEntry = entryId;
#if (ORDER_LITTLE_ENDIAN == 1)
memcpyReverseByteOrder(entry->entryId, (uint8_t*) &timestamp, 8);
memcpyReverseByteOrder(entry->entryId, (uint8_t*) &entryId, 8);
#else
memcpy (entry->entryId, (uint8_t*) &timestamp, 8);
memcpy (entry->entryId, (uint8_t*) &entryId, 8);
#endif
#if (DEBUG_IED_SERVER == 1)
@ -1844,7 +1845,7 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI)
if (buffer->oldestReport == NULL)
buffer->oldestReport = buffer->lastEnqueuedReport;
reportControl->lastEntryId = timestamp;
reportControl->lastEntryId = entryId;
}
static void
@ -1924,7 +1925,15 @@ sendNextReportEntry(ReportControl* self)
goto return_out_of_memory;
if (MmsValue_getBitStringBit(optFlds, 2)) { /* report time stamp */
if (MemAllocLinkedList_add(reportElements, self->timeOfEntry) == NULL)
MmsValue* timeOfEntry = (MmsValue*) MemoryAllocator_allocate(&ma, sizeof(MmsValue));
if (timeOfEntry == NULL) goto return_out_of_memory;
timeOfEntry->deleteValue = 0;
timeOfEntry->type = MMS_UTC_TIME;
MmsValue_setUtcTimeMs(timeOfEntry, report->timeOfEntry);
if (MemAllocLinkedList_add(reportElements, timeOfEntry) == NULL)
goto return_out_of_memory;
}
@ -2010,7 +2019,7 @@ sendNextReportEntry(ReportControl* self)
+ ldNameLength
+ variableNameLength + 1;
char* dataReference = (char*) MemoryAllocator_allocate(&ma, refLen);
char* dataReference = (char*) MemoryAllocator_allocate(&ma, refLen + 1);
if (dataReference == NULL) goto return_out_of_memory;
@ -2214,7 +2223,7 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
/* send current events in event buffer before GI report */
if (rc->triggered) {
if (rc->buffered)
enqueueReport(rc, false, false);
enqueueReport(rc, false, false, currentTimeInMs);
else
sendReport(rc, false, false);
@ -2224,7 +2233,7 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
updateTimeOfEntry(rc, currentTimeInMs);
if (rc->buffered)
enqueueReport(rc, false, true);
enqueueReport(rc, false, true, currentTimeInMs);
else
sendReport(rc, false, true);
@ -2242,7 +2251,7 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
/* send current events in event buffer before integrity report */
if (rc->triggered) {
if (rc->buffered)
enqueueReport(rc, false, false);
enqueueReport(rc, false, false, currentTimeInMs);
else
sendReport(rc, false, false);
@ -2253,7 +2262,7 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
updateTimeOfEntry(rc, currentTimeInMs);
if (rc->buffered)
enqueueReport(rc, true, false);
enqueueReport(rc, true, false, currentTimeInMs);
else
sendReport(rc, true, false);
@ -2266,7 +2275,7 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
if (currentTimeInMs >= rc->reportTime) {
if (rc->buffered)
enqueueReport(rc, false, false);
enqueueReport(rc, false, false, currentTimeInMs);
else
sendReport(rc, false, false);