[conntrack-tools] cache_iterators: display the commit time taken in the logs

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Sun Dec 21 22:10:34 CET 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=c7243650c18ec4317a0897e9b406193854955201
commit c7243650c18ec4317a0897e9b406193854955201
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 20:19:46 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 20:19:46 2008 +0100

    cache_iterators: display the commit time taken in the logs
    
    This patch reports to the logfile the time taken to commit the
    entries. The output is expressed in seconds.microseconds.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit fa2e890e5216be401a73e346ca93c24144b764fc
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 19:47:04 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 19:47:04 2008 +0100

    conntrackd: fix missing \n in conntrackd -h
    
    This patch fixes a missing \n in the help message displayed with
    conntrackd -h.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit fa603abfe2ab157756969b584a223f1ed618b965
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 19:47:04 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 19:47:04 2008 +0100

    sync-mode: remove unnecessary split lines
    
    This patch removes unnecessary split lines in several log messages.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 3641d2351ab42bef56e341ccca007331410822f2
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 19:47:03 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 19:47:03 2008 +0100

    src: add run-time statistics via `-s runtime'
    
    This patch adds run-time statistics that you can check via
    `conntrackd -s runtime'. This information is useful for
    trouble-shooting.
    
    This patch replaces several log messages that can be triggered in
    runtime. The idea behind this patch is to avoid log message flooding
    under errors.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 036a0a65c6a3ba95cff48035a25e0bdba6aa0452
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 19:47:02 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 19:47:02 2008 +0100

    src: add cache statistics via `-s cache'
    
    This patch adds cache statistics that you can check via
    `conntrackd -s cache'. This information is useful for
    trouble-shooting.
    
    This patch replaces several log messages that can be triggered in
    runtime. The idea behind this patch is to avoid log message flooding
    under errors.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 7b3f57d5007dd2cf4127c2c3a9a7cd0f64d5d6e9
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 19:39:39 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 19:39:39 2008 +0100

    src: add network statistics via `-s network'
    
    This patch adds networks statistics that you can check via
    `conntrackd -s network'. This information is useful for
    trouble-shooting.
    
    This patch replaces several log messages that can be triggered in
    runtime. The idea behind this patch is to avoid log message flooding
    under errors.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit b666e6ebbd0c0ae7967ff8167790166858544297
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Dec 21 12:50:33 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Dec 21 12:50:33 2008 +0100

    headers: delete unused flags in conntrackd.h
    
    This patch deletes three unused flags SYNC_MODE_ALARM,
    SYNC_MODE_FTFW_BIT and DONT_CHECKSUM. They were replaced by
    the CTD_* flags at some point of the development.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  c7243650c18ec4317a0897e9b406193854955201 (commit)
       via  fa2e890e5216be401a73e346ca93c24144b764fc (commit)
       via  fa603abfe2ab157756969b584a223f1ed618b965 (commit)
       via  3641d2351ab42bef56e341ccca007331410822f2 (commit)
       via  036a0a65c6a3ba95cff48035a25e0bdba6aa0452 (commit)
       via  7b3f57d5007dd2cf4127c2c3a9a7cd0f64d5d6e9 (commit)
       via  b666e6ebbd0c0ae7967ff8167790166858544297 (commit)
      from  5e46fca830799fd62a80ba3a1603bbc43ee0258d (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 c7243650c18ec4317a0897e9b406193854955201
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 20:19:46 2008 +0100

    cache_iterators: display the commit time taken in the logs
    
    This patch reports to the logfile the time taken to commit the
    entries. The output is expressed in seconds.microseconds.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit fa2e890e5216be401a73e346ca93c24144b764fc
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 19:47:04 2008 +0100

    conntrackd: fix missing \n in conntrackd -h
    
    This patch fixes a missing \n in the help message displayed with
    conntrackd -h.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit fa603abfe2ab157756969b584a223f1ed618b965
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 19:47:04 2008 +0100

    sync-mode: remove unnecessary split lines
    
    This patch removes unnecessary split lines in several log messages.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 3641d2351ab42bef56e341ccca007331410822f2
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 19:47:03 2008 +0100

    src: add run-time statistics via `-s runtime'
    
    This patch adds run-time statistics that you can check via
    `conntrackd -s runtime'. This information is useful for
    trouble-shooting.
    
    This patch replaces several log messages that can be triggered in
    runtime. The idea behind this patch is to avoid log message flooding
    under errors.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 036a0a65c6a3ba95cff48035a25e0bdba6aa0452
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 19:47:02 2008 +0100

    src: add cache statistics via `-s cache'
    
    This patch adds cache statistics that you can check via
    `conntrackd -s cache'. This information is useful for
    trouble-shooting.
    
    This patch replaces several log messages that can be triggered in
    runtime. The idea behind this patch is to avoid log message flooding
    under errors.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 7b3f57d5007dd2cf4127c2c3a9a7cd0f64d5d6e9
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 19:39:39 2008 +0100

    src: add network statistics via `-s network'
    
    This patch adds networks statistics that you can check via
    `conntrackd -s network'. This information is useful for
    trouble-shooting.
    
    This patch replaces several log messages that can be triggered in
    runtime. The idea behind this patch is to avoid log message flooding
    under errors.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit b666e6ebbd0c0ae7967ff8167790166858544297
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Dec 21 12:50:33 2008 +0100

    headers: delete unused flags in conntrackd.h
    
    This patch deletes three unused flags SYNC_MODE_ALARM,
    SYNC_MODE_FTFW_BIT and DONT_CHECKSUM. They were replaced by
    the CTD_* flags at some point of the development.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 conntrackd.8          |    7 ++-
 include/cache.h       |   38 +++++++++++-------
 include/conntrackd.h  |   59 ++++++++++++++++++++-------
 src/cache.c           |   89 ++++++++++++++++++++++++++++++++----------
 src/cache_iterators.c |   33 +++++++++------
 src/main.c            |   34 ++++++++++++++--
 src/network.c         |    7 ++-
 src/run.c             |  104 ++++++++++++++++++++++++++++++++++++++++++++----
 src/stats-mode.c      |    3 +
 src/sync-ftfw.c       |    4 +-
 src/sync-mode.c       |   99 ++++++++++++++++++++++++++++++++--------------
 src/traffic_stats.c   |   16 ++++----
 12 files changed, 369 insertions(+), 124 deletions(-)
This patch deletes three unused flags SYNC_MODE_ALARM,
SYNC_MODE_FTFW_BIT and DONT_CHECKSUM. They were replaced by
the CTD_* flags at some point of the development.

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

diff --git a/include/conntrackd.h b/include/conntrackd.h
index dc992db..3b5620e 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -33,17 +33,6 @@
 #define DEFAULT_STATS_LOGFILE	"/var/log/conntrackd-stats.log"
 #define DEFAULT_SYSLOG_FACILITY	LOG_DAEMON
 
-enum {
-	SYNC_MODE_ALARM_BIT = 0,
-	SYNC_MODE_ALARM = (1 << SYNC_MODE_ALARM_BIT),
-
-	SYNC_MODE_FTFW_BIT = 1,
-	SYNC_MODE_FTFW = (1 << SYNC_MODE_FTFW_BIT),
-
-	DONT_CHECKSUM_BIT = 2,
-	DONT_CHECKSUM = (1 << DONT_CHECKSUM_BIT),
-};
-
 /* daemon/request modes */
 #define NOT_SET         0
 #define DAEMON		1



More information about the netfilter-cvslog mailing list