December 2025 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: scripts: Add libosmo-asn1-tcap to OSMO_RELEASE_REPOS
by pespin 04 Dec '25

04 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41587?usp=email ) Change subject: scripts: Add libosmo-asn1-tcap to OSMO_RELEASE_REPOS ...................................................................... scripts: Add libosmo-asn1-tcap to OSMO_RELEASE_REPOS Change-Id: I76703ed5c648eb50574166f8459fd0bde1720902 --- M scripts/common.sh M scripts/tarballs/publish-tarballs-for-tags.sh 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/41587/1 diff --git a/scripts/common.sh b/scripts/common.sh index fb06d70..6ef1e3c 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -10,6 +10,7 @@ OSMO_RELEASE_REPOS=" libasn1c libosmo-abis + libosmo-asn1-tcap libosmo-gprs libosmo-netif libosmo-pfcp diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 442c00f..54cd3f9 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -12,6 +12,7 @@ libasn1c libgtpnl libosmo-abis + libosmo-asn1-tcap libosmo-dsp libosmo-gprs libosmo-netif -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41587?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I76703ed5c648eb50574166f8459fd0bde1720902 Gerrit-Change-Number: 41587 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: Bump version: 2.2.0.1-2e28-dirty → 2.2.1
by pespin 04 Dec '25

