From 996b0ee9278f14e4b8a08d11a4720cddcb9a1a39 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Mon, 10 Jun 2024 12:48:05 +0900 Subject: [PATCH] gh-692 Do not consider SCTP abort as a shutdown complete marker and let garbage collector handle it --- common/llb_dpapi.h | 2 +- kernel/llb_kern_ct.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/llb_dpapi.h b/common/llb_dpapi.h index ccd2b4b..8f983d0 100644 --- a/common/llb_dpapi.h +++ b/common/llb_dpapi.h @@ -73,7 +73,7 @@ /* Hard-timeouts for ct xxx entry */ #define CT_TCP_FN_CPTO (10000000000) -#define CT_SCTP_FN_CPTO (20000000000) +#define CT_SCTP_FN_CPTO (10000000000) #define CT_UDP_FN_CPTO (10000000000) #define CT_UDP_EST_CPTO (20000000000) #define CT_ICMP_EST_CPTO (20000000000) diff --git a/kernel/llb_kern_ct.c b/kernel/llb_kern_ct.c index 19fc13d..8739f73 100644 --- a/kernel/llb_kern_ct.c +++ b/kernel/llb_kern_ct.c @@ -810,7 +810,7 @@ dp_ct_sctp_sm(void *ctx, struct xfi *xf, nstate = CT_SCTP_SHUT; goto end; case SCTP_ABORT: - nstate = CT_SCTP_SHUTC; + nstate = CT_SCTP_ABRT; goto end; } @@ -1277,7 +1277,7 @@ dp_ct_sctp_sm(void *ctx, struct xfi *xf, #endif break; case CT_SCTP_ABRT: - nstate = CT_SCTP_SHUTC; + nstate = CT_SCTP_ABRT; break; case CT_SCTP_SHUT: if (c->type != SCTP_SHUT_ACK && dir != CT_DIR_OUT) {