From eec8fdf57f34fe0d80b884ad0e376ed24c63ffcc Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 25 Jan 2009 17:52:56 +0100 Subject: src: change behaviour of `-t' option With this patch, the `-t' option adds an alarm that will flush the cache after CONFIG(purge_timeout) seconds specified in the config file. This looks much cleaner and more performance that looping on the entire conntrack table to set the new timeout of every single entry. Signed-off-by: Pablo Neira Ayuso --- src/sync-mode.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'src/sync-mode.c') diff --git a/src/sync-mode.c b/src/sync-mode.c index 54d0ebb..84a4de0 100644 --- a/src/sync-mode.c +++ b/src/sync-mode.c @@ -205,6 +205,13 @@ static void mcast_iface_handler(void) mcast_iface_candidate(); } +static void do_reset_cache_alarm(struct alarm_block *a, void *data) +{ + STATE(stats).nl_kernel_table_flush++; + dlog(LOG_NOTICE, "flushing kernel conntrack table (scheduled)"); + nl_flush_conntrack_table(STATE(request)); +} + static int init_sync(void) { int i; @@ -305,6 +312,8 @@ static int init_sync(void) STATE(fds)) == -1) return -1; + init_alarm(&STATE_SYNC(reset_cache_alarm), NULL, do_reset_cache_alarm); + /* initialization of multicast sequence generation */ STATE_SYNC(last_seq_sent) = time(NULL); @@ -432,6 +441,8 @@ static int local_handler_sync(int fd, int type, void *data) } break; case COMMIT: + /* delete the reset alarm if any before committing */ + del_alarm(&STATE_SYNC(reset_cache_alarm)); ret = fork(); if (ret == 0) { dlog(LOG_NOTICE, "committing external cache"); @@ -440,14 +451,16 @@ static int local_handler_sync(int fd, int type, void *data) } break; case RESET_TIMERS: - ret = fork(); - if (ret == 0) { - dlog(LOG_NOTICE, "resetting timers"); - cache_reset_timers(STATE_SYNC(internal)); - exit(EXIT_SUCCESS); + if (!alarm_pending(&STATE_SYNC(reset_cache_alarm))) { + dlog(LOG_NOTICE, "flushing conntrack table in %d secs", + CONFIG(purge_timeout)); + add_alarm(&STATE_SYNC(reset_cache_alarm), + CONFIG(purge_timeout), 0); } break; case FLUSH_CACHE: + /* inmediate flush, remove pending flush scheduled if any */ + del_alarm(&STATE_SYNC(reset_cache_alarm)); dlog(LOG_NOTICE, "flushing caches"); cache_flush(STATE_SYNC(internal)); cache_flush(STATE_SYNC(external)); -- cgit v1.2.3