[PATCH lnf-conntrack] conntrack: sctp: update states

[PATCH lnf-conntrack] conntrack: sctp: update states

[Florian Westphal]

with more recent kernels "conntrack -L" prints NONE instead of
HEARTBEAT_SENT/RECEIVED because the state is unknown in userspace.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h | 2 ++
 src/conntrack/snprintf.c                                     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
index 192125928fd8..4982066e7eb0 100644
--- a/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
+++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
@@ -14,6 +14,8 @@ enum sctp_state {
 	SCTP_CONNTRACK_SHUTDOWN_SENT,
 	SCTP_CONNTRACK_SHUTDOWN_RECD,
 	SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
+	SCTP_CONNTRACK_HEARTBEAT_SENT,
+	SCTP_CONNTRACK_HEARTBEAT_ACKED,
 	SCTP_CONNTRACK_MAX
 };
 
diff --git a/src/conntrack/snprintf.c b/src/conntrack/snprintf.c
index 17ad88506eae..ac0105518163 100644
--- a/src/conntrack/snprintf.c
+++ b/src/conntrack/snprintf.c
@@ -48,6 +48,8 @@ const char *const sctp_states[SCTP_CONNTRACK_MAX] = {
 	[SCTP_CONNTRACK_SHUTDOWN_SENT]	= "SHUTDOWN_SENT",
 	[SCTP_CONNTRACK_SHUTDOWN_RECD]	= "SHUTDOWN_RECD",
 	[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT] = "SHUTDOWN_ACK_SENT",
+	[SCTP_CONNTRACK_HEARTBEAT_SENT] = "HEARTBEAT_SENT",
+	[SCTP_CONNTRACK_HEARTBEAT_ACKED]  = "HEARTBEAT_ACKED",
 };
 
 const char *const dccp_states[DCCP_CONNTRACK_MAX] = {
-- 
2.26.2

Re: [PATCH lnf-conntrack] conntrack: sctp: update states

[Pablo Neira Ayuso]

On Thu, Aug 13, 2020 at 07:06:30PM +0200, Florian Westphal wrote:
> with more recent kernels "conntrack -L" prints NONE instead of
> HEARTBEAT_SENT/RECEIVED because the state is unknown in userspace.
> 
> Signed-off-by: Florian Westphal <fw@strlen.de>

Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>

Thanks!