src: recover conntrackd -F operation

This patch recovers the option -F for conntrackd. This will be
particularly useful to flush the kernel conntrack table without
getting the event notification of the conntrack deletions
(that will happen with Linux kernel >= 2.6.29).

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2 files changed, 7 insertions, 6 deletions

diff --git a/src/netlink.c b/src/netlink.c
index 31cee61..9d155aa 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -148,6 +148,11 @@ int nl_dump_conntrack_table(void)
 	return nfct_query(STATE(dump), NFCT_Q_DUMP, &CONFIG(family));
 }
 
+int nl_flush_conntrack_table(void)
+{
+	return nfct_query(STATE(request), NFCT_Q_FLUSH, &CONFIG(family));
+}
+
 int nl_overrun_request_resync(void)
 {
 	int family = CONFIG(family);
diff --git a/src/run.c b/src/run.c
index 6515e62..4bd0e5b 100644
--- a/src/run.c
+++ b/src/run.c
@@ -78,12 +78,8 @@ void local_handler(int fd, void *data)
 
 	switch(type) {
 	case FLUSH_MASTER:
-		dlog(LOG_WARNING, "`conntrackd -F' is deprecated. "
-				  "Use conntrack -F instead.");
-		if (fork() == 0) {
-			execlp("conntrack", "conntrack", "-F", NULL);
-			exit(EXIT_SUCCESS);
-		}
+		dlog(LOG_NOTICE, "flushing kernel conntrack table");
+		nl_flush_conntrack_table();
 		return;
 	case RESYNC_MASTER:
 		dlog(LOG_NOTICE, "resync with master table");