diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2023-08-09 17:48:53 +0200 |
|---|---|---|
| committer | Daniel Willmann <dwillmann@sysmocom.de> | 2023-08-24 17:14:52 +0200 |
| commit | df1d57e07e59d7644b915f79611398b5a99970a9 (patch) | |
| tree | c61c7ac9f18116e7873724459400e149ac258a29 | |
| parent | c1c91c79a83507781db09276a9bd0daed4972a00 (diff) | |
stream_srv: Fix connection error handlingdaniel/wip
Change-Id: I84eea2717f3762830f3f5b115e6fc8545eaa4fd5
| -rw-r--r-- | src/stream_srv.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/stream_srv.c b/src/stream_srv.c index 26b99b2..e54472b 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -486,17 +486,17 @@ static void stream_srv_iofd_read_cb(struct osmo_io_fd *iofd, int res, struct msg struct osmo_stream_srv *conn = osmo_iofd_get_data(iofd); LOGSSRV(conn, LOGL_DEBUG, "message received (res=%d)\n", res); - if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) { - LOGSSRV(conn, LOGL_INFO, "Connection is being flushed and closed; ignoring received message\n"); - msgb_free(msg); - return; - } - if (res <= 0) { - osmo_stream_srv_set_flush_and_destroy(conn); - if (osmo_iofd_txqueue_len(iofd) == 0) - osmo_stream_srv_destroy(conn); + /* This connection is dead, destroy it. */ + osmo_stream_srv_destroy(conn); } else if (conn->iofd_read_cb) { + if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) { + LOGSSRV(conn, LOGL_INFO, "Connection is being flushed and closed; ignoring received message\n"); + msgb_free(msg); + if (osmo_iofd_txqueue_len(iofd) == 0) + osmo_stream_srv_destroy(conn); + return; + } conn->iofd_read_cb(conn, msg); } } @@ -506,7 +506,7 @@ static void stream_srv_iofd_write_cb(struct osmo_io_fd *iofd, int res, struct ms struct osmo_stream_srv *conn = osmo_iofd_get_data(iofd); LOGSSRV(conn, LOGL_DEBUG, "connected write\n"); - if (res == -1) + if (res < 0) LOGSSRV(conn, LOGL_ERROR, "error to send: %s\n", strerror(errno)); if (osmo_iofd_txqueue_len(iofd) == 0) |