diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-12-10 18:55:09 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-10 18:55:09 +0600 |
| commit | 4c978e0512acc7793a88ea9fa0388e847d9faff5 (patch) | |
| tree | 724e60332ba97a900fcadcdf47363da7254b09d4 | |
| parent | 3e033c74c80913707c45451892cfcf9b5ed98c83 (diff) | |
| parent | 2b2b2762cc48f6be7a26c185bd95e7c77cdc46fa (diff) | |
| download | rspamd-4c978e0512acc7793a88ea9fa0388e847d9faff5.tar.gz rspamd-4c978e0512acc7793a88ea9fa0388e847d9faff5.zip | |
Merge pull request #5251 from rspamd/vstakhov-cumulative-tcp-timeout
[Fix] Use cumulative timeout when dealing with TCP connections
| -rw-r--r-- | src/libutil/libev_helper.c | 9 | ||||
| -rw-r--r-- | src/libutil/libev_helper.h | 5 | ||||
| -rw-r--r-- | src/lua/lua_tcp.c | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/libutil/libev_helper.c b/src/libutil/libev_helper.c index 203e1ed73..82fead9bb 100644 --- a/src/libutil/libev_helper.c +++ b/src/libutil/libev_helper.c @@ -69,16 +69,21 @@ void rspamd_ev_watcher_start(struct ev_loop *loop, } } -void rspamd_ev_watcher_stop(struct ev_loop *loop, - struct rspamd_io_ev *ev) +ev_tstamp rspamd_ev_watcher_stop(struct ev_loop *loop, + struct rspamd_io_ev *ev) { + ev_tstamp elapsed = 0; + if (ev_can_stop(&ev->io)) { ev_io_stop(EV_A, &ev->io); } if (ev->timeout > 0) { + elapsed = ev->timeout - ev_timer_remaining(EV_A, &ev->tm); ev_timer_stop(EV_A, &ev->tm); } + + return elapsed; } void rspamd_ev_watcher_reschedule(struct ev_loop *loop, diff --git a/src/libutil/libev_helper.h b/src/libutil/libev_helper.h index d68f17951..be9917891 100644 --- a/src/libutil/libev_helper.h +++ b/src/libutil/libev_helper.h @@ -65,9 +65,10 @@ void rspamd_ev_watcher_start(struct ev_loop *loop, * Stops watcher and clean it up * @param loop * @param ev + * @return {ev_tstamp} elapsed time */ -void rspamd_ev_watcher_stop(struct ev_loop *loop, - struct rspamd_io_ev *ev); +ev_tstamp rspamd_ev_watcher_stop(struct ev_loop *loop, + struct rspamd_io_ev *ev); /** * Convenience function to reschedule watcher with different events diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c index f498f9598..bea8d2ef9 100644 --- a/src/lua/lua_tcp.c +++ b/src/lua/lua_tcp.c @@ -1099,11 +1099,17 @@ lua_tcp_handler(int fd, short what, gpointer ud) TCP_RETAIN(cbd); msg_debug_tcp("processed TCP event: %d", what); + ev_tstamp elapsed; struct lua_tcp_handler *rh = g_queue_peek_head(cbd->handlers); event_type = rh->type; - rspamd_ev_watcher_stop(cbd->event_loop, &cbd->ev); + elapsed = rspamd_ev_watcher_stop(cbd->event_loop, &cbd->ev); + + /* Adjust timeout, as we have already spent time */ + if (elapsed > 0 && elapsed < cbd->ev.timeout) { + cbd->ev.timeout -= elapsed; + } if (what == EV_READ) { if (cbd->ssl_conn) { |