- gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[master]: osmo_stream_cli_send(): Drop data if client is not connected [yet]
by laforge 12 Mar '24

12 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36244?usp=email ) Change subject: osmo_stream_cli_send(): Drop data if client is not connected [yet] ...................................................................... osmo_stream_cli_send(): Drop data if client is not connected [yet] The behaviour is undefined on what should happen if a stream client user is trying to write data before the client socket is connected. In osmo_io mode we would actually crash due to a NULL-pointer dereference. Let's discard any sent data in this situation and print a related error log message. This problem actually shows up with osmo-bsc Change-Id Icce412e6ee69366c7b131c9bc1d51e8d44204917 where we convert CBSP over to osmo_io - here in situations where a CBSP client (using stream_cli) was previously connected but has lost its connection. Change-Id: I18d2e8e850c23a32f5983a715fa8a18747b296cd --- M src/stream_cli.c 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/stream_cli.c b/src/stream_cli.c index 8312faf..2f5339c 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -1003,12 +1003,20 @@ OSMO_ASSERT(cli); OSMO_ASSERT(msg); + if (!osmo_stream_cli_is_connected(cli)) { + LOGSCLI(cli, LOGL_ERROR, "send: not connected, dropping data!\n"); + msgb_free(msg); + return; + } + switch (cli->mode) { case OSMO_STREAM_MODE_OSMO_FD: msgb_enqueue(&cli->tx_queue, msg); osmo_fd_write_enable(&cli->ofd); break; case OSMO_STREAM_MODE_OSMO_IO: + /* whenever osmo_stream_cli_is_connected() [see above check], we should have an iofd */ + OSMO_ASSERT(cli->iofd); if (cli->proto == IPPROTO_SCTP) rc = stream_iofd_sctp_send_msgb(cli->iofd, msg, MSG_NOSIGNAL); else -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36244?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I18d2e8e850c23a32f5983a715fa8a18747b296cd Gerrit-Change-Number: 36244 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: osmo_stream_cli_send(): Drop data if client is not connected [yet]
by laforge 12 Mar '24

12 Mar '24

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36244?usp=email ) Change subject: osmo_stream_cli_send(): Drop data if client is not connected [yet] ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: merging this to resolve test regressions in ttcn3-bsc-test -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36244?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I18d2e8e850c23a32f5983a715fa8a18747b296cd Gerrit-Change-Number: 36244 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 17:36:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream_srv: Fix retrieve of srv_link sockname for AF_UNIX sockets
by laforge 12 Mar '24

12 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36240?usp=email ) Change subject: stream_srv: Fix retrieve of srv_link sockname for AF_UNIX sockets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36240?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idd76ee3b5c9ad503eabd29d676a5d84e34d92071 Gerrit-Change-Number: 36240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 17:35:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: prim: Introduce osmo_prim_srv{_link}_set_name APIs
by laforge 12 Mar '24

12 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36238?usp=email ) Change subject: prim: Introduce osmo_prim_srv{_link}_set_name APIs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36238?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iba683e4d65e0aba81e13bdf1b9d5a9065b1fc89c Gerrit-Change-Number: 36238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 17:35:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Add osmo_stream_*_get_name() APIs
by laforge 12 Mar '24

12 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36237?usp=email ) Change subject: stream: Add osmo_stream_*_get_name() APIs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If5054d3c207f8f5d58a448f1e58266ad9c4386dd Gerrit-Change-Number: 36237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 17:35:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: osmo_prim_srv_send: assert prim_srv is not NULL
by laforge 12 Mar '24

12 Mar '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36222?usp=email ) Change subject: osmo_prim_srv_send: assert prim_srv is not NULL ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > merging this to fix test regressions. nevermind, that was the wrong patch. sorry for that ;) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1122a1de2c29ee46cce22cec907576719e9c3721 Gerrit-Change-Number: 36222 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-Comment-Date: Tue, 12 Mar 2024 17:34:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: osmo_prim_srv_send: assert prim_srv is not NULL
by laforge 12 Mar '24

12 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36222?usp=email ) Change subject: osmo_prim_srv_send: assert prim_srv is not NULL ...................................................................... osmo_prim_srv_send: assert prim_srv is not NULL Related: SYS#6826 Change-Id: I1122a1de2c29ee46cce22cec907576719e9c3721 --- M src/prim.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/prim.c b/src/prim.c index d26954c..5c0233c 100644 --- a/src/prim.c +++ b/src/prim.c @@ -275,6 +275,8 @@ unsigned int primitive; enum osmo_prim_operation operation; + OSMO_ASSERT(prim_srv); + /* Serialize the oph: */ oph = (struct osmo_prim_hdr *)msgb_data(msg); OSMO_ASSERT(oph && msgb_length(msg) >= sizeof(*oph)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1122a1de2c29ee46cce22cec907576719e9c3721 Gerrit-Change-Number: 36222 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-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: osmo_prim_srv_send: assert prim_srv is not NULL
by laforge 12 Mar '24

