- gerrit-log - lists.osmocom.org

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40796?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cups_client: Use new iofd stream_srv APIs ...................................................................... cups_client: Use new iofd stream_srv APIs Related: OS#6823 Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 --- M daemon/cups_client.c 1 file changed, 35 insertions(+), 36 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/daemon/cups_client.c b/daemon/cups_client.c index ae17595..5b94bff 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -552,71 +552,63 @@ return 0; } + +static void cups_client_free(struct cups_client *cc); + /* 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)\n", 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: - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; + goto free_client; default: - break; + msgb_free(msg); + return 0; } - goto out; } - - LOGCC(cc, LOGL_DEBUG, "Rx '%s'\n", msgb_data(msg)); + if (res <= 0) + goto free_client; /* 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; + LOGCC(cc, LOGL_ERROR, "Error decoding JSON (%s)\n", jerr.text); + 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); +free_client: + LOGCC(cc, LOGL_NOTICE, "UECUPS connection lost\n"); + msgb_free(msg); + cups_client_free(cc); + return -1; +} static int cups_client_closed_cb(struct osmo_stream_srv *conn) { struct cups_client *cc = osmo_stream_srv_get_data(conn); + if (!cc) /* already being destroyed in cups_client_free() */ + return 0; + LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); cups_client_free(cc); return 0; @@ -632,11 +624,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; @@ -649,6 +643,8 @@ if (!cc) return; + LOGCC(cc, LOGL_DEBUG, "free()\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, &cc->d->subprocesses, list) { @@ -657,8 +653,10 @@ } llist_del(&cc->list); - if (cc->srv) + if (cc->srv) { + osmo_stream_srv_set_data(cc->srv, NULL); osmo_stream_srv_destroy(cc->srv); + } talloc_free(cc); } @@ -691,6 +689,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: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 Gerrit-Change-Number: 40796 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: Set thread names

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40789?usp=email ) Change subject: Set thread names ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40789?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: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 Gerrit-Change-Number: 40789 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 14:52:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

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

by pespin

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40793?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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/2 -- 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: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I32b56fddc32b95cf15c30b2c9cfc272a8678857b Gerrit-Change-Number: 40793 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

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

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40794?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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/2 -- 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: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic3145ba2a6ecd5d165a024947f8ff7d9ab397e54 Gerrit-Change-Number: 40794 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

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

by pespin

Hello Jenkins Builder, laforge, osmith, 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 (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cups_client: Use new iofd stream_srv APIs ...................................................................... cups_client: Use new iofd stream_srv APIs Related: OS#6823 Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 --- M daemon/cups_client.c 1 file changed, 35 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/96/40796/5 -- 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: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

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

by pespin

Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40795?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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/2 -- 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: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic4d4da7ecbf5a7903a46558482b66cdc22767c4b Gerrit-Change-Number: 40795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: Set thread names

by pespin

Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40789?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: Set thread names ...................................................................... Set thread names Change-Id: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 --- M daemon/gtp_endpoint.c M daemon/tun_device.c 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/89/40789/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40789?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: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 Gerrit-Change-Number: 40789 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(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: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

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

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40796?usp=email ) Change subject: cups_client: Use new iofd stream_srv APIs ...................................................................... Patch Set 4: Code-Review+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: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ie9f127e82e39ad0b5cae83f870b678ba1800ded4 Gerrit-Change-Number: 40796 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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, 31 Jul 2025 14:48:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

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

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40795?usp=email ) Change subject: cups_client: Fix memleak during conn closed ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment 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> Gerrit-Reviewer: Jenkins Builder 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, 31 Jul 2025 14:48:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[XS] Change in osmo-uecups[master]: tun_device: Make sure struct iphdr access is 4-byte aligned

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40787?usp=email ) Change subject: tun_device: Make sure struct iphdr access is 4-byte aligned ...................................................................... tun_device: Make sure struct iphdr access is 4-byte aligned "struct iphdr" from netinet/ip.h used in parse_pkt() is not "packed", hence compiler expects to find the struct pointer aligned to 4-bytes. Re-arrange the stack buffer to make sure iphdr ends up being stored aligned. This was caught by running osmo-uecups with --enable-sanitize in TTCN3 testsuite ttcn3-5gc-test. Change-Id: I610c8e9b150c234b7d4997e0b1c4d4a9ce4de9ec --- M daemon/tun_device.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 350e322..2c67d5c 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -203,7 +203,9 @@ { struct tun_device *tun = (struct tun_device *)arg; struct gtp_daemon *d = tun->d; - uint8_t base_buffer[sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr) + MAX_UDP_PACKET]; + /* Make sure "buffer" below ends up aligned to 4byte so that it can access struct iphdr in a 4-byte aligned way. */ + const size_t payload_off_4byte_aligned = ((sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr)) + 3) & (~0x3); + uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; int old_cancelst_unused; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); @@ -216,7 +218,7 @@ struct gtp_tunnel *t; struct pkt_info pinfo; int rc, nread; - uint8_t *buffer = base_buffer + sizeof(base_buffer) - MAX_UDP_PACKET; + uint8_t *buffer = base_buffer + payload_off_4byte_aligned; /* 1) read from tun */ rc = read(tun->fd, buffer, MAX_UDP_PACKET); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40787?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: I610c8e9b150c234b7d4997e0b1c4d4a9ce4de9ec Gerrit-Change-Number: 40787 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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>

2 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log