RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-08 10:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: dns: Refactor dns appctx creation

Browse Source 
A .init callback function is defined for the dns_session_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:24:46 +02:00
parent d0c4ec04b8
commit 9223851a80
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/dns.c
View File

@ -815,6 +815,41 @@ void dns_session_free(struct dns_session *ds)
static struct appctx *dns_session_create(struct dns_session *ds); static struct appctx *dns_session_create(struct dns_session *ds);
static int dns_session_init(struct appctx *appctx)
{
struct dns_session *ds = appctx->svcctx;
struct stream *s;
struct sockaddr_storage *addr = NULL;
if (!sockaddr_alloc(&addr, &ds->dss->srv->addr, sizeof(ds->dss->srv->addr)))
goto error;
if (appctx_finalize_startup(appctx, ds->dss->srv->proxy, &BUF_NULL) == -1)
goto error;
s = appctx_strm(appctx);
s->csb->dst = addr;
s->csb->flags |= CS_FL_NOLINGER;
s->target = &ds->dss->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;
ds->appctx = appctx;
return 0;
error:
return -1;
}
/* /*
* Function to release a DNS tcp session * Function to release a DNS tcp session
*/ */
@ -908,6 +943,7 @@ static struct applet dns_session_applet = {
.obj_type = OBJ_TYPE_APPLET, .obj_type = OBJ_TYPE_APPLET,
.name = "<STRMDNS>", /* used for logging */ .name = "<STRMDNS>", /* used for logging */
.fct = dns_session_io_handler, .fct = dns_session_io_handler,
.init = dns_session_init,
.release = dns_session_release, .release = dns_session_release,
}; };
@ -918,56 +954,22 @@ static struct applet dns_session_applet = {
static struct appctx *dns_session_create(struct dns_session *ds) static struct appctx *dns_session_create(struct dns_session *ds)
{ {
struct appctx *appctx; struct appctx *appctx;
struct session *sess;
struct conn_stream *cs;
struct stream *s;
struct applet *applet = &dns_session_applet;
struct sockaddr_storage *addr = NULL;
appctx = appctx_new(applet, NULL); appctx = appctx_new(&dns_session_applet, NULL);
if (!appctx) if (!appctx)
goto out_close; goto out_close;
appctx->svcctx = (void *)ds; appctx->svcctx = (void *)ds;
sess = session_new(ds->dss->srv->proxy, NULL, &appctx->obj_type); if (appctx_init(appctx) == -1) {
if (!sess) {
ha_alert("out of memory in dns_session_create().\n"); ha_alert("out of memory in dns_session_create().\n");
goto out_free_appctx; goto out_free_appctx;
} }
appctx->sess = sess;
if (!sockaddr_alloc(&addr, &ds->dss->srv->addr, sizeof(ds->dss->srv->addr)))
goto out_free_appctx;
cs = cs_new_from_endp(appctx->endp, sess, &BUF_NULL);
if (!cs) {
ha_alert("Failed to initialize stream in dns_session_create().\n");
goto out_free_addr;
}
s = DISGUISE(cs_strm(cs));
s->csb->dst = addr;
s->csb->flags |= CS_FL_NOLINGER;
s->target = &ds->dss->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;
ds->appctx = appctx;
return appctx; return appctx;
/* Error unrolling */ /* Error unrolling */
out_free_addr:
sockaddr_free(&addr);
out_free_appctx: out_free_appctx:
appctx_free(appctx); appctx_free_on_early_error(appctx);
out_close: out_close:
return NULL; return NULL;
} }