[conntrack-tools] delay the closure of the dump descriptor to fix assertion with cache_wt

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=2a838790b8a545e95841cb216a7623b3d9560bce
commit 2a838790b8a545e95841cb216a7623b3d9560bce
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat May 31 17:11:40 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat May 31 17:11:40 2008 +0200

    delay the closure of the dump descriptor to fix assertion with cache_wt
       via  2a838790b8a545e95841cb216a7623b3d9560bce (commit)
      from  db4f1eb7b2c6cfa32ef76ba6be05d5ff9a2fca87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2a838790b8a545e95841cb216a7623b3d9560bce
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sat May 31 17:11:40 2008 +0200

    delay the closure of the dump descriptor to fix assertion with cache_wt

-----------------------------------------------------------------------

 ChangeLog |    1 +
 src/run.c |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2713ac7..25d8a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@ o add eventfd emulation to communicate receiver -> sender
 o add best effort replication protocol (aka NOTRACK)
 o rework the HELLO logic inside FT-FW
 o fix leak in cache_destroy(): release objects before destroying the cache
+o delay the closure of the dump descriptor to fix assertion with cache_wt
 
 version 0.9.6 (2008/03/08)
 ------------------------------
diff --git a/src/run.c b/src/run.c
index 63761b4..cadcb4d 100644
--- a/src/run.c
+++ b/src/run.c
@@ -38,11 +38,13 @@ void killer(int foo)
 	sigprocmask(SIG_BLOCK, &STATE(block), NULL);
 
 	nfct_close(STATE(event));
-	nfct_close(STATE(dump));
 
 	ignore_pool_destroy(STATE(ignore_pool));
 	local_server_destroy(&STATE(local));
 	STATE(mode)->kill();
+
+	nfct_close(STATE(dump));	/* cache_wt needs this here */
+
 	unlink(CONFIG(lockfile));
 	dlog(LOG_NOTICE, "---- shutdown received ----");
 	close_log();