diff options
| -rw-r--r-- | include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 2 | ||||
| -rw-r--r-- | src/callback.c | 1 | ||||
| -rw-r--r-- | src/conntrack/build.c | 2 | ||||
| -rw-r--r-- | src/conntrack/parse.c | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h index 1278dda..65af53e 100644 --- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h @@ -106,7 +106,7 @@ enum ctattr_protoinfo_dccp { CTA_PROTOINFO_DCCP_UNSPEC, CTA_PROTOINFO_DCCP_STATE, CTA_PROTOINFO_DCCP_ROLE, - CTA_PROTOINFO_DCCP_SEQ, + CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ, __CTA_PROTOINFO_DCCP_MAX, }; #define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1) diff --git a/src/callback.c b/src/callback.c index fd8b788..6cfdf9d 100644 --- a/src/callback.c +++ b/src/callback.c @@ -106,6 +106,5 @@ int __callback(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data) ret = NFNL_CB_CONTINUE; break; } -out: return ret; } 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); |