mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: appctx/cli: remove the env 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 17:45:44 +01:00
parent 3af9d832e8
commit f6710f8811
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/applet.h
View File

@ -165,9 +165,6 @@ struct appctx {
struct { struct {
struct proxy *px; /* current proxy being dumped, NULL = not started yet. */ struct proxy *px; /* current proxy being dumped, NULL = not started yet. */
} be; /* used by "show backends" command */ } be; /* used by "show backends" command */
struct {
char **var;
} env;
/* NOTE: please add regular applet contexts (ie: not /* NOTE: please add regular applet contexts (ie: not
* CLI-specific ones) above, before "cli". * CLI-specific ones) above, before "cli".
*/ */

26
src/cli.c
View File

@ -698,11 +698,13 @@ static void cli_release_handler(struct appctx *appctx)
/* This function dumps all environmnent variables to the buffer. It returns 0 /* This function dumps all environmnent variables to the buffer. It returns 0
* if the output buffer is full and it needs to be called again, otherwise * if the output buffer is full and it needs to be called again, otherwise
* non-zero. Dumps only one entry if st2 == STAT_ST_END. * non-zero. Dumps only one entry if st2 == STAT_ST_END. It uses cli.p0 as the
* pointer to the current variable.
*/ */
static int cli_io_handler_show_env(struct appctx *appctx) static int cli_io_handler_show_env(struct appctx *appctx)
{ {
struct stream_interface *si = appctx->owner; struct stream_interface *si = appctx->owner;
char **var = appctx->ctx.cli.p0;
if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW))) if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
return 1; return 1;
@ -712,8 +714,8 @@ static int cli_io_handler_show_env(struct appctx *appctx)
/* we have two inner loops here, one for the proxy, the other one for /* we have two inner loops here, one for the proxy, the other one for
* the buffer. * the buffer.
*/ */
while (*appctx->ctx.env.var) { while (*var) {
chunk_printf(&trash, "%s\n", *appctx->ctx.env.var); chunk_printf(&trash, "%s\n", *var);
if (bi_putchk(si_ic(si), &trash) == -1) { if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si); si_applet_cant_put(si);
@ -721,7 +723,8 @@ static int cli_io_handler_show_env(struct appctx *appctx)
} }
if (appctx->st2 == STAT_ST_END) if (appctx->st2 == STAT_ST_END)
break; break;
appctx->ctx.env.var++; var++;
appctx->ctx.cli.p0 = var;
} }
/* dump complete */ /* dump complete */
@ -825,32 +828,35 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
/* parse a "show env" CLI request. Returns 0 if it needs to continue, 1 if it /* parse a "show env" CLI request. Returns 0 if it needs to continue, 1 if it
* wants to stop here. * wants to stop here. It puts the variable to be dumped into cli.p0 if a single
* variable is requested otherwise puts environ there.
*/ */
static int cli_parse_show_env(char **args, struct appctx *appctx, void *private) static int cli_parse_show_env(char **args, struct appctx *appctx, void *private)
{ {
extern char **environ; extern char **environ;
char **var;
if (!cli_has_level(appctx, ACCESS_LVL_OPER)) if (!cli_has_level(appctx, ACCESS_LVL_OPER))
return 1; return 1;
appctx->ctx.env.var = environ; var = environ;
if (*args[2]) { if (*args[2]) {
int len = strlen(args[2]); int len = strlen(args[2]);
for (; *appctx->ctx.env.var; appctx->ctx.env.var++) { for (; *var; var++) {
if (strncmp(*appctx->ctx.env.var, args[2], len) == 0 && if (strncmp(*var, args[2], len) == 0 &&
(*appctx->ctx.env.var)[len] == '=') (*var)[len] == '=')
break; break;
} }
if (!*appctx->ctx.env.var) { if (!*var) {
appctx->ctx.cli.msg = "Variable not found\n"; appctx->ctx.cli.msg = "Variable not found\n";
appctx->st0 = CLI_ST_PRINT; appctx->st0 = CLI_ST_PRINT;
return 1; return 1;
} }
appctx->st2 = STAT_ST_END; appctx->st2 = STAT_ST_END;
} }
appctx->ctx.cli.p0 = var;
return 0; return 0;
} }