RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-17 20:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: appctx/cli: remove the cli_socket 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 12:58:09 +01:00
parent a2d5872297
commit 3af9d832e8
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/applet.h
View File

@ -168,7 +168,6 @@ struct appctx {
struct { struct {
char **var; char **var;
} env; } env;
struct list *cli_socket; /* pointer to the latest dumped CLI socket in the list */
/* 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".
*/ */

15
src/cli.c
View File

@ -729,7 +729,8 @@ static int cli_io_handler_show_env(struct appctx *appctx)
} }
/* /*
* CLI IO handler for `show cli sockets` * CLI IO handler for `show cli sockets`.
* Uses ctx.cli.p0 to store the restart pointer.
*/ */
static int cli_io_handler_show_cli_sock(struct appctx *appctx) static int cli_io_handler_show_cli_sock(struct appctx *appctx)
{ {
@ -745,7 +746,6 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
si_applet_cant_put(si); si_applet_cant_put(si);
return 0; return 0;
} }
appctx->ctx.cli_socket = NULL;
appctx->st2 = STAT_ST_LIST; appctx->st2 = STAT_ST_LIST;
case STAT_ST_LIST: case STAT_ST_LIST:
@ -754,15 +754,14 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
struct listener *l; struct listener *l;
/* /*
* get the latest dumped node in appctx->ctx.cli_socket * get the latest dumped node in appctx->ctx.cli.p0
* if the current node is the first of the list * if the current node is the first of the list
*/ */
if (appctx->ctx.cli_socket && if (appctx->ctx.cli.p0 &&
&bind_conf->by_fe == (&global.stats_fe->conf.bind)->n &bind_conf->by_fe == (&global.stats_fe->conf.bind)->n) {
) {
/* change the current node to the latest dumped and continue the loop */ /* change the current node to the latest dumped and continue the loop */
bind_conf = LIST_ELEM(appctx->ctx.cli_socket, typeof(bind_conf), by_fe); bind_conf = LIST_ELEM(appctx->ctx.cli.p0, typeof(bind_conf), by_fe);
continue; continue;
} }
@ -815,7 +814,7 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
return 0; return 0;
} }
} }
appctx->ctx.cli_socket = &bind_conf->by_fe; /* store the latest list node dumped */ appctx->ctx.cli.p0 = &bind_conf->by_fe; /* store the latest list node dumped */
} }
} }
default: default: