- fixed - SV publisher encoding problem when svID or datset length > 127 bytes (LIB61850-315)(#382)

3 years ago · 19f7066c38
parent 377d708f4e
commit 19f7066c38
1 changed files with 6 additions and 3 deletions
--- a/src/sampled_values/sv_publisher.c
+++ b/src/sampled_values/sv_publisher.c
@ -320,11 +320,14 @@ SVPublisher_ASDU_getEncodedSize(SVPublisher_ASDU self)
    int encodedSize = 0;

    /* svID */
-    encodedSize += ( 2 + strlen(self->svID) );
+    int svIdLen = strlen(self->svID);
+    encodedSize += (1 + BerEncoder_determineLengthSize(svIdLen) + svIdLen);

    /* datset */
-    if (self->datset != NULL)
-        encodedSize += ( 2 + strlen(self->datset) );
+    if (self->datset != NULL) {
+        int datSetLen = strlen(self->datset);
+        encodedSize += (1 + BerEncoder_determineLengthSize(datSetLen) + datSetLen);
+    }

    /* smpCnt */
    encodedSize += 4;