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

[M] Change in osmo-uecups[master]: cups_client: Use new iofd stream_srv APIs

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40796?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: cups_client: Use new iofd stream_srv APIs ...................................................................... cups_client: Use new iofd stream_srv APIs Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 --- M daemon/cups_client.c 1 file changed, 23 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/96/40796/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 Gerrit-Change-Number: 40796 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-uecups[master]: cups_client: Use new iofd stream_srv APIs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40796?usp=email ) Change subject: cups_client: Use new iofd stream_srv APIs ...................................................................... cups_client: Use new iofd stream_srv APIs Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 --- M daemon/cups_client.c 1 file changed, 23 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/96/40796/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index ae17595..b8a247b 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -553,62 +553,51 @@ } /* control/user plane separation per-client read cb */ -static int cups_client_read_cb(struct osmo_stream_srv *conn) +static int cups_client_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct msgb *msg = msgb_alloc(CUPS_MSGB_SIZE, "Rx JSON"); - struct sctp_sndrcvinfo sinfo; json_error_t jerr; json_t *jroot; - int flags = 0; - int rc = 0; + int flags; - /* Read message from socket */ - /* we cannot use osmo_stream_srv_recv() here, as we might get some out-of-band info from - * SCTP. FIXME: add something like osmo_stream_srv_recv_sctp() to libosmo-netif and use - * it here as well as in libosmo-sigtran and osmo-msc */ - rc = sctp_recvmsg(ofd->fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags); - if (rc <= 0) { - osmo_stream_srv_destroy(conn); - rc = -1; - goto out; - } else - msgb_put(msg, rc); + flags = msgb_sctp_msg_flags(msg); + LOGCC(cc, LOGL_DEBUG, "read %d bytes (flags=0x%x)", res, flags); - if (flags & MSG_NOTIFICATION) { + if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); switch (notif->sn_header.sn_type) { case SCTP_SHUTDOWN_EVENT: + msgb_free(msg); + cc->srv = NULL; osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; + return -EBADF; default: - break; + msgb_free(msg); + return 0; } - goto out; } - - LOGCC(cc, LOGL_DEBUG, "Rx '%s'\n", msgb_data(msg)); + if (res <= 0) { + msgb_free(msg); + cc->srv = NULL; + osmo_stream_srv_destroy(conn); + return -1; + } /* Parse the JSON */ jroot = json_loadb((const char *) msgb_data(msg), msgb_length(msg), 0, &jerr); if (!jroot) { LOGCC(cc, LOGL_ERROR, "Error decoding JSON (%s)", jerr.text); - rc = -1; - goto out; + msgb_free(msg); + return -1; } /* Dispatch */ - rc = cups_client_handle_json(cc, jroot); + cups_client_handle_json(cc, jroot); json_decref(jroot); msgb_free(msg); return 0; -out: - msgb_free(msg); - return rc; } static void cups_client_free(struct cups_client *cc); @@ -632,11 +621,13 @@ cc->d = d; osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); - cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); + cc->srv = osmo_stream_srv_create2(cc, link, fd, cc); if (!cc->srv) { talloc_free(cc); return NULL; } + osmo_stream_srv_set_read_cb(cc->srv, cups_client_read_cb); + osmo_stream_srv_set_closed_cb(cc->srv, cups_client_closed_cb); llist_add_tail(&cc->list, &d->cups_clients); return cc; @@ -691,6 +682,7 @@ osmo_stream_srv_link_set_proto(srv_link, IPPROTO_SCTP); osmo_stream_srv_link_set_data(srv_link, g_daemon); osmo_stream_srv_link_set_accept_cb(srv_link, cups_accept_cb); + osmo_stream_srv_link_set_msgb_alloc_info(srv_link, CUPS_MSGB_SIZE, 0); osmo_stream_srv_link_open(srv_link); return srv_link; } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 Gerrit-Change-Number: 40796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-uecups[master]: cups_client: Fix memleak during conn closed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40795?usp=email ) Change subject: cups_client: Fix memleak during conn closed ...................................................................... cups_client: Fix memleak during conn closed Change-Id: Ic4d4da7ecbf5a7903a46558482b66cdc22767c4b --- M daemon/cups_client.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/95/40795/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index f85ad4a..ae17595 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -657,6 +657,9 @@ } llist_del(&cc->list); + if (cc->srv) + osmo_stream_srv_destroy(cc->srv); + talloc_free(cc); } /* the control/user plane separation server bind/accept fd */ -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic4d4da7ecbf5a7903a46558482b66cdc22767c4b Gerrit-Change-Number: 40795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-uecups[master]: cups_client: Add cups_client_alloc/free functions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40794?usp=email ) Change subject: cups_client: Add cups_client_alloc/free functions ...................................................................... cups_client: Add cups_client_alloc/free functions This makes it easier to figure out where lifecycle happens, and makes it obvious now that some fields are not being properly destroyed. This will be fixed in a follow-up patch. Change-Id: Ic3145ba2a6ecd5d165a024947f8ff7d9ab397e54 --- M daemon/cups_client.c 1 file changed, 40 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/94/40794/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index 868480c..f85ad4a 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -611,24 +611,53 @@ return rc; } +static void cups_client_free(struct cups_client *cc); + static int cups_client_closed_cb(struct osmo_stream_srv *conn) { struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct gtp_daemon *d = cc->d; - struct subprocess *p, *p2; LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); - - /* kill + forget about all subprocesses of this client */ - /* We need no locking here as the subprocess list is only used from the main thread */ - llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { - if (p->cups_client == cc) - subprocess_destroy(p, SIGKILL); - } - llist_del(&cc->list); + cups_client_free(cc); return 0; } +static struct cups_client *cups_client_alloc(struct gtp_daemon *d, struct osmo_stream_srv_link *link, int fd) +{ + struct cups_client *cc; + + cc = talloc_zero(d, struct cups_client); + if (!cc) + return NULL; + + cc->d = d; + osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); + cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); + if (!cc->srv) { + talloc_free(cc); + return NULL; + } + + llist_add_tail(&cc->list, &d->cups_clients); + return cc; +} + +static void cups_client_free(struct cups_client *cc) +{ + struct subprocess *p, *p2; + + if (!cc) + return; + + /* kill + forget about all subprocesses of this client */ + /* We need no locking here as the subprocess list is only used from the main thread */ + llist_for_each_entry_safe(p, p2, &cc->d->subprocesses, list) { + if (p->cups_client == cc) + subprocess_destroy(p, SIGKILL); + } + + llist_del(&cc->list); +} /* the control/user plane separation server bind/accept fd */ static int cups_accept_cb(struct osmo_stream_srv_link *link, int fd) @@ -636,21 +665,12 @@ struct gtp_daemon *d = osmo_stream_srv_link_get_data(link); struct cups_client *cc; - cc = talloc_zero(d, struct cups_client); + cc = cups_client_alloc(d, link, fd); if (!cc) return -1; - cc->d = d; - osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); - cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); - if (!cc->srv) { - talloc_free(cc); - return -1; - } LOGCC(cc, LOGL_INFO, "Accepted new UECUPS connection\n"); - llist_add_tail(&cc->list, &d->cups_clients); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic3145ba2a6ecd5d165a024947f8ff7d9ab397e54 Gerrit-Change-Number: 40794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-uecups[master]: cups_client: Log conn lost before tear down subprocesses

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40793?usp=email ) Change subject: cups_client: Log conn lost before tear down subprocesses ...................................................................... cups_client: Log conn lost before tear down subprocesses Change-Id: I32b56fddc32b95cf15c30b2c9cfc272a8678857b --- M daemon/cups_client.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/93/40793/1 diff --git a/daemon/cups_client.c b/daemon/cups_client.c index b72ebd7..868480c 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -617,14 +617,14 @@ struct gtp_daemon *d = cc->d; struct subprocess *p, *p2; + LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); + /* kill + forget about all subprocesses of this client */ /* We need no locking here as the subprocess list is only used from the main thread */ llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { if (p->cups_client == cc) subprocess_destroy(p, SIGKILL); } - - LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); llist_del(&cc->list); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I32b56fddc32b95cf15c30b2c9cfc272a8678857b Gerrit-Change-Number: 40793 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-uecups[master]: tun_device: Fix Tx uninitialized gtpu ext hdr fields

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40790?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tun_device: Fix Tx uninitialized gtpu ext hdr fields ...................................................................... tun_device: Fix Tx uninitialized gtpu ext hdr fields Change-Id: Ie1d4b2d8cd659fd23811c5330d8ae0e43ff0a0d2 --- M daemon/tun_device.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 6a0d8b6..350e322 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -178,8 +178,11 @@ if (t->exthdr.pdu_sess_container.enabled) { exthdr->array[0].type = GTP1_EXTHDR_PDU_SESSION_CONTAINER; exthdr->array[0].len = 1; + exthdr->array[0].spare1 = 0; exthdr->array[0].pdu_type = t->exthdr.pdu_sess_container.pdu_type; exthdr->array[0].qos_flow_identifier = t->exthdr.pdu_sess_container.qos_flow_identifier; + exthdr->array[0].reflective_qos_indicator = 0; + exthdr->array[0].paging_policy_presence = 0; exthdr->array[1].type = 0; /* No extension headers */ } else { exthdr->array[0].type = 0; /* No extension headers */ -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie1d4b2d8cd659fd23811c5330d8ae0e43ff0a0d2 Gerrit-Change-Number: 40790 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-uecups[master]: gtp_endpoint: Avoid deadlocks logging while thread is cancelled

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email ) Change subject: gtp_endpoint: Avoid deadlocks logging while thread is cancelled ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I1e141175440402a7db34f3d246104c6ea38031fb Gerrit-Change-Number: 40788 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 10:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[XS] Change in ...osmo_dia2gsup[master]: osmo_dia2gsup.app.src: Add missing 'crypto'

