- small code improvements and warnings removed (LIB61850-517)

v1.6
Michael Zillgith 1 month ago
parent 4a37e625d7
commit a4c750820b

@ -1001,9 +1001,9 @@ parseGoosePayload(GooseReceiver self, uint8_t* buffer, int apduLength)
return 0;
}
exit_with_fault:
if (DEBUG_GOOSE_SUBSCRIBER)
printf("GOOSE_SUBSCRIBER: Invalid goose payload\n");
return -1;
}
@ -1247,7 +1247,8 @@ GooseReceiver_start(GooseReceiver self)
Thread_destroy(self->thread);
self->thread = NULL;
}
else {
else
{
if (DEBUG_GOOSE_SUBSCRIBER)
printf("GOOSE_SUBSCRIBER: Starting GOOSE receiver failed for interface %s\n", self->interfaceId);
}
@ -1318,7 +1319,8 @@ GooseReceiver_startThreadless(GooseReceiver self)
return (EthernetSocket)0;
}
}
else {
else
{
#endif /* (CONFIG_IEC61850_R_GOOSE == 1) */
#if (CONFIG_IEC61850_L2_GOOSE == 1)

@ -465,7 +465,7 @@ iedConnection_doesControlObjectMatch(const char* objRef, const char* cntrlObj)
}
static bool
doesReportMatchControlObject(char* domainName, char* itemName, const char* objectRef)
doesReportMatchControlObject(const char* domainName, const char* itemName, const char* objectRef)
{
int i = 0;

@ -449,9 +449,6 @@ installDefaultValuesInCache(IedServer self)
{
IedModel* model = self->model;
char componentId[OBJ_REF_MAX_SIZE + 1];
componentId[0] = 0;
char objectReference[OBJ_REF_MAX_SIZE + 1];
LogicalDevice* logicalDevice = model->firstChild;
@ -481,6 +478,7 @@ installDefaultValuesInCache(IedServer self)
while (dataObject)
{
char componentId[OBJ_REF_MAX_SIZE + 1];
componentId[0] = 0;
installDefaultValuesForDataObject(self, logicalDevice, dataObject, objectReference, refPosition, -1, componentId, 0);

@ -66,6 +66,9 @@ IsoSession_createDataSpdu(IsoSession* self, BufferChain buffer, BufferChain payl
LIB61850_INTERNAL void
IsoSession_createAcceptSpdu(IsoSession* self, BufferChain buffer, BufferChain payload);
LIB61850_INTERNAL void
IsoSession_createRefuseSpdu(IsoSession* self, BufferChain buffer, BufferChain payload, uint8_t reasonCode);
LIB61850_INTERNAL void
IsoSession_createAbortSpdu(IsoSession* self, BufferChain buffer, BufferChain payload);

@ -458,12 +458,13 @@ IsoSession_createAcceptSpdu(IsoSession* self, BufferChain buffer, BufferChain pa
void
IsoSession_createRefuseSpdu(IsoSession* self, BufferChain buffer, BufferChain payload, uint8_t reasonCode)
{
(void)self;
(void)payload;
int offset = 0;
uint8_t* buf = buffer->buffer;
int lengthOffset;
buf[offset++] = 12; /* REFUSE SPDU */
lengthOffset = offset;
offset++;
offset = encodeConnectionIdentifier(buf, offset, reasonCode);

Loading…
Cancel
Save