[ulogd2] HWHDR: Fix size of allocated string.

[Eric Leblond]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=75b3becf5b95c4ab5ddcef88b6565de716e5c230
commit 75b3becf5b95c4ab5ddcef88b6565de716e5c230
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Tue Jan 13 01:00:46 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Tue Jan 13 08:21:44 2009 +0100

    HWHDR: Fix size of allocated string.
    
    This patch fixes a incorrect computing of the allocation size
    of a string.

commit de384e6f16d67eb21c555793368be4cb47fced98
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Tue Jan 13 00:57:10 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Tue Jan 13 08:21:21 2009 +0100

    Fix crash on IPv6 packet.
    
    Incorrect definition of a IPv6 input key handling function was causing
    a crash in ulogd.

commit 4253141a9ea4745c3da5b28e00344d5f0fc706a5
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Tue Jan 13 00:13:25 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Tue Jan 13 08:20:52 2009 +0100

    Display logfile to check in case of error.
    
    This patch adds the display of the used logging file to look at if there
    is a critical error.

commit 86d7ed0fecdead328e11ea6939d2ed8375b614a1
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Mon Jan 12 23:56:12 2009 +0100
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Tue Jan 13 08:20:32 2009 +0100

    fix config file: MAC2STR has been renamed to HWHDR.
    
    This patch replaces all MAC2STR occurences by HWHDR to sync with the
    renaming of the plugin.
       via  75b3becf5b95c4ab5ddcef88b6565de716e5c230 (commit)
       via  de384e6f16d67eb21c555793368be4cb47fced98 (commit)
       via  4253141a9ea4745c3da5b28e00344d5f0fc706a5 (commit)
       via  86d7ed0fecdead328e11ea6939d2ed8375b614a1 (commit)
      from  543d973caed160cfc301ab636aa33412aac67d79 (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 75b3becf5b95c4ab5ddcef88b6565de716e5c230
Author: Eric Leblond <eric at inl.fr>
Date:   Tue Jan 13 01:00:46 2009 +0100

    HWHDR: Fix size of allocated string.
    
    This patch fixes a incorrect computing of the allocation size
    of a string.

commit de384e6f16d67eb21c555793368be4cb47fced98
Author: Eric Leblond <eric at inl.fr>
Date:   Tue Jan 13 00:57:10 2009 +0100

    Fix crash on IPv6 packet.
    
    Incorrect definition of a IPv6 input key handling function was causing
    a crash in ulogd.

commit 4253141a9ea4745c3da5b28e00344d5f0fc706a5
Author: Eric Leblond <eric at inl.fr>
Date:   Tue Jan 13 00:13:25 2009 +0100

    Display logfile to check in case of error.
    
    This patch adds the display of the used logging file to look at if there
    is a critical error.

commit 86d7ed0fecdead328e11ea6939d2ed8375b614a1
Author: Eric Leblond <eric at inl.fr>
Date:   Mon Jan 12 23:56:12 2009 +0100

    fix config file: MAC2STR has been renamed to HWHDR.
    
    This patch replaces all MAC2STR occurences by HWHDR to sync with the
    renaming of the plugin.

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

 filter/ulogd_filter_HWHDR.c |    2 +-
 include/ulogd/ulogd.h       |    5 ++++-
 src/ulogd.c                 |    9 +++++++--
 ulogd.conf.in               |    4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)
This patch replaces all MAC2STR occurences by HWHDR to sync with the
renaming of the plugin.

diff --git a/ulogd.conf.in b/ulogd.conf.in
index 7022bf6..3bb0ee8 100644
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -67,10 +67,10 @@ plugin="@libdir@/ulogd/ulogd_raw2packet_BASE.so"
 #stack=log2:NFLOG,base1:BASE,pcap1:PCAP
 
 # this is a stack for logging packet to MySQL
-#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2bin1:IP2BIN,mac2str1:MAC2STR,mysql1:MYSQL
+#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2bin1:IP2BIN,mac2str1:HWHDR,mysql1:MYSQL
 
 # this is a stack for logging packet to PGsql after a collect via NFLOG
-#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:MAC2STR,pgsql1:PGSQL
+#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,pgsql1:PGSQL
 
 # this is a stack for logging packets to syslog after a collect via NFLOG
 #stack=log3:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG