[ulogd2] IP2BIN: fix missing protocol key

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=3fff7feb1428e8de1903817127995efd4c60d5ef
commit 3fff7feb1428e8de1903817127995efd4c60d5ef
Author:     Christophe Fish <christophe.fish at free.fr>
AuthorDate: Fri Apr 2 14:16:54 2010 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Apr 2 14:16:54 2010 +0200

    IP2BIN: fix missing protocol key
    
    ulogd2 from git won't start using filter IP2BIN. It gives the following error
    message in the log:
    
    <1> ulogd.c:670 traversing plugin `IP2BIN'
    <1> ulogd.c:627 log4(NFLOG)
    <1> ulogd.c:733 assigning `oob.family(?)' as source for IP2BIN(oob.family)
    <7> ulogd.c:727 cannot find key `' in stack
    <1> ulogd.c:863 destroying stack
    
    Filling up ip2bin_inp[] declaration with missing section in
    filter/ulogd_filter_IP2BIN.c solves the problem:
    
    Signed-off-by: Christophe Fish <christophe.fish at free.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  3fff7feb1428e8de1903817127995efd4c60d5ef (commit)
      from  ead3e460478c9b085227a4380f38d6bf1d39836d (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 3fff7feb1428e8de1903817127995efd4c60d5ef
Author: Christophe Fish <christophe.fish at free.fr>
Date:   Fri Apr 2 14:16:54 2010 +0200

    IP2BIN: fix missing protocol key
    
    ulogd2 from git won't start using filter IP2BIN. It gives the following error
    message in the log:
    
    <1> ulogd.c:670 traversing plugin `IP2BIN'
    <1> ulogd.c:627 log4(NFLOG)
    <1> ulogd.c:733 assigning `oob.family(?)' as source for IP2BIN(oob.family)
    <7> ulogd.c:727 cannot find key `' in stack
    <1> ulogd.c:863 destroying stack
    
    Filling up ip2bin_inp[] declaration with missing section in
    filter/ulogd_filter_IP2BIN.c solves the problem:
    
    Signed-off-by: Christophe Fish <christophe.fish at free.fr>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 filter/ulogd_filter_IP2BIN.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
ulogd2 from git won't start using filter IP2BIN. It gives the following error
message in the log:

<1> ulogd.c:670 traversing plugin `IP2BIN'
<1> ulogd.c:627 log4(NFLOG)
<1> ulogd.c:733 assigning `oob.family(?)' as source for IP2BIN(oob.family)
<7> ulogd.c:727 cannot find key `' in stack
<1> ulogd.c:863 destroying stack

Filling up ip2bin_inp[] declaration with missing section in
filter/ulogd_filter_IP2BIN.c solves the problem:

Signed-off-by: Christophe Fish <christophe.fish at free.fr>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c
index 0a71972..a8688fe 100644
--- a/filter/ulogd_filter_IP2BIN.c
+++ b/filter/ulogd_filter_IP2BIN.c
@@ -50,6 +50,11 @@ static struct ulogd_key ip2bin_inp[] = {
 		.flags = ULOGD_RETF_NONE,
 		.name = "oob.family",
 	},
+	[KEY_OOB_PROTOCOL] = {
+		.type = ULOGD_RET_UINT16,
+		.flags = ULOGD_RETF_NONE,
+		.name = "oob.protocol",
+	},
 	[KEY_IP_SADDR] = {
 		.type = ULOGD_RET_IPADDR,
 		.flags = ULOGD_RETF_NONE|ULOGD_KEYF_OPTIONAL,