- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp()
by fixeria 11 Nov '25

11 Nov '25

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41395?usp=email ) Change subject: constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41395?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: Ibd39b2157550d365a04872f96243d0685c17a6e3 Gerrit-Change-Number: 41395 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Nov 2025 12:49:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: ipa: Clarify msgb_free in ipa_rx_msg()
by pespin 11 Nov '25

11 Nov '25

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41396?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ipa: Clarify msgb_free in ipa_rx_msg() ...................................................................... ipa: Clarify msgb_free in ipa_rx_msg() First of all, clean up and clarify the handling of msgb in ipa_rx_msg_sccp() by always freeing the patched msgb copy, and letting parent function free the original received msgb. This in turn allows moving the msgb_free() of the received msg to ipa_cli_read_cb() and ss7_asp_ipa_srv_conn_rx_cb(), which is where the msgb is allocated, and makes the msgb lifecycle far more easy to understand. This is also what's already done in the xua_cli_read_cb()/ss7_asp_xua_srv_conn_rx_cb(). This way we have similar code paths in xua and ipa. Related: OS#6876 Change-Id: Id29955182d9da47165ee9a2d7777b92fb87844b9 --- M src/ipa.c M src/ss7_asp.c 2 files changed, 26 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/96/41396/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41396?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id29955182d9da47165ee9a2d7777b92fb87844b9 Gerrit-Change-Number: 41396 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: ipa: Clarify msgb_free in ipa_rx_msg()
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41396?usp=email ) Change subject: ipa: Clarify msgb_free in ipa_rx_msg() ...................................................................... ipa: Clarify msgb_free in ipa_rx_msg() First of all, clean up and clarify the handling of msgb in ipa_rx_msg_sccp() by always freeing the patched msgb copy, and letting parent function free the original received msgb. This in turn allows moving the msgb_free() of the received msg to ipa_cli_read_cb() and ss7_asp_ipa_srv_conn_rx_cb(), which is where the msgb is allocated, and makes the msgb lifecycle far more easy to understand. This is also what's already done in the xua_cli_read_cb()/ss7_asp_xua_srv_conn_rx_cb(). This way we have similar code paths in xua and ipa. Related: OS#6876 Change-Id: Id29955182d9da47165ee9a2d7777b92fb87844b9 --- M src/ipa.c M src/ss7_asp.c 2 files changed, 24 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/96/41396/1 diff --git a/src/ipa.c b/src/ipa.c index 3b2b6da..c748f22 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -149,8 +149,6 @@ rc = -1; } - msgb_free(msg); - return rc; } @@ -171,7 +169,7 @@ } /* Patch a SCCP message and add point codes to Called/Calling Party (if missing) */ -static struct msgb *patch_sccp_with_pc(struct osmo_ss7_asp *asp, struct msgb *sccp_msg_in, +static struct msgb *patch_sccp_with_pc(const struct osmo_ss7_asp *asp, const struct msgb *sccp_msg_in, uint32_t opc, uint32_t dpc) { struct osmo_sccp_addr addr; @@ -184,11 +182,8 @@ if (!sua) { LOGPASP(asp, DLSS7, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n", msgb_hexdump(sccp_msg_in)); - msgb_free(sccp_msg_in); return NULL; } - /* free the input message and work with SUA version instead */ - msgb_free(sccp_msg_in); rc = sua_addr_parse(&addr, sua, SUA_IEI_DEST_ADDR); switch (rc) { @@ -238,13 +233,12 @@ { int rc; struct m3ua_data_hdr data_hdr; - struct xua_msg *xua; + struct xua_msg *xua = NULL; struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); uint32_t opc, dpc; if (!as) { LOGPASP(asp, DLSS7, LOGL_ERROR, "Rx message for IPA ASP without AS?!\n"); - msgb_free(msg); return -1; } @@ -302,25 +296,27 @@ dpc = as->cfg.pc_override.dpc; } - /* Second, patch this into the SCCP message */ - if (as->cfg.pc_override.sccp_mode == OSMO_SS7_PATCH_BOTH) { - msg = patch_sccp_with_pc(asp, msg, opc, dpc); - if (!msg) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to patch PC into SCCP message; dropping\n"); - return -1; - } - } - - /* Third, create a MTP3/M3UA label with those point codes */ + /* Second, create a MTP3/M3UA label with those point codes */ memset(&data_hdr, 0, sizeof(data_hdr)); data_hdr.si = MTP_SI_SCCP; data_hdr.opc = osmo_htonl(opc); data_hdr.dpc = osmo_htonl(dpc); data_hdr.sls = sls; data_hdr.ni = as->inst->cfg.network_indicator; - /* Create M3UA message in XUA structure */ - xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); - msgb_free(msg); + + /* Third, patch this into the SCCP message and create M3UA message in XUA structure */ + if (as->cfg.pc_override.sccp_mode == OSMO_SS7_PATCH_BOTH) { + struct msgb *msg_patched = patch_sccp_with_pc(asp, msg, opc, dpc); + if (!msg_patched) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to patch PC into SCCP message; dropping\n"); + return -1; + } + xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg_patched), msgb_l2len(msg_patched)); + msgb_free(msg_patched); + } else { + xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); + } + /* Update xua->mtp with values from data_hdr */ m3ua_dh_to_xfer_param(&xua->mtp, &data_hdr); @@ -332,7 +328,7 @@ /*! \brief process M3UA message received from socket * \param[in] asp Application Server Process receiving \a msg - * \param[in] msg received message buffer. Callee takes ownership! + * \param[in] msg received message buffer. It is kept owned by the caller. * \param[in] sls The SLS (signaling link selector) field to use in the generated M3UA header * \returns 0 on success; negative on error */ int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls) @@ -355,7 +351,6 @@ break; default: rc = ss7_asp_rx_unknown(asp, hh->proto, msg); - msgb_free(msg); } return rc; diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 7b819de..d0415c3 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1051,7 +1051,9 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, asp->ipa.sls); + rc = ipa_rx_msg(asp, msg, asp->ipa.sls); + msgb_free(msg); + return rc; } /* netif code tells us we can read something from the socket */ @@ -1252,7 +1254,9 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, asp->ipa.sls); + rc = ipa_rx_msg(asp, msg, asp->ipa.sls); + msgb_free(msg); + return rc; } /* read call-back for M3UA-over-TCP socket */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41396?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: Id29955182d9da47165ee9a2d7777b92fb87844b9 Gerrit-Change-Number: 41396 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua,tcp-m3ua: Unify Rx code paths to deduplicate code
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41397?usp=email ) Change subject: xua,tcp-m3ua: Unify Rx code paths to deduplicate code ...................................................................... xua,tcp-m3ua: Unify Rx code paths to deduplicate code This also makes those protocol paths resembles more the one of IPA, where we call rx_ipa_msg() to handle the msgb. m3ua_tcp_cli_read_cb() is also modified to avoid going through the SCTP read_cb, which doesn't make much sense. Change-Id: I54cf6c9b8c27fd67bae74d7931745f140e0575c0 --- M src/ss7_asp.c 1 file changed, 50 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/97/41397/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index d0415c3..f3476ea 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1031,6 +1031,7 @@ { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); + int rc; /* Reparent msg to srv_link, to avoid "msg" being automatically freed if * "conn" is teared down during msg handling (or if its associated @@ -1056,12 +1057,41 @@ return rc; } +static int xua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + unsigned int ppid = msgb_sctp_ppid(msg); + int rc; + + if (ppid == SUA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA) + rc = sua_rx_msg(asp, msg); + else if (ppid == M3UA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_M3UA) + rc = m3ua_rx_msg(asp, msg); + else + rc = ss7_asp_rx_unknown(asp, ppid, msg); + return rc; +} + +static int m3ua_tcp_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + const struct xua_common_hdr *hdr = (const struct xua_common_hdr *) msg->data; + + /* spoof SCTP PPID */ + msgb_sctp_ppid(msg) = M3UA_PPID; + + /* spoof SCTP Stream ID */ + if (hdr->msg_class == M3UA_MSGC_XFER) + msgb_sctp_stream(msg) = 1; + else + msgb_sctp_stream(msg) = 0; + + return m3ua_rx_msg(asp, msg); +} + /* netif code tells us we can read something from the socket */ int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); - unsigned int ppid; int flags; int rc = 0; @@ -1100,17 +1130,9 @@ return rc; } - ppid = msgb_sctp_ppid(msg); msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - - if (ppid == SUA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA) - rc = sua_rx_msg(asp, msg); - else if (ppid == M3UA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_M3UA) - rc = m3ua_rx_msg(asp, msg); - else - rc = ss7_asp_rx_unknown(asp, ppid, msg); - + rc = xua_rx_msg(asp, msg); msgb_free(msg); return rc; } @@ -1134,7 +1156,6 @@ { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); - const struct xua_common_hdr *hdr; int rc; /* Reparent msg to srv_link, to avoid "msg" being automatically freed if @@ -1156,17 +1177,8 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - - /* spoof SCTP Stream ID */ - hdr = (const struct xua_common_hdr *)msg->data; - if (hdr->msg_class == M3UA_MSGC_XFER) - msgb_sctp_stream(msg) = 1; - else - msgb_sctp_stream(msg) = 0; - - rc = m3ua_rx_msg(asp, msg); + rc = m3ua_tcp_rx_msg(asp, msg); msgb_free(msg); - return rc; } @@ -1241,6 +1253,7 @@ static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + int rc; if (res <= 0) { if (res == -EAGAIN) { @@ -1262,25 +1275,28 @@ /* read call-back for M3UA-over-TCP socket */ static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { - const struct xua_common_hdr *hdr; + struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + int rc = 0; - /* spoof SCTP PPID */ - msgb_sctp_ppid(msg) = M3UA_PPID; + if (res < 0) { + xua_cli_close_and_reconnect(conn); + goto out; + } else if (res == 0) { + xua_cli_close_and_reconnect(conn); + goto out; + } - /* spoof SCTP Stream ID */ - hdr = (const struct xua_common_hdr *) msg->data; - if (hdr->msg_class == M3UA_MSGC_XFER) - msgb_sctp_stream(msg) = 1; - else - msgb_sctp_stream(msg) = 0; - - return xua_cli_read_cb(conn, res, msg); + msg->dst = asp; + rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); + rc = m3ua_tcp_rx_msg(asp, msg); +out: + msgb_free(msg); + return rc; } static int xua_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - unsigned int ppid; int flags; int rc = 0; @@ -1311,21 +1327,12 @@ goto out; } else if (res == 0) { xua_cli_close_and_reconnect(conn); - goto out; } - ppid = msgb_sctp_ppid(msg); msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - - if (ppid == SUA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA) - rc = sua_rx_msg(asp, msg); - else if (ppid == M3UA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_M3UA) - rc = m3ua_rx_msg(asp, msg); - else - rc = ss7_asp_rx_unknown(asp, ppid, msg); - + rc = xua_rx_msg(asp, msg); out: msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41397?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: I54cf6c9b8c27fd67bae74d7931745f140e0575c0 Gerrit-Change-Number: 41397 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp()
by osmith 11 Nov '25

