March 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: select.c: Clarify osmo_fd_(un)register() API expectations of register...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31901 ) Change subject: select.c: Clarify osmo_fd_(un)register() API expectations of registered fd ...................................................................... select.c: Clarify osmo_fd_(un)register() API expectations of registered fd Those restrictions were implicitly required for a while and most of the users of this API already followed them, but just a few didn't. All known users have now been fixed. Let's explicitly document the restrictions imposed by the API to ease avoiding similar issues in the future. Change-Id: I53d95aad15b33dd66aa5c7dd11745a35c4481f33 --- M src/core/select.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/31901/1 diff --git a/src/core/select.c b/src/core/select.c index f983601..584de24 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -151,6 +151,9 @@ /*! Register a new file descriptor with select loop abstraction * \param[in] fd osmocom file descriptor to be registered * \returns 0 on success; negative in case of error + * + * The API expects fd field of the struct osmo_fd to remain unchanged while + * registered, ie until osmo_fd_unregister() is called on it. */ int osmo_fd_register(struct osmo_fd *fd) { @@ -208,6 +211,9 @@ /*! Unregister a file descriptor from select loop abstraction * \param[in] fd osmocom file descriptor to be unregistered + * + * This function must be called before changing the value of the fd field in + * the struct osmo_fd. */ void osmo_fd_unregister(struct osmo_fd *fd) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I53d95aad15b33dd66aa5c7dd11745a35c4481f33 Gerrit-Change-Number: 31901 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcap[master]: server: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/31900 ) Change subject: server: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... server: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I44405687dae79a13db5617867c669ee4840485ba --- M src/osmo_server_network.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/00/31900/1 diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 025f560..b566bd2 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -130,10 +130,10 @@ static void close_connection(struct osmo_pcap_conn *conn) { if (conn->rem_wq.bfd.fd >= 0) { + osmo_fd_unregister(&conn->rem_wq.bfd); close(conn->rem_wq.bfd.fd); conn->rem_wq.bfd.fd = -1; osmo_tls_release(&conn->tls_session); - osmo_fd_unregister(&conn->rem_wq.bfd); } osmo_pcap_server_close_trace(conn); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/31900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I44405687dae79a13db5617867c669ee4840485ba Gerrit-Change-Number: 31900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-mgw[master]: mgcp-client: Call osmo_fd_unregister() before closing and changing bf...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31899 ) Change subject: mgcp-client: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mgcp-client: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I95fbcc21a18cadd2c06608cc39b9fe8e12c8bccf --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/31899/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 81847ee..4dd278f 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -907,10 +907,10 @@ wq = &mgcp->wq; osmo_wqueue_clear(wq); LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_sock_get_name2(wq->bfd.fd)); - close(wq->bfd.fd); - wq->bfd.fd = -1; if (osmo_fd_is_registered(&wq->bfd)) osmo_fd_unregister(&wq->bfd); + close(wq->bfd.fd); + wq->bfd.fd = -1; } /*! Get the IP-Aaddress of the associated MGW as string. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I95fbcc21a18cadd2c06608cc39b9fe8e12c8bccf Gerrit-Change-Number: 31899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: layer23: Call osmo_fd_unregister() before closing and changing bfd->fd
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31893 ) Change subject: layer23: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I886062c1a944acf0982755a7acddf7e2233d13a8 Gerrit-Change-Number: 31893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 10:46:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in openbsc[master]: mgcp: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/31898 ) Change subject: mgcp: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mgcp: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I2227e97b1cffab5ab0138ce95a2523a824ec35f0 --- M openbsc/src/libmgcp/mgcp_network.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/98/31898/1 diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index e268658..c52bd0b 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -1050,15 +1050,15 @@ int mgcp_free_rtp_port(struct mgcp_rtp_end *end) { if (end->rtp.fd != -1) { + osmo_fd_unregister(&end->rtp); close(end->rtp.fd); end->rtp.fd = -1; - osmo_fd_unregister(&end->rtp); } if (end->rtcp.fd != -1) { + osmo_fd_unregister(&end->rtcp); close(end->rtcp.fd); end->rtcp.fd = -1; - osmo_fd_unregister(&end->rtcp); } return 0; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/31898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2227e97b1cffab5ab0138ce95a2523a824ec35f0 Gerrit-Change-Number: 31898 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in openbsc[master]: mncc_sock.c: Call osmo_fd_unregister() before closing and changing bf...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/31897 ) Change subject: mncc_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mncc_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Ib54a9caaf10293860a2893aab876198b1990045d --- M openbsc/src/libmsc/mncc_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/97/31897/1 diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c index 98cafa1..fc46a04 100644 --- a/openbsc/src/libmsc/mncc_sock.c +++ b/openbsc/src/libmsc/mncc_sock.c @@ -83,9 +83,9 @@ LOGP(DMNCC, LOGL_NOTICE, "MNCC Socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ state->listen_bfd.when |= OSMO_FD_READ; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/31897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib54a9caaf10293860a2893aab876198b1990045d Gerrit-Change-Number: 31897 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: mncc_sock: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/31896 ) Change subject: mncc_sock: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mncc_sock: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I90f840da4cc26c1d970c3f5d18d3185678a1dba9 --- M src/libmsc/mncc_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/31896/1 diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c index 7c65546..9c75d2c 100644 --- a/src/libmsc/mncc_sock.c +++ b/src/libmsc/mncc_sock.c @@ -71,9 +71,9 @@ LOGP(DMNCC, LOGL_NOTICE, "MNCC Socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ osmo_fd_read_enable(&state->listen_bfd); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I90f840da4cc26c1d970c3f5d18d3185678a1dba9 Gerrit-Change-Number: 31896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-abis[master]: ipa: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31895 ) Change subject: ipa: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... ipa: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I8bfafe5de3cf194a71fb755c642121cec817aaa3 --- M src/input/ipa.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/95/31895/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index 94e7e5a..2235b39 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -561,10 +561,10 @@ * calls again into this destructor */ if (conn->ofd.fd == -1) return; + osmo_fd_unregister(&conn->ofd); close(conn->ofd.fd); conn->ofd.fd = -1; msgb_free(conn->pending_msg); - osmo_fd_unregister(&conn->ofd); if (conn->closed_cb) conn->closed_cb(conn); talloc_free(conn); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8bfafe5de3cf194a71fb755c642121cec817aaa3 Gerrit-Change-Number: 31895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hlr[master]: mslookup: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/31894 ) Change subject: mslookup: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mslookup: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I26bba0dd092ad5fd6b4959b173fae93b542a93f1 --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/94/31894/1 diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c index d2a629f..37f1256 100644 --- a/src/mslookup/osmo-mslookup-client.c +++ b/src/mslookup/osmo-mslookup-client.c @@ -419,9 +419,9 @@ { struct osmo_fd *ofd = &c->ofd; + osmo_fd_unregister(ofd); close(ofd->fd); ofd->fd = -1; - osmo_fd_unregister(ofd); llist_del(&c->entry); talloc_free(c); @@ -561,9 +561,9 @@ llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) socket_client_close(c); if (osmo_fd_is_registered(&globals.socket_ofd)) { + osmo_fd_unregister(&globals.socket_ofd); close(globals.socket_ofd.fd); globals.socket_ofd.fd = -1; - osmo_fd_unregister(&globals.socket_ofd); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/31894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26bba0dd092ad5fd6b4959b173fae93b542a93f1 Gerrit-Change-Number: 31894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: layer23: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31893 ) Change subject: layer23: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... layer23: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I886062c1a944acf0982755a7acddf7e2233d13a8 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/mncc_sock.c 3 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/31893/1 diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 94303c2..8e27052 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -126,9 +126,9 @@ if (ms->l2_wq.bfd.fd <= 0) return -EINVAL; + osmo_fd_unregister(&ms->l2_wq.bfd); close(ms->l2_wq.bfd.fd); ms->l2_wq.bfd.fd = -1; - osmo_fd_unregister(&ms->l2_wq.bfd); osmo_wqueue_clear(&ms->l2_wq); return 0; diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 86c70a9..0f9f8c2 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -321,10 +321,9 @@ if (ms->sap_wq.bfd.fd <= 0) return -EINVAL; + osmo_fd_unregister(&ms->sap_wq.bfd); close(ms->sap_wq.bfd.fd); ms->sap_wq.bfd.fd = -1; - - osmo_fd_unregister(&ms->sap_wq.bfd); osmo_wqueue_clear(&ms->sap_wq); return 0; diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 514ab72..d31df29 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -89,9 +89,9 @@ LOGP(DMNCC, LOGL_NOTICE, "MNCC Socket has closed connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ osmo_fd_read_enable(&state->listen_bfd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I886062c1a944acf0982755a7acddf7e2233d13a8 Gerrit-Change-Number: 31893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0