04 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41586?usp=email ) Change subject: Bump version: 2.2.0.1-2e28-dirty → 2.2.1 ...................................................................... Bump version: 2.2.0.1-2e28-dirty → 2.2.1 Change-Id: I1f615520d97cdb1ae502ea9a04f6ec34cee4c748 --- M configure.ac M debian/changelog M debian/control M src/Makefile.am 4 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/86/41586/1 diff --git a/configure.ac b/configure.ac index 98a6226..f1e1888 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AC_ARG_ENABLE([tcap-loadsharing], [AS_HELP_STRING([--enable-tcap-loadsharing], [Build with TCAP loadsharing. Requires libosmo-asn1-tcap [default=no]])], [osmo_ac_tcap="$enableval"],[osmo_ac_tcap="no"]) if test "x$osmo_ac_tcap" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOASN1TCAP, libosmo-asn1-tcap >= 0.2.0) + PKG_CHECK_MODULES(LIBOSMOASN1TCAP, libosmo-asn1-tcap >= 0.2.1) AC_DEFINE(WITH_TCAP_LOADSHARING, 1, [Define to build with TCAP LOADSHARING]) AC_SUBST(TCAP_LIBS_PC, [libosmo-asn1-tcap]) fi diff --git a/debian/changelog b/debian/changelog index 70938a8..f4cd909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sigtran (2.2.1) unstable; urgency=medium + + * tcap: use libosmo-asn1-tcap public API + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Thu, 04 Dec 2025 19:00:05 +0100 + libosmo-sigtran (2.2.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index e8ef4aa..18d7ee0 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-asn1-tcap-dev (>= 0.2.0), + libosmo-asn1-tcap-dev (>= 0.2.1), libosmo-netif-dev (>= 1.7.0), libsctp-dev, osmo-gsm-manuals-dev (>= 1.7.0) diff --git a/src/Makefile.am b/src/Makefile.am index 4c15c8d..2ef226f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=12:0:0 +LIBVERSION=12:1:0 libosmo_sigtran_la_SOURCES = \ ipa.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41586?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I1f615520d97cdb1ae502ea9a04f6ec34cee4c748 Gerrit-Change-Number: 41586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-asn1-tcap[master]: Bump version: 0.2.0.2-e355-dirty → 0.2.1
by pespin 04 Dec '25

04 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41585?usp=email ) Change subject: Bump version: 0.2.0.2-e355-dirty → 0.2.1 ...................................................................... Bump version: 0.2.0.2-e355-dirty → 0.2.1 Change-Id: I9e5ee23df1fd51d8957d58bd7b50aefa95699c8d --- M debian/changelog M debian/control R debian/libosmo-asn1-tcap1.install M src/Makefile.am 4 files changed, 11 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 50eaafe..12a88ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmo-asn1-tcap (0.2.1) unstable; urgency=medium + + * Remove unneeded asn1c-fixup.patch + * Only export needed wrapper API + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Thu, 04 Dec 2025 18:51:04 +0100 + libosmo-asn1-tcap (0.2.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 3d3a5a9..2dee434 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Vcs-Git: https://gitea.osmocom.org/ss7-in-c/libosmo-asn1-tcap Homepage: https://gitea.osmocom.org/ss7-in-c/libosmo-asn1-tcap -Package: libosmo-asn1-tcap0 +Package: libosmo-asn1-tcap1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -25,7 +25,7 @@ Package: libosmo-asn1-tcap-dev Section: libdevel Architecture: any -Depends: libosmo-asn1-tcap0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-asn1-tcap1 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Development headers for utility library for ASN.1 of TCAP (SS7) @@ -33,6 +33,6 @@ Section: debug Architecture: any Priority: extra -Depends: libosmo-asn1-tcap0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-asn1-tcap1 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Debug symbols for utility library for ASN.1 of TCAP (SS7) diff --git a/debian/libosmo-asn1-tcap0.install b/debian/libosmo-asn1-tcap1.install similarity index 100% rename from debian/libosmo-asn1-tcap0.install rename to debian/libosmo-asn1-tcap1.install diff --git a/src/Makefile.am b/src/Makefile.am index de48e4a..ef91d4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -197,7 +197,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=1:0:0 libosmo_asn1_tcap_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I9e5ee23df1fd51d8957d58bd7b50aefa95699c8d Gerrit-Change-Number: 41585 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-asn1-tcap[master]: Bump version: 0.2.0.2-e355-dirty → 0.2.1
by pespin 04 Dec '25

04 Dec '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41585?usp=email ) Change subject: Bump version: 0.2.0.2-e355-dirty → 0.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I9e5ee23df1fd51d8957d58bd7b50aefa95699c8d Gerrit-Change-Number: 41585 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Dec 2025 17:57:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: tcap: use libosmo-asn1-tcap public API
by pespin 04 Dec '25

04 Dec '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email ) Change subject: tcap: use libosmo-asn1-tcap public API ...................................................................... Patch Set 2: (1 comment) File src/tcap_as_loadshare.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584/comment/e02bdb28_a050b… : PS1, Line 73: struct TCAP_TCMessage tcap = { 0 }; > No more need to initialize tcap here Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic00aa609f412a230c9e04aec280c0c4c1c81f32f Gerrit-Change-Number: 41584 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Dec 2025 17:53:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: tcap: use libosmo-asn1-tcap public API
by pespin 04 Dec '25

04 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email ) Change subject: tcap: use libosmo-asn1-tcap public API ...................................................................... tcap: use libosmo-asn1-tcap public API Depends: libosmo-asn1-tcap.git Change-Id I6d97ac94be91064be7203b11cffa4de9056afce1 Related: OS#6895 Related: OS#6896 Change-Id: Ic00aa609f412a230c9e04aec280c0c4c1c81f32f --- M src/tcap_as_loadshare.c 1 file changed, 7 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/src/tcap_as_loadshare.c b/src/tcap_as_loadshare.c index 9b6d16c..c5016cc 100644 --- a/src/tcap_as_loadshare.c +++ b/src/tcap_as_loadshare.c @@ -39,6 +39,7 @@ #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/tcap/OCTET_STRING.h> #include <osmocom/tcap/TCAP_TCMessage.h> +#include <osmocom/tcap/tcap.h> #include "mtp3_hmrt.h" #include "ss7_as.h" @@ -68,18 +69,16 @@ /* returns negative on error, mask with any/both OTID_SET|DTID_SET on success */ static int parse_tcap(struct osmo_ss7_as *as, const uint8_t *data, size_t len, struct tcap_parsed *ids) { - int rc = 0; - asn_dec_rval_t asn_rc; - struct TCAP_TCMessage tcap = { 0 }; + int rc; + struct TCAP_TCMessage tcap; struct TCAP_TCMessage *tcapmsg = &tcap; OSMO_ASSERT(ids); - asn_rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg, data, len); - if (asn_rc.code != RC_OK) { + rc = osmo_asn1_tcap_decode(tcapmsg, data, len); + if (rc < 0) { LOGPAS(as, DLTCAP, LOGL_DEBUG, "Error decoding TCAP message rc: %d, message: %s\n", - asn_rc.code, osmo_hexdump(data, len)); - rc = -EINVAL; + rc, osmo_hexdump(data, len)); goto free_asn; } @@ -124,13 +123,8 @@ break; } - /* Only asn_fprint is available, but no asn_sprint: - * asn_fprint(stdout, &asn_DEF_TCAP_TCMessage, tcapmsg); - */ - free_asn: - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_TCAP_TCMessage, tcapmsg); - + osmo_asn1_tcap_TCMessage_free_contents(tcapmsg); return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic00aa609f412a230c9e04aec280c0c4c1c81f32f Gerrit-Change-Number: 41584 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: tcap: use libosmo-asn1-tcap public API
by pespin 04 Dec '25

