[libnetfilter_conntrack] src: add support for TCP window scale factor

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Tue Feb 16 14:59:11 CET 2010


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=fb61c68dd0ba2e6ce98516ddbbd3b10638f4bcea
commit fb61c68dd0ba2e6ce98516ddbbd3b10638f4bcea
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Dec 29 18:47:10 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Feb 16 14:56:28 2010 +0100

    src: add support for TCP window scale factor
    
    This patch adds the missing bits to support the modification of the
    TCP window scale factor in a conntrack entry. The kernel support
    has been already there since 2.6.23.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 0d64ef303faf501398f0a241c3ab02855d8898b6
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Jan 24 21:57:57 2010 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Jan 24 21:57:57 2010 +0100

    header: counters are 64-bits long
    
    This patch fixes wrong comments in the libnetfilter_conntrack.h header
    file. The counters of the user-space conntrack object has always been
    64-bits long (even if during some time they were 32-bits long in the
    kernel). This does not break backward compatibility, but users (like
    ulogd2) has to fix this to avoid truncating the counters.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  fb61c68dd0ba2e6ce98516ddbbd3b10638f4bcea (commit)
       via  0d64ef303faf501398f0a241c3ab02855d8898b6 (commit)
      from  35f34a55f8f301100c622923adc8b5d27568cba4 (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 fb61c68dd0ba2e6ce98516ddbbd3b10638f4bcea
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue Dec 29 18:47:10 2009 +0100

    src: add support for TCP window scale factor
    
    This patch adds the missing bits to support the modification of the
    TCP window scale factor in a conntrack entry. The kernel support
    has been already there since 2.6.23.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 0d64ef303faf501398f0a241c3ab02855d8898b6
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Jan 24 21:57:57 2010 +0100

    header: counters are 64-bits long
    
    This patch fixes wrong comments in the libnetfilter_conntrack.h header
    file. The counters of the user-space conntrack object has always been
    64-bits long (even if during some time they were 32-bits long in the
    kernel). This does not break backward compatibility, but users (like
    ulogd2) has to fix this to avoid truncating the counters.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 include/internal/object.h                          |    1 +
 .../libnetfilter_conntrack.h                       |   10 ++++++----
 src/conntrack/build.c                              |   10 ++++++++++
 src/conntrack/copy.c                               |   16 ++++++++++++++++
 src/conntrack/getter.c                             |   12 ++++++++++++
 src/conntrack/parse.c                              |   14 ++++++++++++++
 6 files changed, 59 insertions(+), 4 deletions(-)
This patch fixes wrong comments in the libnetfilter_conntrack.h header
file. The counters of the user-space conntrack object has always been
64-bits long (even if during some time they were 32-bits long in the
kernel). This does not break backward compatibility, but users (like
ulogd2) has to fix this to avoid truncating the counters.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
index b0487b6..93645a3 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
@@ -91,10 +91,10 @@ enum nf_conntrack_attr {
 	ATTR_DNAT_PORT,				/* u16 bits */
 	ATTR_TIMEOUT = 24,			/* u32 bits */
 	ATTR_MARK,				/* u32 bits */
-	ATTR_ORIG_COUNTER_PACKETS,		/* u32 bits */
-	ATTR_REPL_COUNTER_PACKETS,		/* u32 bits */
-	ATTR_ORIG_COUNTER_BYTES = 28,		/* u32 bits */
-	ATTR_REPL_COUNTER_BYTES,		/* u32 bits */
+	ATTR_ORIG_COUNTER_PACKETS,		/* u64 bits */
+	ATTR_REPL_COUNTER_PACKETS,		/* u64 bits */
+	ATTR_ORIG_COUNTER_BYTES = 28,		/* u64 bits */
+	ATTR_REPL_COUNTER_BYTES,		/* u64 bits */
 	ATTR_USE,				/* u32 bits */
 	ATTR_ID,				/* u32 bits */
 	ATTR_STATUS = 32,			/* u32 bits  */



More information about the netfilter-cvslog mailing list