[ulogd2] pgsql: fix type of mac_protocol and oob_protocol.

Eric Leblond netfilter-cvslog-bounces at lists.netfilter.org
Sun Feb 8 21:12:55 CET 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=d372b5a3bba98db6b70579751cac12dc01c23492
commit d372b5a3bba98db6b70579751cac12dc01c23492
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Mon Feb 2 20:46:32 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Sun Feb 8 21:08:06 2009 +0100

    pgsql: fix type of mac_protocol and oob_protocol.
    
    The oob_protocol does not fit into a smallint (IPv6 case for example).
    This patch switches the length of the related field to an integer.

commit 8f80ed06233bac73891f6cf9d94f1d6d95d2bd40
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Wed Jan 28 00:16:39 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Thu Jan 29 23:29:17 2009 +0100

    Add threshold and timeout option to NFLOG plugin.
    
    This patch adds support for setting NFLOG threshold and timeout
    from ulogd.

commit ecb2ffcb174ca2c96cd0c663bced8f46e88f0e68
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Tue Jan 27 12:02:15 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Tue Jan 27 23:48:05 2009 +0100

    Explicitely type PCAP input key.
    
    This patch affect type and flag to PCAP input key.

commit fc5aa5ba7961c9cae924300ca61f0fb529703fa1
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Tue Jan 27 11:21:54 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Tue Jan 27 23:48:05 2009 +0100

    Display which keys are optional in info mode.
    
    This patch adds a "optional" keyword to description of input key which are
    optional when --info is used to dump information about a plugin.
       via  d372b5a3bba98db6b70579751cac12dc01c23492 (commit)
       via  8f80ed06233bac73891f6cf9d94f1d6d95d2bd40 (commit)
       via  ecb2ffcb174ca2c96cd0c663bced8f46e88f0e68 (commit)
       via  fc5aa5ba7961c9cae924300ca61f0fb529703fa1 (commit)
      from  13643ceb7396101cc8611c5c366df2a7f0fa5c17 (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 d372b5a3bba98db6b70579751cac12dc01c23492
Author: Eric Leblond <eric at inl.fr>
Date:   Mon Feb 2 20:46:32 2009 +0100

    pgsql: fix type of mac_protocol and oob_protocol.
    
    The oob_protocol does not fit into a smallint (IPv6 case for example).
    This patch switches the length of the related field to an integer.

commit 8f80ed06233bac73891f6cf9d94f1d6d95d2bd40
Author: Eric Leblond <eric at inl.fr>
Date:   Wed Jan 28 00:16:39 2009 +0100

    Add threshold and timeout option to NFLOG plugin.
    
    This patch adds support for setting NFLOG threshold and timeout
    from ulogd.

commit ecb2ffcb174ca2c96cd0c663bced8f46e88f0e68
Author: Eric Leblond <eric at inl.fr>
Date:   Tue Jan 27 12:02:15 2009 +0100

    Explicitely type PCAP input key.
    
    This patch affect type and flag to PCAP input key.

commit fc5aa5ba7961c9cae924300ca61f0fb529703fa1
Author: Eric Leblond <eric at inl.fr>
Date:   Tue Jan 27 11:21:54 2009 +0100

    Display which keys are optional in info mode.
    
    This patch adds a "optional" keyword to description of input key which are
    optional when --info is used to dump information about a plugin.

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

 doc/pgsql-ulogd2-flat.sql         |    2 +-
 doc/pgsql-ulogd2.sql              |    2 +-
 input/packet/ulogd_inppkt_NFLOG.c |   46 ++++++++++++++++++++++++++++++++++++-
 output/pcap/ulogd_output_PCAP.c   |   20 ++++++++++++----
 src/ulogd.c                       |    7 +++++-
 ulogd.conf.in                     |    4 +++
 6 files changed, 72 insertions(+), 9 deletions(-)
This patch adds a "optional" keyword to description of input key which are
optional when --info is used to dump information about a plugin.

diff --git a/src/ulogd.c b/src/ulogd.c
index 2e86b9d..1428373 100644
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -320,9 +320,14 @@ void get_plugin_infos(struct ulogd_plugin *me)
 			for(i = 0; i < me->input.num_keys; i++) {
 				char *tstring = 
 					type_to_string(me->input.keys[i].type);
-				printf("\tKey: %s (%s)\n",
+				printf("\tKey: %s (%s",
 				       me->input.keys[i].name,
 				       tstring);
+				if (me->input.keys[i].flags
+						& ULOGD_KEYF_OPTIONAL)
+					printf(", optional)\n");
+				else
+					printf(")\n");
 				free(tstring);
 			}
 		}



More information about the netfilter-cvslog mailing list