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

src/iec61850/server/mms_mapping/reporting.c

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

src/mms/iso_mms/client/mms_client_files.c

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

src/mms/iso_mms/common/mms_value.c

@@ -586,7 +586,6 @@ MmsValue*
 MmsValue_newIntegerFromInt8(int8_t integer)
 {
     MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
-    ;
 
     self->type = MMS_INTEGER;
     self->value.integer = BerInteger_createFromInt32((int32_t) integer);
@@ -598,7 +597,6 @@ MmsValue*
 MmsValue_newIntegerFromInt16(int16_t integer)
 {
     MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
-    ;
 
     self->type = MMS_INTEGER;
     self->value.integer = BerInteger_createFromInt32((int32_t) integer);
@@ -832,7 +830,6 @@ MmsValue*
 MmsValue_newUnsignedFromUint32(uint32_t integer)
 {
     MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
-    ;
 
     if (self == NULL)
         return NULL;
@@ -847,7 +844,6 @@ MmsValue*
 MmsValue_newIntegerFromInt64(int64_t integer)
 {
     MmsValue* self = (MmsValue*) GLOBAL_CALLOC(1, sizeof(MmsValue));
-    ;
 
     if (self == NULL)
         return NULL;
@@ -913,8 +909,6 @@ MmsValue_toFloat(const MmsValue* self)
             return val;
         }
     }
-    else
-        printf("MmsValue_toFloat: conversion error. Wrong type!\n");
 
     return 0.f;
 }
@@ -1169,7 +1163,7 @@ MmsValue_clone(const MmsValue* self)
         break;
     }
 
-    exit_function:
+exit_function:
     return newValue;
 }
 
@@ -1530,7 +1524,7 @@ setVisibleStringValue(MmsValue* self, const char* string)
             self->value.visibleString.buf[0] = 0;
     }
 
-    exit_function:
+exit_function:
     return;
 }
 
@@ -1744,7 +1738,7 @@ MmsValue_newStringFromByteArray(const uint8_t* byteArray, int size, MmsType type
         self = NULL;
     }
 
-    exit_function:
+exit_function:
     return self;
 }
 
@@ -1813,7 +1807,7 @@ MmsValue_newUtcTime(uint32_t timeval)
     valueArray[3] = timeArray[3];
 #endif
 
-    exit_function:
+exit_function:
     return self;
 }
 
@@ -1860,7 +1854,7 @@ MmsValue_createArray(MmsVariableSpecification* elementType, int size)
         }
     }
 
-    exit_function:
+exit_function:
     return self;
 }
 
@@ -1887,7 +1881,7 @@ MmsValue_createEmptyArray(int size)
         self->value.structure.components[i] = NULL;
     }
 
-    exit_function:
+exit_function:
     return self;
 }
 

src/mms/iso_mms/server/mms_information_report.c

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