mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-19 00:51:37 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: conn-stream: Rename cs_applet_release()

Browse Source 
This function does not release the applet but only call the applet release
callback. It is equivalent to cs_conn_shut() but for applets. Thus the
function is renamed cs_applet_shut().
This commit is contained in:
Christopher Faulet 2022-04-21 08:44:09 +02:00
parent ff022a2b8c
commit ca6c9bba82
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/conn_stream.h
View File

@ -52,7 +52,7 @@ void cs_detach_endp(struct conn_stream *cs);
void cs_detach_app(struct conn_stream *cs);
struct appctx *cs_applet_create(struct conn_stream *cs, struct applet *app);
void cs_applet_release(struct conn_stream *cs);
void cs_applet_shut(struct conn_stream *cs);
/* Returns the endpoint target without any control */
static inline void *__cs_endp_target(const struct conn_stream *cs)

8
src/conn_stream.c
View File

@ -375,7 +375,7 @@ void cs_detach_endp(struct conn_stream *cs)
struct appctx *appctx = __cs_appctx(cs);
cs->endp->flags |= CS_EP_ORPHAN;
cs_applet_release(cs);
cs_applet_shut(cs);
appctx_free(appctx);
cs->endp = NULL;
}
@ -472,7 +472,7 @@ struct appctx *cs_applet_create(struct conn_stream *cs, struct applet *app)
}
/* call the applet's release function if any. Needs to be called upon close() */
void cs_applet_release(struct conn_stream *cs)
void cs_applet_shut(struct conn_stream *cs)
{
struct appctx *appctx = __cs_appctx(cs);
@ -874,7 +874,7 @@ static void cs_app_shutr_applet(struct conn_stream *cs)
return;
if (cs_oc(cs)->flags & CF_SHUTW) {
cs_applet_release(cs);
cs_applet_shut(cs);
cs->state = CS_ST_DIS;
__cs_strm(cs)->conn_exp = TICK_ETERNITY;
}
@ -932,7 +932,7 @@ static void cs_app_shutw_applet(struct conn_stream *cs)
case CS_ST_QUE:
case CS_ST_TAR:
/* Note that none of these states may happen with applets */
cs_applet_release(cs);
cs_applet_shut(cs);
cs->state = CS_ST_DIS;
/* fall through */
default: