History

Revert "netfilter: conntrack: add sctp DATA_SENT state"

This reverts commit (bff3d0534804: "netfilter: conntrack: add sctp DATA_SENT state") Using DATA/SACK to detect a new connection on secondary/alternate paths works only on new connections, while a HEARTBEAT is required on connection re-use. It is probably consistent to wait for HEARTBEAT to create a secondary connection in conntrack.

Sriram Yagnaraman committed 3 years ago

Commit 13bd9b31 parent 98ee0074 files · +42 −70Browse files

Showing the changes to include/uapi (2 of 4 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/netfilter/nf_conntrack_sctp.h +0 −1
  2. include/uapi/linux/netfilter/nfnetlink_cttimeout.h +0 −1
include/uapi/linux/netfilter/nf_conntrack_sctp.h+0−1
@@ -16,7 +16,6 @@ enum sctp_conntrack { · 15 unmodified lines
16 SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,16 SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
17 SCTP_CONNTRACK_HEARTBEAT_SENT,17 SCTP_CONNTRACK_HEARTBEAT_SENT,
18 SCTP_CONNTRACK_HEARTBEAT_ACKED,18 SCTP_CONNTRACK_HEARTBEAT_ACKED,
19 SCTP_CONNTRACK_DATA_SENT,
20 SCTP_CONNTRACK_MAX19 SCTP_CONNTRACK_MAX
21};20};
22 21
include/uapi/linux/netfilter/nfnetlink_cttimeout.h+0−1
@@ -95,7 +95,6 @@ enum ctattr_timeout_sctp { · 94 unmodified lines
95 CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,95 CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,
96 CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,96 CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,
97 CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED,97 CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED,
98 CTA_TIMEOUT_SCTP_DATA_SENT,
99 __CTA_TIMEOUT_SCTP_MAX98 __CTA_TIMEOUT_SCTP_MAX
100};99};
101#define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)100#define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)