open5gs/lib/asn1c/support/README.md

197 lines
7.7 KiB
Markdown
Raw Normal View History

Use mounse07410(vlm_master) git's fork for asn1c
commit 24247e2813a7510ebabe6a9b6b6b29fffa0eb27b (HEAD -> vlm_master, origin/vlm_master, origin/HEAD)
Author: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Fri Jul 15 17:43:08 2022 +0200
aper: Rework aper_get_length to gain lb & ub information
This should help aper_put_length() to take proper decisions on the way
to encode the length, since the range alone is not enough.
A contraint of lb=1 ub=65536 would yield a range=65536, but according to
ITU-T X.691 11.9 it shouldn't be encoded using nsnnwn since that only
applies in case ub<65536.
As a result, it would end up encoding/decoding it using 2 bytes while it
should use only 1.
Related: https://github.com/mouse07410/asn1c/issues/94
2018-03-04 07:30:03 +00:00
===========================================
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/my$ \
git clone https://github.com/mouse07410/asn1c.git
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/my$ \
git checkout git checkout 24247e2813a7510ebabe6a9b6b6b29fffa0eb27b
OR
user@host ~/Documents/git/my$ \
git clone https://github.com/open5gs/asn1c.git
2020-05-23 02:24:48 +00:00
user@host Documents/git/my/asn1c$ \
autoreconf -fi;./configure;make -j4
2018-03-04 07:30:03 +00:00
Modify 36413-g40.txt to 36413-g40.asn
===========================================
user@host ~/documents/git/open5gs/lib/asn1c/support/s1ap-r16.7.0$ \
diff 36413-g70.txt 36413-g70.asn
2018-03-04 07:30:03 +00:00
ASN.1 encoder/decoder
===========================================
user@host ~/documents/git/open5gs/lib/asn1c/s1ap$ \
2020-05-23 02:24:48 +00:00
ASN1C_PREFIX=S1AP_ ../../../../my/asn1c/asn1c/asn1c -pdu=all \
2018-03-04 07:30:03 +00:00
-fcompound-names -findirect-choice -fno-include-deps \
-no-gen-BER -no-gen-XER -no-gen-OER -no-gen-UPER \
../support/s1ap-r16.7.0/36413-g70.asn
2018-03-04 07:30:03 +00:00
user@host ~/Documents/git/open5gs/lib/asn1c/ngap$ \
2020-05-23 02:24:48 +00:00
ASN1C_PREFIX=NGAP_ ../../../../my/asn1c/asn1c/asn1c -pdu=all \
-fcompound-names -findirect-choice -fno-include-deps \
-no-gen-BER -no-gen-XER -no-gen-OER -no-gen-UPER \
../support/ngap-r16.7.0/38413-g70.asn
Fix NGAP_RANNodeNameUTF8String.c (Issues #994 - APC_EXTENSIBLE)
===============================================================
diff --git a/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c b/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
index 9e469f7f..79ebd028 100644
--- a/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
+++ b/lib/asn1c/ngap/NGAP_RANNodeNameUTF8String.c
@@ -46,7 +46,11 @@ NGAP_RANNodeNameUTF8String_constraint(const asn_TYPE_descriptor_t *td, const voi
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
asn_per_constraints_t asn_PER_type_NGAP_RANNodeNameUTF8String_constr_1 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#if 0 /* modified by acetcom */
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#else
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 150 } /* (SIZE(1..150,...)) */,
+#endif
0, 0 /* No PER value map */
};
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
Fix NGAP_AMFNameUTF8String.c (Issues #994 - APC_EXTENSIBLE)
===============================================================
diff --git a/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c b/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
index 1df33a4d..a74f97ea 100644
--- a/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
+++ b/lib/asn1c/ngap/NGAP_AMFNameUTF8String.c
@@ -46,7 +46,11 @@ NGAP_AMFNameUTF8String_constraint(const asn_TYPE_descriptor_t *td, const void *s
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
asn_per_constraints_t asn_PER_type_NGAP_AMFNameUTF8String_constr_1 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#if 0 /* modified by acetcom */
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
+#else
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 150 } /* (SIZE(1..150,...)) */,
+#endif
0, 0 /* No PER value map */
};
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
2020-05-23 02:24:48 +00:00
Fix NGAP_ProtocolExtensionField.c
===========================================
diff --git a/lib/asn1c/ngap/NGAP_ProtocolExtensionField.c b/lib/asn1c/ngap/NGAP_ProtocolExtensionField.c
index 4a23d705..3afbede8 100644
2020-05-23 02:24:48 +00:00
--- a/lib/asn1c/ngap/NGAP_ProtocolExtensionField.c
+++ b/lib/asn1c/ngap/NGAP_ProtocolExtensionField.c
@@ -48809,11 +48809,7 @@ static asn_TYPE_member_t asn_MBR_NGAP_extensionValue_648[] = {
0,
#endif /* !defined(ASN_DISABLE_OER_SUPPORT) */
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
2020-05-23 02:24:48 +00:00
+#if 0 /* modified by acetcom */
&asn_PER_memb_NGAP_OCTET_STRING_CONTAINING_PDUSessionResourceReleaseResponseTransfer__constr_43,
2020-05-23 02:24:48 +00:00
+#else
+ 0,
2020-05-23 02:24:48 +00:00
+#endif
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
memb_NGAP_OCTET_STRING_CONTAINING_PDUSessionResourceReleaseResponseTransfer__constraint_648
2020-05-23 02:24:48 +00:00
},
Check common file
2018-03-04 07:30:03 +00:00
===========================================
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/open5gs/lib/asn1c/common$ \
2018-03-04 07:30:03 +00:00
git diff asn_internal.h
diff --git a/lib/asn1c/common/asn_internal.h b/lib/asn1c/common/asn_internal.h
diff -u asn_internal.h ~/asn_internal.h
--- asn_internal.h 2022-02-26 15:48:33.431509100 +0900
+++ /home/acetcom/asn_internal.h 2022-02-26 15:43:00.890972555 +0900
@@ -34,10 +34,53 @@
#define ASN1C_ENVIRONMENT_VERSION 923 /* Compile-time version */
int get_asn1c_environment_version(void); /* Run-time version */
+#if 0 /* modified by acetcom */
#define CALLOC(nmemb, size) calloc(nmemb, size)
#define MALLOC(size) malloc(size)
#define REALLOC(oldptr, size) realloc(oldptr, size)
#define FREEMEM(ptr) free(ptr)
+#else
+#include "ogs-core.h"
+
+static ogs_inline void *ogs_asn_malloc(size_t size, const char *file_line)
+{
+ void *ptr = ogs_malloc(size);
+ if (!ptr) {
+ ogs_fatal("asn_malloc() failed in `%s`", file_line);
+ ogs_assert_if_reached();
+ }
+
+ return ptr;
+}
+static ogs_inline void *ogs_asn_calloc(
+ size_t nmemb, size_t size, const char *file_line)
+{
+ void *ptr = ogs_calloc(nmemb, size);
+ if (!ptr) {
+ ogs_fatal("asn_calloc() failed in `%s`", file_line);
+ ogs_assert_if_reached();
+ }
+
+ return ptr;
+}
+static ogs_inline void *ogs_asn_realloc(
+ void *oldptr, size_t size, const char *file_line)
+{
+ void *ptr = ogs_realloc(oldptr, size);
+ if (!ptr) {
+ ogs_fatal("asn_realloc() failed in `%s`", file_line);
+ ogs_assert_if_reached();
+ }
+
+ return ptr;
+}
+
+#define CALLOC(nmemb, size) ogs_asn_calloc(nmemb, size, OGS_FILE_LINE)
+#define MALLOC(size) ogs_asn_malloc(size, OGS_FILE_LINE)
+#define REALLOC(oldptr, size) ogs_asn_realloc(oldptr, size, OGS_FILE_LINE)
+#define FREEMEM(ptr) ogs_free(ptr)
+
+#endif
#define asn_debug_indent 0
#define ASN_DEBUG_INDENT_ADD(i) do{}while(0)
2018-03-04 07:30:03 +00:00
2020-05-23 02:24:48 +00:00
Check meson.build
===========================================
user@host ~/Documents/git/open5gs/lib/asn1c/s1ap$ \
user@host ~/Documents/git/open5gs/lib/asn1c/ngap$ \
cat Makefile.am.libasncodec
2018-03-04 07:30:03 +00:00
Remove unnecessary files
===========================================
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/open5gs/lib/asn1c/s1ap$ \
2018-03-04 07:30:03 +00:00
rm -f S1AP_E-RAB-IE-ContainerPairList.c \
S1AP_ProtocolError-IE-ContainerList.c \
S1AP_ProtocolIE-ContainerPair.c S1AP_ProtocolIE-FieldPair.c \
S1AP_ProtocolIE-ContainerPairList.c
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/open5gs/lib/asn1c/ngap$ \
rm -f NGAP_ProtocolIE-ContainerPair.c NGAP_ProtocolIE-FieldPair.c \
NGAP_ProtocolIE-ContainerPairList.c \
NGAP_ProtocolIE-ContainerPair.h NGAP_ProtocolIE-ContainerPairList.h \
NGAP_ProtocolIE-FieldPair.h
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/open5gs/lib/asn1c/s1ap$ \
2018-03-04 07:30:03 +00:00
rm -f Makefile.am.asn1convert Makefile.am.libasncodec
2020-05-23 02:24:48 +00:00
user@host ~/Documents/git/open5gs/lib/asn1c/s1ap$ \
2018-03-04 07:30:03 +00:00
rm -f converter-example.mk converter-example.c pdu_collection.c