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@netfilter.org>

5 files changed, 15 insertions, 14 deletions

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,
 };