From 1f04e6d32d0cc4d0137ffe2b472037503f3b0f82 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Oct 2020 12:50:25 +0200 Subject: [PATCH 1/5] Update LI-PS-PDU.asn --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e8b6eed..553cbec 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -272,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { - threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, + threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, ... } -- GitLab From ad1dfd8542eaa43501510a02982b3052cd3cc7de Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Oct 2020 12:06:52 +0100 Subject: [PATCH 2/5] Fixing ASN.1 compilation --- testing/check_asn1.py | 2 ++ testing/compile_asn.py | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/testing/check_asn1.py b/testing/check_asn1.py index df9771c..c87a226 100644 --- a/testing/check_asn1.py +++ b/testing/check_asn1.py @@ -3,6 +3,8 @@ from compile_asn import * if __name__ == '__main__': + log = logging.getLogger() + log.setLevel(logging.INFO) parseErrors, compileErrors, parser = validateAllASN1FilesInPath("./") parseErrorCount = 0 print ("ASN.1 Parser checks:") diff --git a/testing/compile_asn.py b/testing/compile_asn.py index a7a531a..33fea50 100644 --- a/testing/compile_asn.py +++ b/testing/compile_asn.py @@ -114,17 +114,21 @@ def compileASN1Files (fileList): except CompileError as ex: logging.info (f"Compiler error: {ex}") errors.append(ex) + return errors, None except ParseError as ex: logging.info (f"Parse error: {ex}") errors.append(ex) + return errors, None logging.info ("Compiled OK") return errors, c def validateASN1Files (fileList): parseErrors = parseASN1Files(fileList) - if len(parseErrors) > 0: - logging.info ("Abandonding compile due to parse errors") + errorCount = sum([len(v) for k,v in parseErrors.items()]) + if errorCount > 0: + logging.info ("Abandoning compile due to parse errors") + return parseErrors, [], None compileErrors, parser = compileASN1Files(fileList) return parseErrors, compileErrors, parser -- GitLab From f381d46988f5903eab279ace5ca970b729416db4 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Oct 2020 13:11:43 +0200 Subject: [PATCH 3/5] Checking compilation test again --- 102232-1/LI-PS-PDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 553cbec..4c3c489 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -30,7 +30,7 @@ IMPORTS -- from ETSI TS 102 232-2 [5] EmailCC, EmailIRI, - MessagingCC, + MessagingCCFoo, MessagingMMCC, MessagingIRI FROM EmailPDU @@ -348,7 +348,7 @@ CCContents ::= CHOICE pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, + messagingCC [14] MessagingCCFoo, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, -- GitLab From 48d486e4ab03490166a49854421615f9d24b71de Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Oct 2020 13:15:00 +0200 Subject: [PATCH 4/5] Reverting ASN.1 test change --- 102232-1/LI-PS-PDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 4c3c489..553cbec 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -30,7 +30,7 @@ IMPORTS -- from ETSI TS 102 232-2 [5] EmailCC, EmailIRI, - MessagingCCFoo, + MessagingCC, MessagingMMCC, MessagingIRI FROM EmailPDU @@ -348,7 +348,7 @@ CCContents ::= CHOICE pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCCFoo, + messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, -- GitLab From c4c0faee9c446657f2441e794fed88fe33be6da2 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Oct 2020 13:16:15 +0200 Subject: [PATCH 5/5] Reverting ASN.1 test change --- 102232-1/LI-PS-PDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 553cbec..e8b6eed 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -272,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { - threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, + threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, ... } -- GitLab