[ulogd2] pgsql: remove useless checkings

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Mon Oct 20 14:02:18 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=bea171e5eb656cd0a46f460396af6c054541b110
commit bea171e5eb656cd0a46f460396af6c054541b110
Author:     Pierre Chifflier <pierre at inl.fr>
AuthorDate: Mon Oct 20 14:01:51 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Mon Oct 20 14:01:51 2008 +0200

    pgsql: remove useless checkings
    
    This patch removes useless checkings.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 13dbe40845eb7aecd15157021b849450c969515a
Author:     Pierre Chifflier <pierre at inl.fr>
AuthorDate: Mon Oct 20 13:55:44 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Mon Oct 20 13:55:44 2008 +0200

    hwhdr: finish missing renaming
    
    MAC2STR has been renamed to HWHDR.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 73f10220e25293ee5f6441c24c0f76282782f32d
Author:     Pierre Chifflier <pierre at inl.fr>
AuthorDate: Mon Oct 20 13:53:59 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Mon Oct 20 13:53:59 2008 +0200

    hwhdr: fix segfault when RAW_MAC is NULL
    
    This fixes a segfault when RAW_MAC key is NULL in MAC2STR plugin.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 69ad5477db96a24c216f1f6305ddc0d2fd902e06
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Fri Sep 12 00:18:22 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Sep 12 00:18:22 2008 +0200

    config: remove obsolete global variables
    
    'rmem' and 'bufsize' global variables are unherited from ulogd1
    and are not used anymore. This patch suppresses them from the
    example configuration file.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  bea171e5eb656cd0a46f460396af6c054541b110 (commit)
       via  13dbe40845eb7aecd15157021b849450c969515a (commit)
       via  73f10220e25293ee5f6441c24c0f76282782f32d (commit)
       via  69ad5477db96a24c216f1f6305ddc0d2fd902e06 (commit)
      from  15d9d1a49e08a5a17e918d20733c2a1d77b8048d (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 bea171e5eb656cd0a46f460396af6c054541b110
Author: Pierre Chifflier <pierre at inl.fr>
Date:   Mon Oct 20 14:01:51 2008 +0200

    pgsql: remove useless checkings
    
    This patch removes useless checkings.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 13dbe40845eb7aecd15157021b849450c969515a
Author: Pierre Chifflier <pierre at inl.fr>
Date:   Mon Oct 20 13:55:44 2008 +0200

    hwhdr: finish missing renaming
    
    MAC2STR has been renamed to HWHDR.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 73f10220e25293ee5f6441c24c0f76282782f32d
Author: Pierre Chifflier <pierre at inl.fr>
Date:   Mon Oct 20 13:53:59 2008 +0200

    hwhdr: fix segfault when RAW_MAC is NULL
    
    This fixes a segfault when RAW_MAC key is NULL in MAC2STR plugin.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 69ad5477db96a24c216f1f6305ddc0d2fd902e06
Author: Eric Leblond <eric at inl.fr>
Date:   Fri Sep 12 00:18:22 2008 +0200

    config: remove obsolete global variables
    
    'rmem' and 'bufsize' global variables are unherited from ulogd1
    and are not used anymore. This patch suppresses them from the
    example configuration file.
    
    Signed-off-by: Eric Leblond <eric at inl.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 doc/pgsql-ulogd2.sql        |    6 ------
 filter/ulogd_filter_HWHDR.c |    6 +++---
 ulogd.conf.in               |    9 +--------
 3 files changed, 4 insertions(+), 17 deletions(-)
'rmem' and 'bufsize' global variables are unherited from ulogd1
and are not used anymore. This patch suppresses them from the
example configuration file.

Signed-off-by: Eric Leblond <eric at inl.fr>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/ulogd.conf.in b/ulogd.conf.in
index a32234d..d2b18d4 100644
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -14,13 +14,6 @@ logfile="/var/log/ulogd.log"
 # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8)
 loglevel=1
 
-# socket receive buffer size (should be at least the size of the
-# in-kernel buffer (ipt_ULOG.o 'nlbufsiz' parameter)
-rmem=131071
-
-# libipulog/ulogd receive buffer size, should be > rmem
-bufsize=150000
-
 ######################################################################
 # PLUGIN OPTIONS
 ######################################################################



More information about the netfilter-cvslog mailing list