From a606848a8b01e8fa52014da56d4308c8a1f667e1 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 21 Nov 2020 15:45:54 +0100 Subject: [PATCH] - GOOSE subscriber: changed maximum GoID size according to tissue 770 (129 bytes) --- src/goose/goose_publisher.c | 6 +----- src/goose/goose_receiver.c | 2 +- src/goose/goose_receiver_internal.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/goose/goose_publisher.c b/src/goose/goose_publisher.c index c14b9e64..51e455a0 100644 --- a/src/goose/goose_publisher.c +++ b/src/goose/goose_publisher.c @@ -40,7 +40,7 @@ prepareGooseBuffer(GoosePublisher self, CommParameters* parameters, const char* struct sGoosePublisher { uint8_t* buffer; - /* uint16_t appId; */ + EthernetSocket ethernetSocket; int lengthField; int payloadStart; @@ -50,10 +50,6 @@ struct sGoosePublisher { char* goCBRef; char* dataSetRef; - /* uint16_t minTime; */ - /* uint16_t maxTime; */ - /* bool fixedOffs; */ - uint32_t confRev; uint32_t stNum; uint32_t sqNum; diff --git a/src/goose/goose_receiver.c b/src/goose/goose_receiver.c index 2fdc004a..070b35c3 100644 --- a/src/goose/goose_receiver.c +++ b/src/goose/goose_receiver.c @@ -684,7 +684,7 @@ parseGoosePayload(GooseReceiver self, uint8_t* buffer, int apduLength) printf("GOOSE_SUBSCRIBER: Found goId\n"); { if (matchingSubscriber) { - if (elementLength > 65) { + if (elementLength > 129) { if (DEBUG_GOOSE_SUBSCRIBER) printf("GOOSE_SUBSCRIBER: goId too long!\n"); } diff --git a/src/goose/goose_receiver_internal.h b/src/goose/goose_receiver_internal.h index c8b6cca1..a429c675 100644 --- a/src/goose/goose_receiver_internal.h +++ b/src/goose/goose_receiver_internal.h @@ -37,7 +37,7 @@ struct sGooseSubscriber { char goCBRef[130]; char datSet[130]; - char goId[66]; + char goId[130]; int goCBRefLen; uint32_t timeAllowedToLive; uint32_t stNum;