From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 9 Jul 2024 17:22:02 +0000 (+0200)
Subject: MINOR: spoe: Remove the spop version from the SPOE appctx context
X-Git-Tag: v3.1-dev4~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7890d6b28d7a2b97fc82e03a3e93881685c2c1cb;p=thirdparty%2Fhaproxy.git

MINOR: spoe: Remove the spop version from the SPOE appctx context

The SPOE applet no longer manipulate the SPOP verison. So it can be safely
removed from its context.

The related issue is #2502.
---

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index fcceee230d..d6f4c4e3c3 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -206,7 +206,6 @@ struct spoe_context {
 struct spoe_appctx {
 	struct appctx      *owner;          /* the owner */
 	struct spoe_agent  *agent;          /* agent on which the applet is attached */
-	unsigned int        version;        /* the negotiated version */
 	unsigned int        flags;          /* SPOE_APPCTX_FL_* */
 	unsigned int        status_code;    /* SPOE_FRM_ERR_* */
 	struct spoe_context *spoe_ctx;      /* The SPOE context to handle */
@@ -569,7 +568,6 @@ static struct appctx *spoe_create_appctx(struct spoe_context *ctx)
 		goto out_error;
 
 	spoe_appctx->agent           = agent;
-	spoe_appctx->version         = 0;
 	spoe_appctx->flags           = 0;
 	spoe_appctx->status_code     = SPOP_ERR_NONE;
 	spoe_appctx->spoe_ctx        = ctx;
diff --git a/src/mux_spop.c b/src/mux_spop.c
index 1ec77b93f8..b8d3fcb976 100644
--- a/src/mux_spop.c
+++ b/src/mux_spop.c
@@ -1724,7 +1724,6 @@ static int spop_conn_handle_hello(struct spop_conn *spop_conn)
 	/* 		flags &= ~SPOE_APPCTX_FL_PIPELINING; */
 	/* } */
 
-	/* SPOE_APPCTX(appctx)->version        = (unsigned int)vsn; */
 	/* SPOE_APPCTX(appctx)->flags         |= flags; */
 	spop_conn->max_frame_size = (unsigned int)max_frame_size;