diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-12-18 20:36:01 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-12-18 20:36:01 +0100 |
commit | 4aaa306acc0d6e7d7f2efc4b9e28b90ee6cfed5f (patch) | |
tree | b74aad8c799fbb4ef7474a82ce21247a5fbba41c /src | |
parent | a729bb44a14f78f12edb09ae76ce04dbc171c266 (diff) |
src: replace CTA_PROTOINFO_DCCP_SEQ by CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ
This patch uses CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ instead which is the
name that is used in the Linux kernel header. Thus, both the headers
and the internal copy for the library are in sync.
This problem was probably introduced at the time that we added support
for the DCCP handshake sequence number.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/conntrack/build.c | 2 | ||||
-rw-r--r-- | src/conntrack/parse.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/conntrack/build.c b/src/conntrack/build.c index ec7623d..f80089a 100644 --- a/src/conntrack/build.c +++ b/src/conntrack/build.c @@ -202,7 +202,7 @@ static void __build_protoinfo(struct nfnlhdr *req, size_t size, __be64_to_cpu(ct->protoinfo.dccp.handshake_seq); nfnl_addattr_l(&req->nlh, size, - CTA_PROTOINFO_DCCP_SEQ, + CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ, &handshake_seq, sizeof(u_int64_t)); } diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c index d03ddb3..64e6e93 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -275,10 +275,10 @@ static void __parse_protoinfo_dccp(const struct nfattr *attr, *(u_int8_t *)NFA_DATA(tb[CTA_PROTOINFO_DCCP_ROLE-1]); set_bit(ATTR_DCCP_ROLE, ct->set); } - if (tb[CTA_PROTOINFO_DCCP_SEQ-1]) { + if (tb[CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ-1]) { u_int64_t tmp; memcpy(&tmp, - NFA_DATA(tb[CTA_PROTOINFO_DCCP_SEQ-1]), + NFA_DATA(tb[CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ-1]), sizeof(tmp)); ct->protoinfo.dccp.handshake_seq = __be64_to_cpu(tmp); set_bit(ATTR_DCCP_HANDSHAKE_SEQ, ct->set); |