konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: sink: Refactor sink forwarder appctx creation

Browse Source 
A .init callback function is defined for the sink_forward_applet applet.
This function finishes the appctx startup by calling
appctx_finalize_startup() and its handles the stream customization.
This commit is contained in:
Christopher Faulet 2022-05-12 15:34:48 +02:00
parent 2ae25ea24b
commit aee57fc277
1 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/sink.c
View File

@ -594,6 +594,43 @@ void __sink_forward_session_deinit(struct sink_forward_target *sft)
task_wakeup(sink->forward_task, TASK_WOKEN_MSG);
}
static int sink_forward_session_init(struct appctx *appctx)
{
struct sink_forward_target *sft = appctx->svcctx;
struct stream *s;
struct sockaddr_storage *addr = NULL;
if (!sockaddr_alloc(&addr, &sft->srv->addr, sizeof(sft->srv->addr)))
goto out_error;
if (appctx_finalize_startup(appctx, sft->sink->forward_px, &BUF_NULL) == -1)
goto out_free_addr;
s = appctx_strm(appctx);
s->csb->dst = addr;
s->csb->flags |= CS_FL_NOLINGER;
s->target = &sft->srv->obj_type;
s->flags = SF_ASSIGNED;
s->do_log = NULL;
s->uniq_id = 0;
s->res.flags |= CF_READ_DONTWAIT;
/* for rto and rex to eternity to not expire on idle recv:
* We are using a syslog server.
*/
s->res.rto = TICK_ETERNITY;
s->res.rex = TICK_ETERNITY;
sft->appctx = appctx;
return 0;
out_free_addr:
sockaddr_free(&addr);
out_error:
return -1;
}
static void sink_forward_session_release(struct appctx *appctx)
{
@ -612,6 +649,7 @@ static struct applet sink_forward_applet = {
.obj_type = OBJ_TYPE_APPLET,
.name = "<SINKFWD>", /* used for logging */
.fct = sink_forward_io_handler,
.init = sink_forward_session_init,
.release = sink_forward_session_release,
};
@ -619,6 +657,7 @@ static struct applet sink_forward_oc_applet = {
.obj_type = OBJ_TYPE_APPLET,
.name = "<SINKFWDOC>", /* used for logging */
.fct = sink_forward_oc_io_handler,
.init = sink_forward_session_init,
.release = sink_forward_session_release,
};
@ -628,13 +667,8 @@ static struct applet sink_forward_oc_applet = {
*/
static struct appctx *sink_forward_session_create(struct sink *sink, struct sink_forward_target *sft)
{
struct proxy *p = sink->forward_px;
struct appctx *appctx;
struct session *sess;
struct conn_stream *cs;
struct stream *s;
struct applet *applet = &sink_forward_applet;
struct sockaddr_storage *addr = NULL;
if (sft->srv->log_proto == SRV_LOG_PROTO_OCTET_COUNTING)
applet = &sink_forward_oc_applet;
@ -642,49 +676,16 @@ static struct appctx *sink_forward_session_create(struct sink *sink, struct sink
appctx = appctx_new(applet, NULL);
if (!appctx)
goto out_close;
appctx->svcctx = (void *)sft;
sess = session_new(p, NULL, &appctx->obj_type);
if (!sess) {
ha_alert("out of memory in sink_forward_session_create().\n");
goto out_free_appctx;
}
appctx->sess = sess;
if (!sockaddr_alloc(&addr, &sft->srv->addr, sizeof(sft->srv->addr)))
if (appctx_init(appctx) == -1)
goto out_free_appctx;
cs = cs_new_from_endp(appctx->endp, sess, &BUF_NULL);
if (!cs) {
ha_alert("Failed to initialize stream in sink_forward_session_create().\n");
goto out_free_appctx;
}
s = DISGUISE(cs_strm(cs));
s->csb->dst = addr;
s->csb->flags |= CS_FL_NOLINGER;
s->target = &sft->srv->obj_type;
s->flags = SF_ASSIGNED;
s->do_log = NULL;
s->uniq_id = 0;
s->res.flags |= CF_READ_DONTWAIT;
/* for rto and rex to eternity to not expire on idle recv:
* We are using a syslog server.
*/
s->res.rto = TICK_ETERNITY;
s->res.rex = TICK_ETERNITY;
sft->appctx = appctx;
return appctx;
/* Error unrolling */
out_free_addr:
sockaddr_free(&addr);
out_free_appctx:
appctx_free(appctx);
appctx_free_on_early_error(appctx);
out_close:
return NULL;
}