laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34576?usp=email ) Change subject: stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io ...................................................................... stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io Change-Id: I818fe4e3792ed88ae4d6fd6afb677b39264ab662 --- M src/stream_srv.c 1 file changed, 22 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/stream_srv.c b/src/stream_srv.c index e789584..1370e42 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -961,8 +961,19 @@ void osmo_stream_srv_clear_tx_queue(struct osmo_stream_srv *conn) { - msgb_queue_free(&conn->tx_queue); - osmo_fd_write_disable(&conn->ofd); + switch (conn->mode) { + case OSMO_STREAM_MODE_OSMO_FD: + msgb_queue_free(&conn->tx_queue); + osmo_fd_write_disable(&conn->ofd); + break; + case OSMO_STREAM_MODE_OSMO_IO: + osmo_iofd_txqueue_clear(conn->iofd); + break; + case OSMO_STREAM_MODE_UNKNOWN: + default: + break; + } + if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) osmo_stream_srv_destroy(conn); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34576?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: I818fe4e3792ed88ae4d6fd6afb677b39264ab662 Gerrit-Change-Number: 34576 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged