From: Willy Tarreau <w@1wt.eu>
Date: Tue, 5 Nov 2024 17:05:58 +0000 (+0100)
Subject: CLEANUP: connection: properly name the CO_ER_SSL_FATAL enum entry
X-Git-Tag: v3.1-dev12~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=393957908bf492ff6660fba239106f0da7988fe8;p=thirdparty%2Fhaproxy.git

CLEANUP: connection: properly name the CO_ER_SSL_FATAL enum entry

It was the only one prefixed with "CO_ERR_", making it harder to batch
process and to look up. It was added in 2.5 by commit 61944f7a73 ("MINOR:
ssl: Set connection error code in case of SSL read or write fatal failure")
so it can be backported as far as 2.6 if needed to help integrate other
patches.
---

diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index 228f2078c4..ad454a320e 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -238,7 +238,7 @@ enum {
 	CO_ER_SOCKS4_DENY,       /* SOCKS4 Proxy deny the request */
 	CO_ER_SOCKS4_ABORT,      /* SOCKS4 Proxy handshake aborted by server */
 
-	CO_ERR_SSL_FATAL,        /* SSL fatal error during a SSL_read or SSL_write */
+	CO_ER_SSL_FATAL,         /* SSL fatal error during a SSL_read or SSL_write */
 
 	CO_ER_REVERSE,           /* Error during reverse connect */
 };
diff --git a/src/connection.c b/src/connection.c
index 1b644b0be5..59baec65b6 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -741,7 +741,7 @@ const char *conn_err_code_str(struct connection *c)
 	case CO_ER_SOCKS4_DENY:    return "SOCKS4 Proxy deny the request";
 	case CO_ER_SOCKS4_ABORT:   return "SOCKS4 Proxy handshake aborted by server";
 
-	case CO_ERR_SSL_FATAL:     return "SSL fatal error";
+	case CO_ER_SSL_FATAL:      return "SSL fatal error";
 
 	case CO_ER_REVERSE:        return "Reverse connect failure";
 	}
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 54550f00de..7ec5bf15dd 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5852,7 +5852,7 @@ static size_t ssl_sock_to_buf(struct connection *conn, void *xprt_ctx, struct bu
 				struct ssl_sock_ctx *ctx = conn_get_ssl_sock_ctx(conn);
 				if (ctx && !ctx->error_code)
 					ctx->error_code = ERR_peek_error();
-				conn->err_code = CO_ERR_SSL_FATAL;
+				conn->err_code = CO_ER_SSL_FATAL;
 			}
 			/* For SSL_ERROR_SYSCALL, make sure to clear the error
 			 * stack before shutting down the connection for
@@ -6028,7 +6028,7 @@ static size_t ssl_sock_from_buf(struct connection *conn, void *xprt_ctx, const s
 
 				if (ctx && !ctx->error_code)
 					ctx->error_code = ERR_peek_error();
-				conn->err_code = CO_ERR_SSL_FATAL;
+				conn->err_code = CO_ER_SSL_FATAL;
 			}
 			goto out_error;
 		}