- fixed bug in report timestamp in buffered reporting: was using UTC_TIME instead of BINARY_TIME

config/stack_config.h

@@ -18,7 +18,7 @@
 #define DEBUG_ISO_SERVER 0
 #define DEBUG_ISO_CLIENT 0
 #define DEBUG_IED_SERVER 0
-#define DEBUG_IED_CLIENT 1
+#define DEBUG_IED_CLIENT 0
 #define DEBUG_MMS_CLIENT 0
 #define DEBUG_MMS_SERVER 0
 #define DEBUG_GOOSE_SUBSCRIBER 0

dotnet/IEC61850forCSharp/ReportControlBlock.cs

@@ -372,6 +372,8 @@ namespace IEC61850
 
                 IedConnection_setRCBValues (connection, out error, self, parametersMask, singleRequest);
 
+				resetSendFlags();
+
                 if (error != 0)
                     throw new IedConnectionException ("setRCBValues service failed", error);
 
@@ -382,8 +384,6 @@ namespace IEC61850
                         InstallReportHandler(this.reportHandler, this.reportHandlerParameter);
                     }
                 }
-
-                resetSendFlags();
 			}
 
             /// <summary>

src/iec61850/client/client_report.c

@@ -397,11 +397,15 @@ private_IedConnection_handleReport(IedConnection self, MmsValue* value)
 
     /* has report-timestamp */
     if (MmsValue_getBitStringBit(optFlds, 2) == true) {
+
         MmsValue* timeStampValue = MmsValue_getElement(value, inclusionIndex);
 
         if (MmsValue_getType(timeStampValue) == MMS_BINARY_TIME) {
             matchingReport->hasTimestamp = true;
             matchingReport->timestamp = MmsValue_getBinaryTimeAsUtcMs(timeStampValue);
+
+            if (DEBUG_IED_CLIENT)
+                printf("DEBUG_IED_CLIENT: report has timestamp %llu\n", matchingReport->timestamp);
         }
 
         inclusionIndex++;

src/iec61850/server/mms_mapping/reporting.c

@@ -1178,6 +1178,8 @@ checkReportBufferForEntryID(ReportControl* rc, MmsValue* value)
             retVal = true;
             break;
         }
+
+        entry = entry->next;
     }
 
     return retVal;
@@ -2002,8 +2004,10 @@ sendNextReportEntry(ReportControl* self)
     	if (timeOfEntry == NULL) goto return_out_of_memory;
 
     	timeOfEntry->deleteValue = 0;
-    	timeOfEntry->type = MMS_UTC_TIME;
-    	MmsValue_setUtcTimeMs(timeOfEntry, report->timeOfEntry);
+    	timeOfEntry->type = MMS_BINARY_TIME;
+    	timeOfEntry->value.binaryTime.size = 6;
+
+    	MmsValue_setBinaryTime(timeOfEntry, report->timeOfEntry);
 
         if (MemAllocLinkedList_add(reportElements, timeOfEntry) == NULL)
             goto return_out_of_memory;