pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31892 ) Change subject: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 --- M Transceiver52M/Transceiver.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/device/ipc/ipc_sock.c 3 files changed, 12 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 1860884..babe420 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -162,9 +162,9 @@ } ~ctrl_sock_state() { if(conn_bfd.fd >= 0) { + osmo_fd_unregister(&conn_bfd); close(conn_bfd.fd); conn_bfd.fd = -1; - osmo_fd_unregister(&conn_bfd); } } }; diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 8bf4836..4b4ba37 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -537,9 +537,9 @@ LOGP(DDEV, LOGL_NOTICE, "IPC socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* flush the queue */ while (!llist_empty(&state->upqueue)) { diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c index ca8e1b0..9e8ab82 100644 --- a/Transceiver52M/device/ipc/ipc_sock.c +++ b/Transceiver52M/device/ipc/ipc_sock.c @@ -97,9 +97,9 @@ ipc_exit_requested = 1; + 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-trx/+/31892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 Gerrit-Change-Number: 31892 Gerrit-PatchSet: 3 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