From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 27 Sep 2023 15:17:48 +0000 (+0200)
Subject: MINOR: hlua: Set context's appctx when the lua socket is created
X-Git-Tag: v2.9-dev7~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed9333827a6bf3c20e010485da12724992d2de51;p=thirdparty%2Fhaproxy.git

MINOR: hlua: Set context's appctx when the lua socket is created

The lua socket's context referenced the owning appctx. It was set when the
appctx was initialized. It is now performed when the appctx is created. It
is a small change but this will be required to fix several issues with the
lua sockets.
---

diff --git a/src/hlua.c b/src/hlua.c
index de32c524e3..9e448b8164 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2327,7 +2327,6 @@ static void hlua_socket_handler(struct appctx *appctx)
 
 static int hlua_socket_init(struct appctx *appctx)
 {
-	struct hlua_csk_ctx *ctx = appctx->svcctx;
 	struct stream *s;
 
 	if (appctx_finalize_startup(appctx, socket_proxy, &BUF_NULL) == -1)
@@ -2345,7 +2344,6 @@ static int hlua_socket_init(struct appctx *appctx)
 	s->flags |= SF_DIRECT | SF_ASSIGNED | SF_BE_ASSIGNED;
 	s->target = &socket_tcp->obj_type;
 
-	ctx->appctx = appctx;
 	return 0;
 
   error:
@@ -3337,6 +3335,7 @@ __LJMP static int hlua_socket_new(lua_State *L)
 	ctx = applet_reserve_svcctx(appctx, sizeof(*ctx));
 	ctx->connected = 0;
 	ctx->die = 0;
+	ctx->appctx = appctx;
 	LIST_INIT(&ctx->wake_on_write);
 	LIST_INIT(&ctx->wake_on_read);