[conntrack-tools] conntrackd: split __run() routine for poll and event-driven modes

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=58b363d32bf9b8b504c5664ae4d8b3bb1fab6ddb
commit 58b363d32bf9b8b504c5664ae4d8b3bb1fab6ddb
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Feb 28 16:01:38 2010 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Feb 28 16:23:25 2010 +0100

    conntrackd: split __run() routine for poll and event-driven modes
    
    This patch splits the __run() routine into two functions, run_polling()
    and run_events() that are selected once in run-time. We save one branch
    in a loop that intensively executed.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 929c2a77ba3e9e6c72c08cdded99b0ecccf2fc62
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Feb 28 16:19:13 2010 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Feb 28 16:19:13 2010 +0100

    conntrackd: PollSecs goes in the General clause for statistics
    
    This patch fixes the configuration file that includes an example of
    the PollSecs clause in Stats. This is wrong since it should go in
    the General clause.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  58b363d32bf9b8b504c5664ae4d8b3bb1fab6ddb (commit)
       via  929c2a77ba3e9e6c72c08cdded99b0ecccf2fc62 (commit)
      from  a1a6ee1a2476142c14ca9ecee2c1be810faea2f7 (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 58b363d32bf9b8b504c5664ae4d8b3bb1fab6ddb
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Feb 28 16:01:38 2010 +0100

    conntrackd: split __run() routine for poll and event-driven modes
    
    This patch splits the __run() routine into two functions, run_polling()
    and run_events() that are selected once in run-time. We save one branch
    in a loop that intensively executed.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 929c2a77ba3e9e6c72c08cdded99b0ecccf2fc62
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Feb 28 16:19:13 2010 +0100

    conntrackd: PollSecs goes in the General clause for statistics
    
    This patch fixes the configuration file that includes an example of
    the PollSecs clause in Stats. This is wrong since it should go in
    the General clause.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 doc/stats/conntrackd.conf |   24 +++---
 src/run.c                 |  176 +++++++++++++++++++++++++++------------------
 2 files changed, 117 insertions(+), 83 deletions(-)
This patch fixes the configuration file that includes an example of
the PollSecs clause in Stats. This is wrong since it should go in
the General clause.

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

diff --git a/doc/stats/conntrackd.conf b/doc/stats/conntrackd.conf
index 22556a0..16d7a80 100644
--- a/doc/stats/conntrackd.conf
+++ b/doc/stats/conntrackd.conf
@@ -67,6 +67,18 @@ General {
 	#
 	NetlinkBufferSizeMaxGrowth 655355
 
+	# 
+	# By default, the daemon receives state updates following an
+	# event-driven model. You can modify this behaviour by switching to
+	# polling mode with the PollSecs clause. This clause tells conntrackd
+	# to dump the states in the kernel every N seconds. With regards to
+	# synchronization mode, the polling mode can only guarantee that
+	# long-lifetime states are recovered. The main advantage of this method
+	# is the reduction in the state replication at the cost of reducing the
+	# chances of recovering connections.
+	#
+	# PollSecs 15
+
 	#
 	# Event filtering: This clause allows you to filter certain traffic,
 	# There are currently three filter-sets: Protocol, Address and
@@ -119,18 +131,6 @@ Stats {
 	#
 	# NetlinkEventsReliable Off
 
-	# 
-	# By default, the daemon receives state updates following an
-	# event-driven model. You can modify this behaviour by switching to
-	# polling mode with the PollSecs clause. This clause tells conntrackd
-	# to dump the states in the kernel every N seconds. With regards to
-	# synchronization mode, the polling mode can only guarantee that
-	# long-lifetime states are recovered. The main advantage of this method
-	# is the reduction in the state replication at the cost of reducing the
-	# chances of recovering connections.
-	#
-	# PollSecs 15
-
 	#
 	# Enable connection logging via Syslog. Default is off.
 	# Syslog: on, off or a facility name (daemon (default) or local0..7)