diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h index 32c659944..537f306e4 100644 --- a/include/haproxy/cli.h +++ b/include/haproxy/cli.h @@ -42,7 +42,7 @@ int cli_parse_default(char **args, char *payload, struct appctx *appctx, void *p /* mworker proxy functions */ int mworker_cli_proxy_create(void); -struct bind_conf *mworker_cli_proxy_new_listener(char *line); +struct bind_conf *mworker_cli_master_proxy_new_listener(char *line); int mworker_cli_sockpair_new(struct mworker_proc *mworker_proc, int proc); void mworker_cli_proxy_stop(void); diff --git a/src/cli.c b/src/cli.c index c890eb3f8..ea9fcd657 100644 --- a/src/cli.c +++ b/src/cli.c @@ -3386,7 +3386,7 @@ error_proxy: /* * Create a new listener for the master CLI proxy */ -struct bind_conf *mworker_cli_proxy_new_listener(char *line) +struct bind_conf *mworker_cli_master_proxy_new_listener(char *line) { struct bind_conf *bind_conf; struct listener *l; diff --git a/src/mworker.c b/src/mworker.c index c47625c76..c125a1696 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -809,8 +809,7 @@ void mworker_create_master_cli(void) } list_for_each_entry_safe(c, it, &mworker_cli_conf, list) { - - if (mworker_cli_proxy_new_listener(c->s) == NULL) { + if (mworker_cli_master_proxy_new_listener(c->s) == NULL) { ha_alert("Can't create the master's CLI.\n"); exit(EXIT_FAILURE); } @@ -835,7 +834,8 @@ void mworker_create_master_cli(void) /* Create the mcli_reload listener from the proc_self struct */ memprintf(&path, "sockpair@%d", proc_self->ipc_fd[1]); - mcli_reload_bind_conf = mworker_cli_proxy_new_listener(path); + + mcli_reload_bind_conf = mworker_cli_master_proxy_new_listener(path); if (mcli_reload_bind_conf == NULL) { ha_alert("Can't create the mcli_reload listener.\n"); exit(EXIT_FAILURE);