mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 17:17:06 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: resolvers/cli: remove the unneeded appctx->st2 from "show resolvers"

Browse Source 
The command uses this state but _INIT immediately turns to _LIST, which
turns to _FIN at the end without doing anything in that state, thus the
only existing state is _LIST so we don't need to store a state. Let's
just get rid of it.
This commit is contained in:
Willy Tarreau 2022-05-05 16:38:13 +02:00
parent db933d6fdd
commit 12d5228a44
1 changed files with 56 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/resolvers.c
View File

@ -2766,73 +2766,63 @@ static int cli_io_handler_dump_resolvers_to_buffer(struct appctx *appctx)
chunk_reset(&trash); chunk_reset(&trash);
switch (appctx->st2) { if (LIST_ISEMPTY(&sec_resolvers)) {
case STAT_ST_INIT: if (ci_putstr(cs_ic(cs), "No resolvers found\n") == -1)
appctx->st2 = STAT_ST_LIST; /* let's start producing data */ goto full;
/* fall through */
case STAT_ST_LIST:
if (LIST_ISEMPTY(&sec_resolvers)) {
if (ci_putstr(cs_ic(cs), "No resolvers found\n") == -1)
goto full;
}
else {
if (!resolvers)
resolvers = LIST_ELEM(sec_resolvers.n, typeof(resolvers), list);
list_for_each_entry_from(resolvers, &sec_resolvers, list) {
if (ctx->forced_section != NULL && ctx->forced_section != resolvers)
continue;
ctx->resolvers = resolvers;
ns = ctx->ns;
if (!ns) {
chunk_printf(&trash, "Resolvers section %s\n", resolvers->id);
if (ci_putchk(cs_ic(cs), &trash) == -1)
goto full;
ns = LIST_ELEM(resolvers->nameservers.n, typeof(ns), list);
ctx->ns = ns;
}
list_for_each_entry_from(ns, &resolvers->nameservers, list) {
chunk_reset(&trash);
chunk_appendf(&trash, " nameserver %s:\n", ns->id);
chunk_appendf(&trash, " sent: %lld\n", ns->counters->sent);
chunk_appendf(&trash, " snd_error: %lld\n", ns->counters->snd_error);
chunk_appendf(&trash, " valid: %lld\n", ns->counters->app.resolver.valid);
chunk_appendf(&trash, " update: %lld\n", ns->counters->app.resolver.update);
chunk_appendf(&trash, " cname: %lld\n", ns->counters->app.resolver.cname);
chunk_appendf(&trash, " cname_error: %lld\n", ns->counters->app.resolver.cname_error);
chunk_appendf(&trash, " any_err: %lld\n", ns->counters->app.resolver.any_err);
chunk_appendf(&trash, " nx: %lld\n", ns->counters->app.resolver.nx);
chunk_appendf(&trash, " timeout: %lld\n", ns->counters->app.resolver.timeout);
chunk_appendf(&trash, " refused: %lld\n", ns->counters->app.resolver.refused);
chunk_appendf(&trash, " other: %lld\n", ns->counters->app.resolver.other);
chunk_appendf(&trash, " invalid: %lld\n", ns->counters->app.resolver.invalid);
chunk_appendf(&trash, " too_big: %lld\n", ns->counters->app.resolver.too_big);
chunk_appendf(&trash, " truncated: %lld\n", ns->counters->app.resolver.truncated);
chunk_appendf(&trash, " outdated: %lld\n", ns->counters->app.resolver.outdated);
if (ci_putchk(cs_ic(cs), &trash) == -1)
goto full;
ctx->ns = ns;
}
ctx->ns = NULL;
/* was this the only section to dump ? */
if (ctx->forced_section)
break;
}
}
/* fall through */
default:
appctx->st2 = STAT_ST_FIN;
return 1;
} }
else {
if (!resolvers)
resolvers = LIST_ELEM(sec_resolvers.n, typeof(resolvers), list);
list_for_each_entry_from(resolvers, &sec_resolvers, list) {
if (ctx->forced_section != NULL && ctx->forced_section != resolvers)
continue;
ctx->resolvers = resolvers;
ns = ctx->ns;
if (!ns) {
chunk_printf(&trash, "Resolvers section %s\n", resolvers->id);
if (ci_putchk(cs_ic(cs), &trash) == -1)
goto full;
ns = LIST_ELEM(resolvers->nameservers.n, typeof(ns), list);
ctx->ns = ns;
}
list_for_each_entry_from(ns, &resolvers->nameservers, list) {
chunk_reset(&trash);
chunk_appendf(&trash, " nameserver %s:\n", ns->id);
chunk_appendf(&trash, " sent: %lld\n", ns->counters->sent);
chunk_appendf(&trash, " snd_error: %lld\n", ns->counters->snd_error);
chunk_appendf(&trash, " valid: %lld\n", ns->counters->app.resolver.valid);
chunk_appendf(&trash, " update: %lld\n", ns->counters->app.resolver.update);
chunk_appendf(&trash, " cname: %lld\n", ns->counters->app.resolver.cname);
chunk_appendf(&trash, " cname_error: %lld\n", ns->counters->app.resolver.cname_error);
chunk_appendf(&trash, " any_err: %lld\n", ns->counters->app.resolver.any_err);
chunk_appendf(&trash, " nx: %lld\n", ns->counters->app.resolver.nx);
chunk_appendf(&trash, " timeout: %lld\n", ns->counters->app.resolver.timeout);
chunk_appendf(&trash, " refused: %lld\n", ns->counters->app.resolver.refused);
chunk_appendf(&trash, " other: %lld\n", ns->counters->app.resolver.other);
chunk_appendf(&trash, " invalid: %lld\n", ns->counters->app.resolver.invalid);
chunk_appendf(&trash, " too_big: %lld\n", ns->counters->app.resolver.too_big);
chunk_appendf(&trash, " truncated: %lld\n", ns->counters->app.resolver.truncated);
chunk_appendf(&trash, " outdated: %lld\n", ns->counters->app.resolver.outdated);
if (ci_putchk(cs_ic(cs), &trash) == -1)
goto full;
ctx->ns = ns;
}
ctx->ns = NULL;
/* was this the only section to dump ? */
if (ctx->forced_section)
break;
}
}
/* done! */
return 1;
full: full:
/* the output buffer is full, retry later */ /* the output buffer is full, retry later */
cs_rx_room_blk(cs); cs_rx_room_blk(cs);