RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: appctx/cli: remove the "dns" entry from the appctx union

Browse Source 
This one now migrates to the general purpose cli.p0.
This commit is contained in:
Willy Tarreau 2016-12-16 18:06:26 +01:00
parent 608ea5921a
commit 777b560d04
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/applet.h
View File

@ -154,9 +154,6 @@ struct appctx {
struct task *task;
struct hlua_function *fcn;
} hlua_cli;
struct {
struct dns_resolvers *ptr;
} resolvers;
struct {
int iid; /* if >= 0, ID of the proxy to filter on */
struct proxy *px; /* current proxy being dumped, NULL = not started yet. */

15
src/dns.c
View File

@ -1268,19 +1268,19 @@ struct task *dns_process_resolve(struct task *t)
return t;
}
/* if an arg is found, it sets the resolvers section pointer into cli.p0 */
static int cli_parse_stat_resolvers(char **args, struct appctx *appctx, void *private)
{
struct dns_resolvers *presolvers;
if (*args[3]) {
appctx->ctx.resolvers.ptr = NULL;
list_for_each_entry(presolvers, &dns_resolvers, list) {
if (strcmp(presolvers->id, args[3]) == 0) {
appctx->ctx.resolvers.ptr = presolvers;
appctx->ctx.cli.p0 = presolvers;
break;
}
}
if (appctx->ctx.resolvers.ptr == NULL) {
if (appctx->ctx.cli.p0 == NULL) {
appctx->ctx.cli.msg = "Can't find that resolvers section\n";
appctx->st0 = CLI_ST_PRINT;
return 1;
@ -1289,9 +1289,10 @@ static int cli_parse_stat_resolvers(char **args, struct appctx *appctx, void *pr
return 0;
}
/* This function dumps counters from all resolvers section and associated name servers.
* It returns 0 if the output buffer is full and it needs
* to be called again, otherwise non-zero.
/* This function dumps counters from all resolvers section and associated name
* servers. It returns 0 if the output buffer is full and it needs to be called
* again, otherwise non-zero. It may limit itself to the resolver pointed to by
* <cli.p0> if it's not null.
*/
static int cli_io_handler_dump_resolvers_to_buffer(struct appctx *appctx)
{
@ -1312,7 +1313,7 @@ static int cli_io_handler_dump_resolvers_to_buffer(struct appctx *appctx)
}
else {
list_for_each_entry(presolvers, &dns_resolvers, list) {
if (appctx->ctx.resolvers.ptr != NULL && appctx->ctx.resolvers.ptr != presolvers)
if (appctx->ctx.cli.p0 != NULL && appctx->ctx.cli.p0 != presolvers)
continue;
chunk_appendf(&trash, "Resolvers section %s\n", presolvers->id);