[libnetfilter_conntrack] snprintf: fix missing protocol state support in XML output
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Tue Apr 14 10:37:22 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=806f790eae8212dbdbc3f61e6debdf4e29dfa9bf
commit 806f790eae8212dbdbc3f61e6debdf4e29dfa9bf
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Apr 14 10:36:11 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Apr 14 10:36:11 2009 +0200
snprintf: fix missing protocol state support in XML output
This patch adds the missing bits to display the protocol state
in the XML output.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit a1586cea00b32b401c76f17aab4121967051d883
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Apr 14 10:36:07 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Apr 14 10:36:07 2009 +0200
snprintf: remove duplicated protocol string definitions
This patch merges duplicated protocol string definitions in the
snprintf infrastructure. I have also fixed the size of the string
array. This patch is a cleanup.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 7533cca286edee99db29eb1238653a2040738d3e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Apr 14 10:35:27 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Apr 14 10:35:27 2009 +0200
src: add initial DCCP support
This patch adds initial DCCP support for libnetfilter_conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 4c29acdd89f15fbc4b70851e3c88387eb6322519
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Apr 10 16:00:52 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Apr 10 16:00:52 2009 +0200
header: refresh nfnetlink_conntrack.h copy
This patch refreshes the nfnetlink_conntrack.h copy against 2.6.29.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
via 806f790eae8212dbdbc3f61e6debdf4e29dfa9bf (commit)
via a1586cea00b32b401c76f17aab4121967051d883 (commit)
via 7533cca286edee99db29eb1238653a2040738d3e (commit)
via 4c29acdd89f15fbc4b70851e3c88387eb6322519 (commit)
from bcb4122a951cd93a9d6f7d7f6314a5c1c0966d75 (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 806f790eae8212dbdbc3f61e6debdf4e29dfa9bf
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Apr 14 10:36:11 2009 +0200
snprintf: fix missing protocol state support in XML output
This patch adds the missing bits to display the protocol state
in the XML output.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit a1586cea00b32b401c76f17aab4121967051d883
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Apr 14 10:36:07 2009 +0200
snprintf: remove duplicated protocol string definitions
This patch merges duplicated protocol string definitions in the
snprintf infrastructure. I have also fixed the size of the string
array. This patch is a cleanup.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 7533cca286edee99db29eb1238653a2040738d3e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Apr 14 10:35:27 2009 +0200
src: add initial DCCP support
This patch adds initial DCCP support for libnetfilter_conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 4c29acdd89f15fbc4b70851e3c88387eb6322519
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Fri Apr 10 16:00:52 2009 +0200
header: refresh nfnetlink_conntrack.h copy
This patch refreshes the nfnetlink_conntrack.h copy against 2.6.29.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
-----------------------------------------------------------------------
include/internal/extern.h | 7 +++
include/internal/internal.h | 3 +
include/internal/object.h | 10 +++-
include/libnetfilter_conntrack/Makefile.am | 2 +-
.../libnetfilter_conntrack.h | 1 +
.../libnetfilter_conntrack_dccp.h | 33 ++++++++++++
.../linux_nfnetlink_conntrack.h | 12 ++--
src/conntrack/build.c | 38 ++++++++++---
src/conntrack/compare.c | 10 ++++
src/conntrack/getter.c | 6 ++
src/conntrack/parse.c | 17 ++++++
src/conntrack/setter.c | 6 ++
src/conntrack/snprintf.c | 55 ++++++++++++++++++++
src/conntrack/snprintf_default.c | 51 ++++--------------
src/conntrack/snprintf_xml.c | 51 ++++++++++--------
15 files changed, 223 insertions(+), 79 deletions(-)
create mode 100644 include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h
This patch refreshes the nfnetlink_conntrack.h copy against 2.6.29.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
index 19e71a0..67ca715 100644
--- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
+++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
@@ -104,7 +104,7 @@ enum ctattr_protoinfo_tcp {
enum ctattr_protoinfo_dccp {
CTA_PROTOINFO_DCCP_UNSPEC,
CTA_PROTOINFO_DCCP_STATE,
- __CTA_PROTOINFO_DCCP_MAX
+ __CTA_PROTOINFO_DCCP_MAX,
};
#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
@@ -119,10 +119,10 @@ enum ctattr_protoinfo_sctp {
enum ctattr_counters {
CTA_COUNTERS_UNSPEC,
- CTA_COUNTERS_PACKETS, /* old 64bit counters */
- CTA_COUNTERS_BYTES, /* old 64bit counters */
- CTA_COUNTERS32_PACKETS,
- CTA_COUNTERS32_BYTES,
+ CTA_COUNTERS_PACKETS, /* 64bit counters */
+ CTA_COUNTERS_BYTES, /* 64bit counters */
+ CTA_COUNTERS32_PACKETS, /* old 32bit counters, unused */
+ CTA_COUNTERS32_BYTES, /* old 32bit counters, unused */
__CTA_COUNTERS_MAX
};
#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
@@ -150,7 +150,7 @@ enum ctattr_natseq {
CTA_NAT_SEQ_OFFSET_BEFORE,
CTA_NAT_SEQ_OFFSET_AFTER,
__CTA_NAT_SEQ_MAX
-};
+};
#define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1)
enum ctattr_expect {
More information about the netfilter-cvslog
mailing list