11 Nov '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41395?usp=email ) Change subject: constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41395?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: Ibd39b2157550d365a04872f96243d0685c17a6e3 Gerrit-Change-Number: 41395 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Nov 2025 12:11:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp()
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41395?usp=email ) Change subject: constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp() ...................................................................... constify msgb param in osmo_sccp_to_xua()/osmo_sua_to_sccp() Change-Id: Ibd39b2157550d365a04872f96243d0685c17a6e3 --- M src/sccp2sua.c M src/xua_internal.h 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/95/41395/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index ffbfd2a..87d9d05 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1427,7 +1427,7 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ -static struct xua_msg *sccp_to_xua_ludt(struct msgb *msg, struct xua_msg *xua) +static struct xua_msg *sccp_to_xua_ludt(const struct msgb *msg, struct xua_msg *xua) { struct sccp_data_long_unitdata *ludt = (struct sccp_data_long_unitdata *)msg->l2h; @@ -1664,7 +1664,7 @@ /*! \brief convert SCCP message to a SUA message * \param[in] msg message buffer holding SCCP message at l2h * \returns callee-allocated xUA message on success; NULL on error */ -struct xua_msg *osmo_sccp_to_xua(struct msgb *msg) +struct xua_msg *osmo_sccp_to_xua(const struct msgb *msg) { struct xua_msg *xua; @@ -1778,7 +1778,7 @@ /*! \brief convert parsed SUA message to SCCP message * \param[in] xua parsed SUA message to be converted * \returns callee-allocated msgb containing encoded SCCP message */ -struct msgb *osmo_sua_to_sccp(struct xua_msg *xua) +struct msgb *osmo_sua_to_sccp(const struct xua_msg *xua) { struct msgb *msg = sccp_msgb_alloc("SCCP from SUA"); int rc; diff --git a/src/xua_internal.h b/src/xua_internal.h index 0061449..6cc0d72 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -16,8 +16,8 @@ int sua_parse_gt(struct osmo_sccp_gt *gt, const uint8_t *data, unsigned int datalen); -struct xua_msg *osmo_sccp_to_xua(struct msgb *msg); -struct msgb *osmo_sua_to_sccp(struct xua_msg *xua); +struct xua_msg *osmo_sccp_to_xua(const struct msgb *msg); +struct msgb *osmo_sua_to_sccp(const struct xua_msg *xua); int sua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41395?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: Ibd39b2157550d365a04872f96243d0685c17a6e3 Gerrit-Change-Number: 41395 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-asn1-tcap[master]: Add test to ensure parsing works
by pespin 11 Nov '25

11 Nov '25

Attention is currently required from: daniel, fixeria. pespin has posted comments on this change by daniel. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41394?usp=email ) Change subject: Add test to ensure parsing works ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41394?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: I475afbb6145404934b0838f9b418c105bf65dca0 Gerrit-Change-Number: 41394 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Nov 2025 09:23:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-dev[master]: gen_makefile: python: run build in venv too
by osmith 11 Nov '25

11 Nov '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/41391?usp=email ) Change subject: gen_makefile: python: run build in venv too ...................................................................... gen_makefile: python: run build in venv too The format of the license field in pyproject.toml was changed from a "table" to a a string with an SPDX license expression. The pyosmocom sources have been adjusted to use the new format to appease a warning ("By 2026-Feb-18, you need to update your project and remove deprecated calls or your builds will no longer be supported."). However now the build fails with older setuptools versions. Run the build of python packages in the venv too, to ensure we have a recent setuptools version. Related: pyosmocom I8416234ea02f337fabd075cc345af964c1b71adf Related: osmo-ci Ia8ef3a0301aeaad4691c197ed780e86b497def4a Related: https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#licen… Change-Id: Idbd826d65267c05dcf2d82f7429d53a52686d737 --- M gen_makefile.py M python-venv-requirements.txt 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/gen_makefile.py b/gen_makefile.py index cfc681b..4ee5290 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -435,7 +435,7 @@ .make.{proj}.build: .make.{proj}.configure .make.{proj}.clone $({proj}_files) @echo "\\n\\n\\n===== $@\\n" rm -f {build_proj}/*.whl - python3 \ + {gen_venv_activate()} && python3 \ -m build \ --no-isolation \ {src_proj} \ diff --git a/python-venv-requirements.txt b/python-venv-requirements.txt index 2f5ab59..2e8bb5d 100644 --- a/python-venv-requirements.txt +++ b/python-venv-requirements.txt @@ -21,3 +21,8 @@ redis==5.0.0 tzlocal==4.3 xmltodict==0.14.2 + +setuptools>=77.0.0 +build +poetry +wheel -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Idbd826d65267c05dcf2d82f7429d53a52686d737 Gerrit-Change-Number: 41391 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-dev[master]: gen_makefile: python: run build in venv too
by osmith 11 Nov '25

11 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/41391?usp=email ) Change subject: gen_makefile: python: run build in venv too ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Idbd826d65267c05dcf2d82f7429d53a52686d737 Gerrit-Change-Number: 41391 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Nov 2025 08:45:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-asn1-tcap[master]: Add test to ensure parsing works
by daniel 11 Nov '25

11 Nov '25

Attention is currently required from: daniel, fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41394?usp=email to look at the new patch set (#3). Change subject: Add test to ensure parsing works ...................................................................... Add test to ensure parsing works Related: SYS#5423 Change-Id: I475afbb6145404934b0838f9b418c105bf65dca0 --- M Makefile.am M configure.ac A tests/Makefile.am A tests/parse/Makefile.am A tests/parse/tcap_parse_test.c A tests/parse/tcap_parse_test.ok A tests/testsuite.at 7 files changed, 136 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/94/41394/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41394?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I475afbb6145404934b0838f9b418c105bf65dca0 Gerrit-Change-Number: 41394 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log