12 Mar '24

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36222?usp=email ) Change subject: osmo_prim_srv_send: assert prim_srv is not NULL ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: merging this to fix test regressions. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1122a1de2c29ee46cce22cec907576719e9c3721 Gerrit-Change-Number: 36222 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 17:34:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: socket: Support AF_UNIX in osmo_sock_get_name_buf()
by pespin 12 Mar '24

12 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36241?usp=email ) Change subject: socket: Support AF_UNIX in osmo_sock_get_name_buf() ...................................................................... socket: Support AF_UNIX in osmo_sock_get_name_buf() Right now stream_cli/srv print "<error-in-getsockname>" when using an AF_UNIX socket. This commit fixes the problem. Change-Id: I224c3712a029ee338ee1209a67d820b887170910 --- M src/core/socket.c 1 file changed, 58 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/socket.c b/src/core/socket.c index d36a5f4..f56dbf3 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2139,6 +2139,10 @@ { char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; char portbuf_l[6], portbuf_r[6]; + struct osmo_strbuf sb = { .buf = str, .len = str_len }; + struct osmo_sockaddr osa; + struct sockaddr_un *sun; + socklen_t len; int rc; if (fd < 0) { @@ -2146,17 +2150,52 @@ return -EBADF; } - /* get local */ - if ((rc = osmo_sock_get_ip_and_port(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true))) { + + len = sizeof(osa.u.sas); + rc = getsockname(fd, &osa.u.sa, &len); + if (rc < 0) { osmo_strlcpy(str, "<error-in-getsockname>", str_len); return rc; } - /* get remote */ - if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) != 0) - return snprintf(str, str_len, "r=NULL<->l=%s:%s", hostbuf_l, portbuf_l); - - return snprintf(str, str_len, "r=%s:%s<->l=%s:%s", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); + switch (osa.u.sa.sa_family) { + case AF_INET: + case AF_INET6: + len = sizeof(osa.u.sas); + rc = getnameinfo(&osa.u.sa, len, hostbuf_l, sizeof(hostbuf_l), + portbuf_l, sizeof(portbuf_l), + NI_NUMERICHOST | NI_NUMERICSERV); + if (rc < 0) { + osmo_strlcpy(str, "<error-in-getnameinfo>", str_len); + return rc; + } + /* Now attempt to get remote: */ + len = sizeof(osa.u.sas); + rc = getpeername(fd, &osa.u.sa, &len); + if (rc < 0) { + OSMO_STRBUF_PRINTF(sb, "r=NULL<->l=%s:%s", hostbuf_l, portbuf_l); + return sb.chars_needed; + } + len = sizeof(osa.u.sas); + rc = getnameinfo(&osa.u.sa, len, hostbuf_r, sizeof(hostbuf_r), + portbuf_r, sizeof(portbuf_r), + NI_NUMERICHOST | NI_NUMERICSERV); + if (rc < 0) { + OSMO_STRBUF_PRINTF(sb, "r=NULL<->l=%s:%s", hostbuf_l, portbuf_l); + return sb.chars_needed; + } + OSMO_STRBUF_PRINTF(sb, "r=%s:%s<->l=%s:%s", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); + return sb.chars_needed; + case AF_UNIX: + /* Make sure sun_path is NULL terminated: */ + sun = (struct sockaddr_un *)&osa.u.sa; + sun->sun_path[sizeof(sun->sun_path) - 1] = '\0'; + OSMO_STRBUF_PRINTF(sb, "%s:%d", sun->sun_path, fd); + return sb.chars_needed; + default: + osmo_strlcpy(str, "<socket-family-no-supported>", str_len); + return -ENOTSUP; + } } /*! Get address/port information on socket in static string, like "r=1.2.3.4:5<->l=6.7.8.9:10". -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36241?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I224c3712a029ee338ee1209a67d820b887170910 Gerrit-Change-Number: 36241 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: socket: Support AF_UNIX in osmo_sock_get_name_buf()
by pespin 12 Mar '24

12 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36241?usp=email ) Change subject: socket: Support AF_UNIX in osmo_sock_get_name_buf() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36241?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I224c3712a029ee338ee1209a67d820b887170910 Gerrit-Change-Number: 36241 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Mar 2024 16:59:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log