[libnetfilter_conntrack] dccp: fix endianess in handshake_seq
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Thu Jul 16 11:07:42 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=867cda50716d393e132001484c6f0a4ae50e7eb9
commit 867cda50716d393e132001484c6f0a4ae50e7eb9
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Thu Jul 16 11:04:56 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Thu Jul 16 11:04:56 2009 +0200
dccp: fix endianess in handshake_seq
This patch fixes missing endianess conversion of the new
attribute ATTR_HANDSHAKE_SEQ that was included in
19f35b21dbe2bb4386eeced4e0d87f3b2e1d.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 9cc1f1c7cf7eae4a795849ef637203e1d3cd38c1
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Thu Jul 16 10:51:41 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Thu Jul 16 10:51:41 2009 +0200
src: rename ATTR_DCCP_SEQ by ATTR_DCCP_HANDSHAKE_SEQ
This patch renames the attribute constant to access the DCCP
handshake sequence number that was recently committed in
19f35b21dbe2bb4386eeced4e0d87f3b2e1dd8bf. No release with
the old name has been done, so no problems about backward
compatibility although it'd be better if I don't push changes
that I have to modify very soon afterwards.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
via 867cda50716d393e132001484c6f0a4ae50e7eb9 (commit)
via 9cc1f1c7cf7eae4a795849ef637203e1d3cd38c1 (commit)
from 2d740aa3fba7435d563ea0cc9a45c7bd2d3f1e73 (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 867cda50716d393e132001484c6f0a4ae50e7eb9
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Thu Jul 16 11:04:56 2009 +0200
dccp: fix endianess in handshake_seq
This patch fixes missing endianess conversion of the new
attribute ATTR_HANDSHAKE_SEQ that was included in
19f35b21dbe2bb4386eeced4e0d87f3b2e1d.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 9cc1f1c7cf7eae4a795849ef637203e1d3cd38c1
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Thu Jul 16 10:51:41 2009 +0200
src: rename ATTR_DCCP_SEQ by ATTR_DCCP_HANDSHAKE_SEQ
This patch renames the attribute constant to access the DCCP
handshake sequence number that was recently committed in
19f35b21dbe2bb4386eeced4e0d87f3b2e1dd8bf. No release with
the old name has been done, so no problems about backward
compatibility although it'd be better if I don't push changes
that I have to modify very soon afterwards.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
-----------------------------------------------------------------------
include/internal/object.h | 2 +-
.../libnetfilter_conntrack.h | 2 +-
src/conntrack/build.c | 11 +++++++++--
src/conntrack/copy.c | 8 ++++----
src/conntrack/getter.c | 6 +++---
src/conntrack/parse.c | 7 ++++---
src/conntrack/setter.c | 7 ++++---
7 files changed, 26 insertions(+), 17 deletions(-)
This patch renames the attribute constant to access the DCCP
handshake sequence number that was recently committed in
19f35b21dbe2bb4386eeced4e0d87f3b2e1dd8bf. No release with
the old name has been done, so no problems about backward
compatibility although it'd be better if I don't push changes
that I have to modify very soon afterwards.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
diff --git a/include/internal/object.h b/include/internal/object.h
index b236453..cd06b88 100644
--- a/include/internal/object.h
+++ b/include/internal/object.h
@@ -128,7 +128,7 @@ union __nfct_protoinfo {
struct {
u_int8_t state;
u_int8_t role;
- u_int64_t seq;
+ u_int64_t handshake_seq;
} dccp;
};
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
index fae581e..346039c 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h
@@ -123,7 +123,7 @@ enum nf_conntrack_attr {
ATTR_HELPER_NAME, /* string (30 bytes max) */
ATTR_DCCP_STATE = 56, /* u8 bits */
ATTR_DCCP_ROLE, /* u8 bits */
- ATTR_DCCP_SEQ, /* u64 bits */
+ ATTR_DCCP_HANDSHAKE_SEQ, /* u64 bits */
ATTR_MAX
};
diff --git a/src/conntrack/build.c b/src/conntrack/build.c
index 4f2307f..dea0c75 100644
--- a/src/conntrack/build.c
+++ b/src/conntrack/build.c
@@ -160,10 +160,10 @@ static void __build_protoinfo(struct nfnlhdr *req, size_t size,
CTA_PROTOINFO_DCCP_ROLE,
&ct->protoinfo.dccp.role,
sizeof(u_int8_t));
- if (test_bit(ATTR_DCCP_SEQ, ct->set))
+ if (test_bit(ATTR_DCCP_HANDSHAKE_SEQ, ct->set))
nfnl_addattr_l(&req->nlh, size,
CTA_PROTOINFO_DCCP_SEQ,
- &ct->protoinfo.dccp.seq,
+ &ct->protoinfo.dccp.handshake_seq,
sizeof(u_int64_t));
nfnl_nest_end(&req->nlh, nest_proto);
nfnl_nest_end(&req->nlh, nest);
diff --git a/src/conntrack/copy.c b/src/conntrack/copy.c
index a76edf4..63bdf0b 100644
--- a/src/conntrack/copy.c
+++ b/src/conntrack/copy.c
@@ -256,10 +256,10 @@ static void copy_attr_dccp_role(struct nf_conntrack *dest,
dest->protoinfo.dccp.role = orig->protoinfo.dccp.role;
}
-static void copy_attr_dccp_seq(struct nf_conntrack *dest,
- const struct nf_conntrack *orig)
+static void copy_attr_dccp_handshake_seq(struct nf_conntrack *dest,
+ const struct nf_conntrack *orig)
{
- dest->protoinfo.dccp.seq = orig->protoinfo.dccp.seq;
+ dest->protoinfo.dccp.handshake_seq = orig->protoinfo.dccp.handshake_seq;
}
static void copy_attr_snat_ipv4(struct nf_conntrack *dest,
@@ -454,5 +454,5 @@ copy_attr copy_attr_array[ATTR_MAX] = {
[ATTR_HELPER_NAME] = copy_attr_helper_name,
[ATTR_DCCP_STATE] = copy_attr_dccp_state,
[ATTR_DCCP_ROLE] = copy_attr_dccp_role,
- [ATTR_DCCP_SEQ] = copy_attr_dccp_seq,
+ [ATTR_DCCP_HANDSHAKE_SEQ] = copy_attr_dccp_handshake_seq,
};
diff --git a/src/conntrack/getter.c b/src/conntrack/getter.c
index 4314058..96273a0 100644
--- a/src/conntrack/getter.c
+++ b/src/conntrack/getter.c
@@ -297,9 +297,9 @@ static const void *get_attr_dccp_role(const struct nf_conntrack *ct)
return &ct->protoinfo.dccp.role;
}
-static const void *get_attr_dccp_seq(const struct nf_conntrack *ct)
+static const void *get_attr_dccp_handshake_seq(const struct nf_conntrack *ct)
{
- return &ct->protoinfo.dccp.seq;
+ return &ct->protoinfo.dccp.handshake_seq;
}
get_attr get_attr_array[ATTR_MAX] = {
@@ -361,5 +361,5 @@ get_attr get_attr_array[ATTR_MAX] = {
[ATTR_HELPER_NAME] = get_attr_helper_name,
[ATTR_DCCP_STATE] = get_attr_dccp_state,
[ATTR_DCCP_ROLE] = get_attr_dccp_role,
- [ATTR_DCCP_SEQ] = get_attr_dccp_seq,
+ [ATTR_DCCP_HANDSHAKE_SEQ] = get_attr_dccp_handshake_seq,
};
diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c
index 99dc913..ce4b673 100644
--- a/src/conntrack/parse.c
+++ b/src/conntrack/parse.c
@@ -262,9 +262,9 @@ static void __parse_protoinfo_dccp(const struct nfattr *attr,
set_bit(ATTR_DCCP_ROLE, ct->set);
}
if (tb[CTA_PROTOINFO_DCCP_SEQ-1]) {
- ct->protoinfo.dccp.seq =
+ ct->protoinfo.dccp.handshake_seq =
*(u_int64_t *)NFA_DATA(tb[CTA_PROTOINFO_DCCP_SEQ-1]);
- set_bit(ATTR_DCCP_SEQ, ct->set);
+ set_bit(ATTR_DCCP_HANDSHAKE_SEQ, ct->set);
}
}
diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c
index da7d4b1..dd87860 100644
--- a/src/conntrack/setter.c
+++ b/src/conntrack/setter.c
@@ -324,9 +324,10 @@ static void set_attr_dccp_role(struct nf_conntrack *ct, const void *value)
ct->protoinfo.dccp.role = *((u_int8_t *) value);
}
-static void set_attr_dccp_seq(struct nf_conntrack *ct, const void *value)
+static void
+set_attr_dccp_handshake_seq(struct nf_conntrack *ct, const void *value)
{
- ct->protoinfo.dccp.seq = *((u_int64_t *) value);
+ ct->protoinfo.dccp.handshake_seq = *((u_int64_t *) value);
}
static void set_attr_do_nothing(struct nf_conntrack *ct, const void *value) {}
@@ -390,5 +391,5 @@ set_attr set_attr_array[ATTR_MAX] = {
[ATTR_HELPER_NAME] = set_attr_helper_name,
[ATTR_DCCP_STATE] = set_attr_dccp_state,
[ATTR_DCCP_ROLE] = set_attr_dccp_role,
- [ATTR_DCCP_SEQ] = set_attr_dccp_seq,
+ [ATTR_DCCP_HANDSHAKE_SEQ] = set_attr_dccp_handshake_seq,
};
More information about the netfilter-cvslog
mailing list