by pespin

Attention is currently required from: fixeria, laforge, matt9j. pespin has posted comments on this change by matt9j. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/20020?usp=email ) Change subject: osmo_dia2gsup.app.src: Add missing 'crypto' ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/20020?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I4a6b963daf64695acd626a434bc4718fb5be40d6 Gerrit-Change-Number: 20020 Gerrit-PatchSet: 2 Gerrit-Owner: matt9j <matt9j(a)cs.washington.edu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matt9j <matt9j(a)cs.washington.edu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 10:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: contrib/osmo-s1gw.sh: fix 'Illegal option -h'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40792?usp=email ) Change subject: contrib/osmo-s1gw.sh: fix 'Illegal option -h' ...................................................................... contrib/osmo-s1gw.sh: fix 'Illegal option -h' Change-Id: I6a1f9cc69386de9938d841dca770a0eace95c2d4 Fixes: 9c3a38c ("contrib/osmo-s1gw.sh: add help") Related: SYS#7332 --- M contrib/osmo-s1gw.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/osmo-s1gw.sh b/contrib/osmo-s1gw.sh index 5d3e8dd..665f110 100755 --- a/contrib/osmo-s1gw.sh +++ b/contrib/osmo-s1gw.sh @@ -33,7 +33,7 @@ } # Parse command line options, if any -while getopts "c:C:n:r:s" opt; do +while getopts "c:C:hn:r:s" opt; do case "$opt" in c) CONFIG="$OPTARG" -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I6a1f9cc69386de9938d841dca770a0eace95c2d4 Gerrit-Change-Number: 40792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: contrib/osmo-s1gw.sh: fix 'Illegal option -h'

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40792?usp=email ) Change subject: contrib/osmo-s1gw.sh: fix 'Illegal option -h' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I6a1f9cc69386de9938d841dca770a0eace95c2d4 Gerrit-Change-Number: 40792 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 10:43:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025