04 Dec '25

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email ) Change subject: tcap: use libosmo-asn1-tcap public API ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: deleteVote Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic00aa609f412a230c9e04aec280c0c4c1c81f32f Gerrit-Change-Number: 41584 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: tcap: use libosmo-asn1-tcap public API
by pespin 04 Dec '25

04 Dec '25

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email ) Change subject: tcap: use libosmo-asn1-tcap public API ...................................................................... Patch Set 2: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic00aa609f412a230c9e04aec280c0c4c1c81f32f Gerrit-Change-Number: 41584 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Dec 2025 17:52:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-asn1-tcap[master]: Bump version: 0.2.0.2-e355-dirty → 0.2.1
by pespin 04 Dec '25

04 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41585?usp=email ) Change subject: Bump version: 0.2.0.2-e355-dirty → 0.2.1 ...................................................................... Bump version: 0.2.0.2-e355-dirty → 0.2.1 Change-Id: I9e5ee23df1fd51d8957d58bd7b50aefa95699c8d --- M debian/changelog M debian/control R debian/libosmo-asn1-tcap1.install M src/Makefile.am 4 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/85/41585/1 diff --git a/debian/changelog b/debian/changelog index 50eaafe..12a88ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmo-asn1-tcap (0.2.1) unstable; urgency=medium + + * Remove unneeded asn1c-fixup.patch + * Only export needed wrapper API + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Thu, 04 Dec 2025 18:51:04 +0100 + libosmo-asn1-tcap (0.2.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 3d3a5a9..2dee434 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Vcs-Git: https://gitea.osmocom.org/ss7-in-c/libosmo-asn1-tcap Homepage: https://gitea.osmocom.org/ss7-in-c/libosmo-asn1-tcap -Package: libosmo-asn1-tcap0 +Package: libosmo-asn1-tcap1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -25,7 +25,7 @@ Package: libosmo-asn1-tcap-dev Section: libdevel Architecture: any -Depends: libosmo-asn1-tcap0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-asn1-tcap1 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Development headers for utility library for ASN.1 of TCAP (SS7) @@ -33,6 +33,6 @@ Section: debug Architecture: any Priority: extra -Depends: libosmo-asn1-tcap0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-asn1-tcap1 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Debug symbols for utility library for ASN.1 of TCAP (SS7) diff --git a/debian/libosmo-asn1-tcap0.install b/debian/libosmo-asn1-tcap1.install similarity index 100% rename from debian/libosmo-asn1-tcap0.install rename to debian/libosmo-asn1-tcap1.install diff --git a/src/Makefile.am b/src/Makefile.am index de48e4a..ef91d4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -197,7 +197,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=1:0:0 libosmo_asn1_tcap_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I9e5ee23df1fd51d8957d58bd7b50aefa95699c8d Gerrit-Change-Number: 41585 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-asn1-tcap[master]: Only export needed wrapper API
by pespin 04 Dec '25

04 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41583?usp=email ) Change subject: Only export needed wrapper API ...................................................................... Only export needed wrapper API Otherwise the asn_* symbols collide with other generated skeletons on apps/library clients (eg. libasn1c.git). Related: OS#6895 Related: OS#6896 Change-Id: I6d97ac94be91064be7203b11cffa4de9056afce1 --- M include/osmocom/tcap/Makefile.am A include/osmocom/tcap/tcap.h M src/Makefile.am A src/tcap.c M tests/parse/Makefile.am 5 files changed, 62 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/include/osmocom/tcap/Makefile.am b/include/osmocom/tcap/Makefile.am index d0a425a..304958b 100644 --- a/include/osmocom/tcap/Makefile.am +++ b/include/osmocom/tcap/Makefile.am @@ -98,6 +98,7 @@ osmo_asn1_tcap_HEADERS = \ $(SKEL_HEADER_FILES) \ $(GEN_HEADER_FILES) \ + tcap.h \ version.h \ $(NULL) diff --git a/include/osmocom/tcap/tcap.h b/include/osmocom/tcap/tcap.h new file mode 100644 index 0000000..309f283 --- /dev/null +++ b/include/osmocom/tcap/tcap.h @@ -0,0 +1,11 @@ +/* libosmo-asn1-tcap public API */ +#pragma once + +#include <stdint.h> +#include <unistd.h> + +#include <osmocom/tcap/TCAP_TCMessage.h> + +int osmo_asn1_tcap_decode(struct TCAP_TCMessage *tcapmsg, const uint8_t *data, size_t data_len); + +void osmo_asn1_tcap_TCMessage_free_contents(struct TCAP_TCMessage *tcapmsg); diff --git a/src/Makefile.am b/src/Makefile.am index fd5a167..de48e4a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +AM_CFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/src/skel $(ASN_MODULE_CFLAGS) + SKEL_SRC = \ skel/ANY.c \ skel/ANY_ber.c \ @@ -197,10 +199,10 @@ # documentation before making any modification LIBVERSION=0:0:0 -#INCLUDES = $(all_includes) -I/usr/local/include/asn1c -I$(top_srcdir)/include -AM_CFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/src/skel $(ASN_MODULE_CFLAGS) +libosmo_asn1_tcap_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' libosmo_asn1_tcap_la_SOURCES = \ + tcap.c \ $(ASN_MODULE_SRC) lib_LTLIBRARIES=libosmo-asn1-tcap.la diff --git a/src/tcap.c b/src/tcap.c new file mode 100644 index 0000000..68c7d9c --- /dev/null +++ b/src/tcap.c @@ -0,0 +1,45 @@ +/* libosmo-asn1-tcap public API */ +/* (C) 2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <unistd.h> +#include <errno.h> + +#include <osmocom/tcap/asn_codecs.h> +#include <osmocom/tcap/TCAP_TCMessage.h> + +int osmo_asn1_tcap_decode(struct TCAP_TCMessage *tcapmsg, const uint8_t *data, size_t data_len) +{ + + asn_dec_rval_t asn_rc; + + memset(tcapmsg, 0, sizeof(struct TCAP_TCMessage)); + + asn_rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg, data, data_len); + if (asn_rc.code != RC_OK) + return -EINVAL; + return 0; +} + +void osmo_asn1_tcap_TCMessage_free_contents(struct TCAP_TCMessage *tcapmsg) +{ + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_TCAP_TCMessage, tcapmsg); +} diff --git a/tests/parse/Makefile.am b/tests/parse/Makefile.am index 4a502b8..821865d 100644 --- a/tests/parse/Makefile.am +++ b/tests/parse/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -Wall AM_LDFLAGS = -no-install -LDADD = $(top_builddir)/src/libosmo-asn1-tcap.la +LDADD = $(top_builddir)/src/.libs/libosmo-asn1-tcap.a check_PROGRAMS = \ tcap_parse_test \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I6d97ac94be91064be7203b11cffa4de9056afce1 Gerrit-Change-Number: 41583 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0