pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified 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: 2 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged