From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 12 Apr 2022 16:04:10 +0000 (+0200)
Subject: CLEANUP: muxes: Remove MX_FL_CLEAN_ABRT flag
X-Git-Tag: v2.6-dev6~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a97ccedf6f36c01660a8f4aaff33a9761e52ebf3;p=thirdparty%2Fhaproxy.git

CLEANUP: muxes: Remove MX_FL_CLEAN_ABRT flag

This flag is unused. Thus, it may be removed. No reason to still set it. It
also cleans up "haproxy -vv" output.
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 1953a2bb0e..361f9ee79f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -14102,15 +14102,14 @@ proto <name>
   in haproxy -vv. The protocols properties are reported : the mode (TCP/HTTP),
   the side (FE/BE), the mux name and its flags.
 
-  Some protocols report errors on aborts (flag=CLEAN_ABRT). Some others are
-  subject to the head-of-line blocking on server side (flag=HOL_RISK). Finally
-  some protocols don't support upgrades (flag=NO_UPG). The HTX compatibility is
-  also reported (flag=HTX).
+  Some protocols are subject to the head-of-line blocking on server side
+  (flag=HOL_RISK). Finally some protocols don't support upgrades (flag=NO_UPG).
+  The HTX compatibility is also reported (flag=HTX).
 
   Here are the protocols that may be used as argument to a "proto" directive on
   a bind line :
 
-    h2   : mode=HTTP  side=FE|BE  mux=H2    flags=HTX|CLEAN_ABRT|HOL_RISK|NO_UPG
+    h2   : mode=HTTP  side=FE|BE  mux=H2    flags=HTX|HOL_RISK|NO_UPG
     h1   : mode=HTTP  side=FE|BE  mux=H1    flags=HTX|NO_UPG
     none : mode=TCP   side=FE|BE  mux=PASS  flags=NO_UPG
 
@@ -14526,15 +14525,14 @@ check-proto <name>
   protocols is reported in haproxy -vv. The protocols properties are
   reported : the mode (TCP/HTTP), the side (FE/BE), the mux name and its flags.
 
-  Some protocols report errors on aborts (flag=CLEAN_ABRT). Some others are
-  subject to the head-of-line blocking on server side (flag=HOL_RISK). Finally
-  some protocols don't support upgrades (flag=NO_UPG). The HTX compatibility is
-  also reported (flag=HTX).
+  Some protocols are subject to the head-of-line blocking on server side
+  (flag=HOL_RISK). Finally some protocols don't support upgrades (flag=NO_UPG).
+  The HTX compatibility is also reported (flag=HTX).
 
   Here are the protocols that may be used as argument to a "check-proto"
   directive on a server line:
 
-    h2   : mode=HTTP  side=FE|BE  mux=H2    flags=HTX|CLEAN_ABRT|HOL_RISK|NO_UPG
+    h2   : mode=HTTP  side=FE|BE  mux=H2    flags=HTX|HOL_RISK|NO_UPG
     fcgi : mode=HTTP  side=BE     mux=FCGI  flags=HTX|HOL_RISK|NO_UPG
     h1   : mode=HTTP  side=FE|BE  mux=H1    flags=HTX|NO_UPG
     none : mode=TCP   side=FE|BE  mux=PASS  flags=NO_UPG
@@ -15038,15 +15036,14 @@ proto <name>
   reported in haproxy -vv.The protocols properties are reported : the mode
   (TCP/HTTP), the side (FE/BE), the mux name and its flags.
 
-  Some protocols report errors on aborts (flag=CLEAN_ABRT). Some others are
-  subject to the head-of-line blocking on server side (flag=HOL_RISK). Finally
-  some protocols don't support upgrades (flag=NO_UPG). The HTX compatibility is
-  also reported (flag=HTX).
+  Some protocols are subject to the head-of-line blocking on server side
+  (flag=HOL_RISK). Finally some protocols don't support upgrades (flag=NO_UPG).
+  The HTX compatibility is also reported (flag=HTX).
 
   Here are the protocols that may be used as argument to a "proto" directive on
   a server line :
 
-    h2   : mode=HTTP  side=FE|BE  mux=H2    flags=HTX|CLEAN_ABRT|HOL_RISK|NO_UPG
+    h2   : mode=HTTP  side=FE|BE  mux=H2    flags=HTX|HOL_RISK|NO_UPG
     fcgi : mode=HTTP  side=BE     mux=FCGI  flags=HTX|HOL_RISK|NO_UPG
     h1   : mode=HTTP  side=FE|BE  mux=H1    flags=HTX|NO_UPG
     none : mode=TCP   side=FE|BE  mux=PASS  flags=NO_UPG
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index 773610803d..22160f3f30 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -276,10 +276,9 @@ enum {
 /* MUX-specific flags */
 enum {
 	MX_FL_NONE        = 0x00000000,
-	MX_FL_CLEAN_ABRT  = 0x00000001, /* abort is clearly reported as an error */
-	MX_FL_HTX         = 0x00000002, /* set if it is an HTX multiplexer */
-	MX_FL_HOL_RISK    = 0x00000004, /* set if the protocol is subject the to head-of-line blocking on server */
-	MX_FL_NO_UPG      = 0x00000008, /* set if mux does not support any upgrade */
+	MX_FL_HTX         = 0x00000001, /* set if it is an HTX multiplexer */
+	MX_FL_HOL_RISK    = 0x00000002, /* set if the protocol is subject the to head-of-line blocking on server */
+	MX_FL_NO_UPG      = 0x00000004, /* set if mux does not support any upgrade */
 };
 
 /* PROTO token registration */
diff --git a/src/connection.c b/src/connection.c
index dbfc0ea3bf..88e851c932 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1716,9 +1716,6 @@ void list_mux_proto(FILE *out)
 		if (item->mux->flags & MX_FL_HTX)
 			done |= fprintf(out, "%sHTX", done ? "|" : "");
 
-		if (item->mux->flags & MX_FL_CLEAN_ABRT)
-			done |= fprintf(out, "%sCLEAN_ABRT", done ? "|" : "");
-
 		if (item->mux->flags & MX_FL_HOL_RISK)
 			done |= fprintf(out, "%sHOL_RISK", done ? "|" : "");
 
diff --git a/src/mux_h2.c b/src/mux_h2.c
index e42cd8928b..71327b86b3 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -6911,7 +6911,7 @@ static const struct mux_ops h2_ops = {
 	.ctl = h2_ctl,
 	.show_fd = h2_show_fd,
 	.takeover = h2_takeover,
-	.flags = MX_FL_CLEAN_ABRT|MX_FL_HTX|MX_FL_HOL_RISK|MX_FL_NO_UPG,
+	.flags = MX_FL_HTX|MX_FL_HOL_RISK|MX_FL_NO_UPG,
 	.name = "H2",
 };
 
diff --git a/src/mux_quic.c b/src/mux_quic.c
index e207b3aef1..2051bff105 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -1361,7 +1361,7 @@ static const struct mux_ops qc_ops = {
 	.subscribe = qc_subscribe,
 	.unsubscribe = qc_unsubscribe,
 	.wake = qc_wake,
-	.flags = MX_FL_CLEAN_ABRT|MX_FL_HTX|MX_FL_NO_UPG,
+	.flags = MX_FL_HTX|MX_FL_NO_UPG,
 	.name = "QUIC",
 };