mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: applet: Prepare appctx to own the session on frontend side

Browse Source 
Applets were moved at the same level than multiplexers. Thus, gradually,
applets code is changed to be less dependent from the stream. With this
commit, the frontend appctx are ready to own the session. It means a
frontend appctx will be responsible to release the session.
This commit is contained in:
Christopher Faulet 2022-05-09 08:08:26 +02:00
parent ef5e1bb4cf
commit ac57bb527a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/applet-t.h
View File

@ -39,6 +39,7 @@ struct appctx;
struct proxy;
struct conn_stream;
struct cs_endpoint;
struct session;
/* Applet descriptor */
struct applet {
@ -61,6 +62,7 @@ struct appctx {
unsigned int st1; /* prompt/payload (bitwise OR of APPCTX_CLI_ST1_*) for stats, session error for peers */
struct buffer *chunk; /* used to store unfinished commands */
struct applet *applet; /* applet this context refers to */
struct session *sess; /* session for frontend applets (NULL for backend applets) */
struct cs_endpoint *endp;
struct act_rule *rule; /* rule associated with the applet. */
int (*io_handler)(struct appctx *appctx); /* used within the cli_io_handler when st0 = CLI_ST_CALLBACK */

4
include/haproxy/applet.h
View File

@ -29,6 +29,7 @@
#include <haproxy/conn_stream.h>
#include <haproxy/list.h>
#include <haproxy/pool.h>
#include <haproxy/session.h>
#include <haproxy/task.h>
extern unsigned int nb_applets;
@ -47,7 +48,8 @@ static inline void __appctx_free(struct appctx *appctx)
task_destroy(appctx->t);
if (LIST_INLIST(&appctx->buffer_wait.list))
LIST_DEL_INIT(&appctx->buffer_wait.list);
if (appctx->sess)
session_free(appctx->sess);
BUG_ON(appctx->endp && !(appctx->endp->flags & CS_EP_ORPHAN));
cs_endpoint_free(appctx->endp);
pool_free(pool_head_appctx, appctx);

2
src/applet.c
View File

@ -42,7 +42,7 @@ struct appctx *appctx_new(struct applet *applet, struct cs_endpoint *endp)
LIST_INIT(&appctx->wait_entry);
appctx->obj_type = OBJ_TYPE_APPCTX;
appctx->applet = applet;
appctx->sess = NULL;
if (!endp) {
endp = cs_endpoint_new();
if (!endp)