1 files changed, 24 insertions, 26 deletions

diff --git a/src/parse.c b/src/parse.c
index 100177b..1bdfcc7 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -29,8 +29,6 @@ static void parse_u16(struct nf_conntrack *ct, int attr, void *data);
 static void parse_u32(struct nf_conntrack *ct, int attr, void *data);
 static void parse_group(struct nf_conntrack *ct, int attr, void *data);
 static void parse_nat_seq_adj(struct nf_conntrack *ct, int attr, void *data);
-static void parse_sctp(struct nf_conntrack *ct, int attr, void *data);
-static void parse_dccp(struct nf_conntrack *ct, int attr, void *data);
 
 struct parser {
 	void 	(*parse)(struct nf_conntrack *ct, int attr, void *data);
@@ -59,7 +57,7 @@ static struct parser h[NTA_MAX] = {
 		.attr	= ATTR_L4PROTO,
 		.size	= NTA_SIZE(sizeof(uint8_t)),
 	},
-	[NTA_STATE_TCP] = {
+	[NTA_TCP_STATE] = {
 		.parse	= parse_u8,
 		.attr	= ATTR_TCP_STATE,
 		.size	= NTA_SIZE(sizeof(uint8_t)),
@@ -123,13 +121,30 @@ static struct parser h[NTA_MAX] = {
 		.parse	= parse_nat_seq_adj,
 		.size	= NTA_SIZE(sizeof(struct nta_attr_natseqadj)),
 	},
-	[NTA_STATE_SCTP] = {
-		.parse	= parse_sctp,
-		.size	= NTA_SIZE(sizeof(struct nta_attr_sctp)),
+	[NTA_SCTP_STATE] = {
+		.parse	= parse_u8,
+		.attr	= ATTR_SCTP_STATE,
+		.size	= NTA_SIZE(sizeof(uint8_t)),
 	},
-	[NTA_STATE_DCCP] = {
-		.parse	= parse_dccp,
-		.size	= NTA_SIZE(sizeof(struct nta_attr_dccp)),
+	[NTA_SCTP_VTAG_ORIG] = {
+		.parse	= parse_u32,
+		.attr	= ATTR_SCTP_VTAG_ORIG,
+		.size	= NTA_SIZE(sizeof(uint32_t)),
+	},
+	[NTA_SCTP_VTAG_REPL] = {
+		.parse	= parse_u32,
+		.attr	= ATTR_SCTP_VTAG_REPL,
+		.size	= NTA_SIZE(sizeof(uint32_t)),
+	},
+	[NTA_DCCP_STATE] = {
+		.parse	= parse_u8,
+		.attr	= ATTR_DCCP_STATE,
+		.size	= NTA_SIZE(sizeof(uint8_t)),
+	},
+	[NTA_DCCP_ROLE] = {
+		.parse	= parse_u8,
+		.attr	= ATTR_DCCP_ROLE,
+		.size	= NTA_SIZE(sizeof(uint8_t)),
 	},
 };
 
@@ -178,23 +193,6 @@ parse_nat_seq_adj(struct nf_conntrack *ct, int attr, void *data)
 			  ntohl(this->orig_seq_correction_pos));
 }
 
-static void
-parse_sctp(struct nf_conntrack *ct, int attr, void *data)
-{
-	struct nta_attr_sctp *this = data;
-	nfct_set_attr_u8(ct, ATTR_SCTP_STATE, this->state);
-	nfct_set_attr_u32(ct, ATTR_SCTP_VTAG_ORIG, ntohl(this->vtag_orig));
-	nfct_set_attr_u32(ct, ATTR_SCTP_VTAG_REPL, ntohl(this->vtag_repl));
-}
-
-static void
-parse_dccp(struct nf_conntrack *ct, int attr, void *data)
-{
-	struct nta_attr_dccp *this = data;
-	nfct_set_attr_u8(ct, ATTR_DCCP_STATE, this->state);
-	nfct_set_attr_u8(ct, ATTR_DCCP_ROLE, this->role);
-}
-
 int parse_payload(struct nf_conntrack *ct, struct nethdr *net, size_t remain)
 {
 	int len;