RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.6_develop_517' into v1.6_develop

Browse Source
v1.6
Michael Zillgith 4 weeks ago
parent f9bee73c1e 7d6b3cce69
commit 478f4e8b35
4 changed files with 224 additions and 139 deletions
Show Stats Download Patch File Download Diff File

22
src/mms/iso_mms/asn1c/constr_CHOICE.c
Unescape Escape View File

@ -291,7 +291,8 @@ CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
/* /*
* Read in the "end of data chunks"'s. * Read in the "end of data chunks"'s.
*/ */
while(ctx->left < 0) { while(ctx->left < 0)
{
ssize_t tl; ssize_t tl;
tl = ber_fetch_tag(ptr, LEFT, &tlv_tag); tl = ber_fetch_tag(ptr, LEFT, &tlv_tag);
@ -304,13 +305,17 @@ CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
/* /*
* Expected <0><0>... * Expected <0><0>...
*/ */
if(((const uint8_t *)ptr)[0] == 0) { if (((const uint8_t*)ptr)[0] == 0)
if(LEFT < 2) { {
if (LEFT < 2)
{
if (SIZE_VIOLATION) if (SIZE_VIOLATION)
RETURN(RC_FAIL); RETURN(RC_FAIL);
else else
RETURN(RC_WMORE); RETURN(RC_WMORE);
} else if(((const uint8_t *)ptr)[1] == 0) { }
else if (((const uint8_t*)ptr)[1] == 0)
{
/* /*
* Correctly finished with <0><0>. * Correctly finished with <0><0>.
*/ */
@ -318,7 +323,14 @@ CHOICE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
ctx->left++; ctx->left++;
continue; continue;
} }
} else { else
{
/* this case should not happen when the message is correctly encoded */
RETURN(RC_FAIL);
}
}
else
{
RETURN(RC_FAIL); RETURN(RC_FAIL);
} }

39
src/mms/iso_mms/asn1c/constr_SEQUENCE.c
Unescape Escape View File

@ -223,19 +223,21 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
case -1: RETURN(RC_FAIL); case -1: RETURN(RC_FAIL);
} }
if(ctx->left < 0 && ((const uint8_t *)ptr)[0] == 0) { if (ctx->left < 0 && ((const uint8_t*)ptr)[0] == 0)
if(LEFT < 2) { {
if (LEFT < 2)
{
if (SIZE_VIOLATION) if (SIZE_VIOLATION)
RETURN(RC_FAIL); RETURN(RC_FAIL);
else else
RETURN(RC_WMORE); RETURN(RC_WMORE);
} else if(((const uint8_t *)ptr)[1] == 0) { }
else if (((const uint8_t*)ptr)[1] == 0)
{
if((edx + elements[edx].optional if ((edx + elements[edx].optional == td->elements_count) ||
== td->elements_count) (IN_EXTENSION_GROUP(specs, edx) && specs->ext_before > td->elements_count))
|| (IN_EXTENSION_GROUP(specs, edx) {
&& specs->ext_before
> td->elements_count)) {
/* /*
* Yeah, baby! Found the terminator * Yeah, baby! Found the terminator
* of the indefinite length structure. * of the indefinite length structure.
@ -248,6 +250,11 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
goto phase3; goto phase3;
} }
} }
else
{
/* this case should not happen when the message is correctly encoded */
RETURN(RC_FAIL);
}
} }
/* /*
@ -421,14 +428,17 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
/* /*
* If expected <0><0>... * If expected <0><0>...
*/ */
if(ctx->left < 0 if (ctx->left < 0 && ((const uint8_t*)ptr)[0] == 0)
&& ((const uint8_t *)ptr)[0] == 0) { {
if(LEFT < 2) { if (LEFT < 2)
{
if (SIZE_VIOLATION) if (SIZE_VIOLATION)
RETURN(RC_FAIL); RETURN(RC_FAIL);
else else
RETURN(RC_WMORE); RETURN(RC_WMORE);
} else if(((const uint8_t *)ptr)[1] == 0) { }
else if (((const uint8_t*)ptr)[1] == 0)
{
/* /*
* Correctly finished with <0><0>. * Correctly finished with <0><0>.
*/ */
@ -436,6 +446,11 @@ SEQUENCE_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
ctx->left++; ctx->left++;
ctx->phase = 4; ctx->phase = 4;
continue; continue;
}
else
{
/* this case should not happen when the message is correctly encoded */
RETURN(RC_FAIL);
} }
} }

15
src/mms/iso_mms/asn1c/constr_SET_OF.c
Unescape Escape View File

@ -158,19 +158,28 @@ SET_OF_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
case -1: RETURN(RC_FAIL); case -1: RETURN(RC_FAIL);
} }
if(ctx->left < 0 && ((const uint8_t *)ptr)[0] == 0) { if (ctx->left < 0 && ((const uint8_t*)ptr)[0] == 0)
if(LEFT < 2) { {
if (LEFT < 2)
{
if (SIZE_VIOLATION) if (SIZE_VIOLATION)
RETURN(RC_FAIL); RETURN(RC_FAIL);
else else
RETURN(RC_WMORE); RETURN(RC_WMORE);
} else if(((const uint8_t *)ptr)[1] == 0) { }
else if (((const uint8_t*)ptr)[1] == 0)
{
/* /*
* Found the terminator of the * Found the terminator of the
* indefinite length structure. * indefinite length structure.
*/ */
break; break;
} }
else
{
/* this case should not happen when the message is correctly encoded */
RETURN(RC_FAIL);
}
} }
/* Outmost tag may be unknown and cannot be fetched/compared */ /* Outmost tag may be unknown and cannot be fetched/compared */

161
src/mms/iso_presentation/iso_presentation.c
Unescape Escape View File

@ -1,7 +1,7 @@
/* /*
* iso_presentation.c * iso_presentation.c
* *
* Copyright 2013-2022 Michael Zillgith * Copyright 2013-2025 Michael Zillgith
* *
* This file is part of libIEC61850. * This file is part of libIEC61850.
* *
@ -35,7 +35,6 @@
#define DEBUG_PRES 0 #define DEBUG_PRES 0
#endif #endif
static uint8_t calledPresentationSelector[] = { 0x00, 0x00, 0x00, 0x01 }; static uint8_t calledPresentationSelector[] = { 0x00, 0x00, 0x00, 0x01 };
static uint8_t asn_id_as_acse[] = { 0x52, 0x01, 0x00, 0x01 }; static uint8_t asn_id_as_acse[] = { 0x52, 0x01, 0x00, 0x01 };
@ -73,7 +72,8 @@ encodeUserData(uint8_t* buffer, int bufPos,
fullyEncodedDataLength += BerEncoder_determineLengthSize(encodedDataSetLength) + 1; fullyEncodedDataLength += BerEncoder_determineLengthSize(encodedDataSetLength) + 1;
if (encode) { if (encode)
{
/* fully-encoded-data */ /* fully-encoded-data */
bufPos = BerEncoder_encodeTL(0x61, fullyEncodedDataLength, buffer, bufPos); bufPos = BerEncoder_encodeTL(0x61, fullyEncodedDataLength, buffer, bufPos);
bufPos = BerEncoder_encodeTL(0x30, encodedDataSetLength, buffer, bufPos); bufPos = BerEncoder_encodeTL(0x30, encodedDataSetLength, buffer, bufPos);
@ -87,7 +87,8 @@ encodeUserData(uint8_t* buffer, int bufPos,
return bufPos; return bufPos;
} }
else { else
{
int encodedUserDataLength = fullyEncodedDataLength + 1; int encodedUserDataLength = fullyEncodedDataLength + 1;
encodedUserDataLength += BerEncoder_determineLengthSize(fullyEncodedDataLength); encodedUserDataLength += BerEncoder_determineLengthSize(fullyEncodedDataLength);
@ -195,7 +196,8 @@ parseFullyEncodedData(IsoPresentation* self, uint8_t* buffer, int len, int bufPo
int endPos = bufPos + len; int endPos = bufPos + len;
if (buffer[bufPos++] != 0x30) { if (buffer[bufPos++] != 0x30)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: user-data parse error\n"); printf("PRES: user-data parse error\n");
return -1; return -1;
@ -203,7 +205,8 @@ parseFullyEncodedData(IsoPresentation* self, uint8_t* buffer, int len, int bufPo
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, endPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, endPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: wrong parameter length\n"); printf("PRES: wrong parameter length\n");
return -1; return -1;
@ -211,19 +214,22 @@ parseFullyEncodedData(IsoPresentation* self, uint8_t* buffer, int len, int bufPo
endPos = bufPos + len; endPos = bufPos + len;
while (bufPos < endPos) { while (bufPos < endPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
int length; int length;
bufPos = BerDecoder_decodeLength(buffer, &length, bufPos, endPos); bufPos = BerDecoder_decodeLength(buffer, &length, bufPos, endPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: wrong parameter length\n"); printf("PRES: wrong parameter length\n");
return -1; return -1;
} }
switch (tag) { switch (tag)
{
case 0x02: /* presentation-context-identifier */ case 0x02: /* presentation-context-identifier */
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: presentation-context-identifier\n"); printf("PRES: presentation-context-identifier\n");
@ -262,7 +268,8 @@ parseFullyEncodedData(IsoPresentation* self, uint8_t* buffer, int len, int bufPo
} }
} }
if (!userDataPresent) { if (!userDataPresent)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: user-data not present\n"); printf("PRES: user-data not present\n");
return -1; return -1;
@ -280,13 +287,15 @@ parsePCDLEntry(IsoPresentation* self, uint8_t* buffer, int totalLength, int bufP
bool isAcse = false; bool isAcse = false;
bool isMms = false; bool isMms = false;
while (bufPos < endPos) { while (bufPos < endPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
int len; int len;
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, endPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, endPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: Invalid PDU\n"); printf("PRES: Invalid PDU\n");
return -1; return -1;
@ -302,11 +311,13 @@ parsePCDLEntry(IsoPresentation* self, uint8_t* buffer, int totalLength, int bufP
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: abstract-syntax-name with len %i\n", len); printf("PRES: abstract-syntax-name with len %i\n", len);
if (len == 5) { if (len == 5)
{
if (memcmp(buffer + bufPos, asn_id_mms, 5) == 0) if (memcmp(buffer + bufPos, asn_id_mms, 5) == 0)
isMms = true; isMms = true;
} }
else if (len == 4) { else if (len == 4)
{
if (memcmp(buffer + bufPos, asn_id_as_acse, 4) == 0) if (memcmp(buffer + bufPos, asn_id_as_acse, 4) == 0)
isAcse = true; isAcse = true;
} }
@ -333,25 +344,29 @@ parsePCDLEntry(IsoPresentation* self, uint8_t* buffer, int totalLength, int bufP
} }
} }
if (contextId < 0) { if (contextId < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: ContextId not defined!\n"); printf("PRES: ContextId not defined!\n");
return -1; return -1;
} }
if ((isAcse == false) && (isMms == false)) { if ((isAcse == false) && (isMms == false))
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: not an ACSE or MMS context definition\n"); printf("PRES: not an ACSE or MMS context definition\n");
return -1; return -1;
} }
if (isMms) { if (isMms)
{
self->mmsContextId = (uint8_t)contextId; self->mmsContextId = (uint8_t)contextId;
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: MMS context id is %i\n", contextId); printf("PRES: MMS context id is %i\n", contextId);
} }
else { else
{
self->acseContextId = (uint8_t)contextId; self->acseContextId = (uint8_t)contextId;
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: ACSE context id is %i\n", contextId); printf("PRES: ACSE context id is %i\n", contextId);
@ -365,7 +380,8 @@ parsePresentationContextDefinitionList(IsoPresentation* self, uint8_t* buffer, i
{ {
int endPos = bufPos + totalLength; int endPos = bufPos + totalLength;
while (bufPos < endPos) { while (bufPos < endPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
int len; int len;
@ -373,7 +389,8 @@ parsePresentationContextDefinitionList(IsoPresentation* self, uint8_t* buffer, i
if (bufPos < 0) if (bufPos < 0)
return -1; return -1;
switch (tag) { switch (tag)
{
case 0x30: case 0x30:
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: parse pcd entry\n"); printf("PRES: parse pcd entry\n");
@ -404,11 +421,13 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
bool hasUserData = false; bool hasUserData = false;
while (bufPos < endPos) { while (bufPos < endPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
int len; int len;
if (bufPos == endPos) { if (bufPos == endPos)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: invalid message\n"); printf("PRES: invalid message\n");
return -1; return -1;
@ -416,20 +435,24 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, endPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, endPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: wrong parameter length\n"); printf("PRES: wrong parameter length\n");
return -1; return -1;
} }
switch (tag) { switch (tag)
{
case 0x81: /* calling-presentation-selector */ case 0x81: /* calling-presentation-selector */
if (len > 16) { if (len > 16)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: calling-presentation-sel too large\n"); printf("PRES: calling-presentation-sel too large\n");
} }
else { else
{
self->callingPresentationSelector.size = len; self->callingPresentationSelector.size = len;
int i; int i;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
@ -441,11 +464,13 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
case 0x82: /* called-presentation-selector */ case 0x82: /* called-presentation-selector */
if (len > 16) { if (len > 16)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: called-presentation-sel too large\n"); printf("PRES: called-presentation-sel too large\n");
} }
else { else
{
self->calledPresentationSelector.size = len; self->calledPresentationSelector.size = len;
int i; int i;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
@ -457,7 +482,8 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
case 0x83: /* responding-presentation-selector */ case 0x83: /* responding-presentation-selector */
if (len > 16) { if (len > 16)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: responding-presentation-sel too large\n"); printf("PRES: responding-presentation-sel too large\n");
} }
@ -505,7 +531,8 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
} }
} }
if (hasUserData == false) { if (hasUserData == false)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: user-data is missing\n"); printf("PRES: user-data is missing\n");
@ -525,7 +552,8 @@ IsoPresentation_parseAcceptMessage(IsoPresentation* self, ByteBuffer* byteBuffer
uint8_t cpTag = buffer[bufPos++]; uint8_t cpTag = buffer[bufPos++];
if (cpTag != 0x31) { if (cpTag != 0x31)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: not a CPA message\n"); printf("PRES: not a CPA message\n");
return 0; return 0;
@ -535,18 +563,21 @@ IsoPresentation_parseAcceptMessage(IsoPresentation* self, ByteBuffer* byteBuffer
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: Invalid message\n"); printf("PRES: Invalid message\n");
return 0; return 0;
} }
while (bufPos < maxBufPos) { while (bufPos < maxBufPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: wrong parameter length\n"); printf("PRES: wrong parameter length\n");
return 0; return 0;
@ -559,7 +590,8 @@ IsoPresentation_parseAcceptMessage(IsoPresentation* self, ByteBuffer* byteBuffer
case 0xa2: /* normal-mode-parameters */ case 0xa2: /* normal-mode-parameters */
bufPos = parseNormalModeParameters(self, buffer, len, bufPos); bufPos = parseNormalModeParameters(self, buffer, len, bufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: error parsing normal-mode-parameters\n"); printf("PRES: error parsing normal-mode-parameters\n");
return 0; return 0;
@ -594,7 +626,7 @@ IsoPresentation_createUserData(IsoPresentation* self, BufferChain writeBuffer, B
int payloadLength = payload->length; int payloadLength = payload->length;
int userDataLengthFieldSize = BerEncoder_determineLengthSize(payloadLength); int userDataLengthFieldSize = BerEncoder_determineLengthSize(payloadLength);
;
int pdvListLength = payloadLength + (userDataLengthFieldSize + 4); int pdvListLength = payloadLength + (userDataLengthFieldSize + 4);
int pdvListLengthFieldSize = BerEncoder_determineLengthSize(pdvListLength); int pdvListLengthFieldSize = BerEncoder_determineLengthSize(pdvListLength);
@ -624,7 +656,7 @@ IsoPresentation_createUserDataACSE(IsoPresentation* self, BufferChain writeBuffe
int payloadLength = payload->length; int payloadLength = payload->length;
int userDataLengthFieldSize = BerEncoder_determineLengthSize(payloadLength); int userDataLengthFieldSize = BerEncoder_determineLengthSize(payloadLength);
;
int pdvListLength = payloadLength + (userDataLengthFieldSize + 4); int pdvListLength = payloadLength + (userDataLengthFieldSize + 4);
int pdvListLengthFieldSize = BerEncoder_determineLengthSize(pdvListLength); int pdvListLengthFieldSize = BerEncoder_determineLengthSize(pdvListLength);
@ -664,7 +696,8 @@ IsoPresentation_parseUserData(IsoPresentation* self, ByteBuffer* readBuffer)
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: invalid message!\n"); printf("PRES: invalid message!\n");
return 0; return 0;
@ -675,25 +708,29 @@ IsoPresentation_parseUserData(IsoPresentation* self, ByteBuffer* readBuffer)
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: invalid message!\n"); printf("PRES: invalid message!\n");
return 0; return 0;
} }
while (bufPos < maxBufPos) { while (bufPos < maxBufPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
uint8_t lenField = buffer[bufPos]; uint8_t lenField = buffer[bufPos];
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: wrong parameter length\n"); printf("PRES: wrong parameter length\n");
return 0; return 0;
} }
switch (tag) { switch (tag)
{
case 0x02: /* abstract-syntax-name */ case 0x02: /* abstract-syntax-name */
self->nextContextId = buffer[bufPos]; self->nextContextId = buffer[bufPos];
hasAbstractSyntaxName = true; hasAbstractSyntaxName = true;
@ -703,8 +740,10 @@ IsoPresentation_parseUserData(IsoPresentation* self, ByteBuffer* readBuffer)
case 0x06: /* transfer-syntax-name */ case 0x06: /* transfer-syntax-name */
{ {
/* check if basic-encoding (2.1.1 - 51 01) */ /* check if basic-encoding (2.1.1 - 51 01) */
if ((buffer[bufPos] != 0x51) || (buffer[bufPos + 1] != 0x01)) { if ((buffer[bufPos] != 0x51) || (buffer[bufPos + 1] != 0x01))
if (DEBUG_PRES) { {
if (DEBUG_PRES)
{
printf("PRES: unknown transfer-syntax-name\n"); printf("PRES: unknown transfer-syntax-name\n");
} }
@ -715,10 +754,10 @@ IsoPresentation_parseUserData(IsoPresentation* self, ByteBuffer* readBuffer)
} }
break; break;
case 0xa0: /* presentation data */ case 0xa0: /* presentation data */
{ {
if (hasAbstractSyntaxName == false) { if (hasAbstractSyntaxName == false)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: abstract-syntax-name missing!\n"); printf("PRES: abstract-syntax-name missing!\n");
@ -752,7 +791,8 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
uint8_t cpTag = buffer[bufPos++]; uint8_t cpTag = buffer[bufPos++];
if (cpTag != 0x31) { if (cpTag != 0x31)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: not a CP type\n"); printf("PRES: not a CP type\n");
return 0; return 0;
@ -762,7 +802,8 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: invalid message!\n"); printf("PRES: invalid message!\n");
return 0; return 0;
@ -771,21 +812,25 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: CPType with len %i\n", len); printf("PRES: CPType with len %i\n", len);
while (bufPos < maxBufPos) { while (bufPos < maxBufPos)
{
uint8_t tag = buffer[bufPos++]; uint8_t tag = buffer[bufPos++];
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: invalid message!\n"); printf("PRES: invalid message!\n");
return 0; return 0;
} }
switch (tag) { switch (tag)
{
case 0xa0: /* mode-selection */ case 0xa0: /* mode-selection */
{ {
if (buffer[bufPos++] != 0x80) { if (buffer[bufPos++] != 0x80)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: mode-value of wrong type!\n"); printf("PRES: mode-value of wrong type!\n");
return 0; return 0;
@ -793,7 +838,8 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos); bufPos = BerDecoder_decodeLength(buffer, &len, bufPos, maxBufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: invalid message!\n"); printf("PRES: invalid message!\n");
return 0; return 0;
@ -810,12 +856,14 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
case 0xa2: /* normal-mode-parameters */ case 0xa2: /* normal-mode-parameters */
bufPos = parseNormalModeParameters(self, buffer, len, bufPos); bufPos = parseNormalModeParameters(self, buffer, len, bufPos);
if (bufPos < 0) { if (bufPos < 0)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: error parsing normal-mode-parameters\n"); printf("PRES: error parsing normal-mode-parameters\n");
return 0; return 0;
} }
else { else
{
hasNormalModeParameters = true; hasNormalModeParameters = true;
} }
@ -830,7 +878,8 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
} }
} }
if (hasNormalModeParameters == false) { if (hasNormalModeParameters == false)
{
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: error - normal mode parameters are missing\n"); printf("PRES: error - normal mode parameters are missing\n");

Write Preview
Loading…
Cancel
Save