RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-21 21:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: mworker_cli_proxy_new_listener() returns a bind_conf

Browse Source 
mworker_cli_proxy_new_listener() now returns a bind_conf * or NULL upon
failure.
This commit is contained in:
William Lallemand 2022-09-24 15:51:27 +02:00
parent 68192b2cdf
commit 21623b5949
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/cli.h
View File

@ -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);
int mworker_cli_proxy_new_listener(char *line);
struct bind_conf *mworker_cli_proxy_new_listener(char *line);
int mworker_cli_sockpair_new(struct mworker_proc *mworker_proc, int proc);
void mworker_cli_proxy_stop(void);

6
src/cli.c
View File

@ -3076,7 +3076,7 @@ error_proxy:
/*
* Create a new listener for the master CLI proxy
*/
int mworker_cli_proxy_new_listener(char *line)
struct bind_conf *mworker_cli_proxy_new_listener(char *line)
{
struct bind_conf *bind_conf;
struct listener *l;
@ -3165,13 +3165,13 @@ int mworker_cli_proxy_new_listener(char *line)
}
global.maxsock += mworker_proxy->maxconn;
return 0;
return bind_conf;
err:
ha_alert("%s\n", err);
free(err);
free(bind_conf);
return -1;
return NULL;
}

5
src/haproxy.c
View File

@ -2121,7 +2121,7 @@ static void init(int argc, char **argv)
list_for_each_entry_safe(c, it, &mworker_cli_conf, list) {
if (mworker_cli_proxy_new_listener(c->s) < 0) {
if (mworker_cli_proxy_new_listener(c->s) == NULL) {
ha_alert("Can't create the master's CLI.\n");
exit(EXIT_FAILURE);
}
@ -2131,8 +2131,7 @@ static void init(int argc, char **argv)
}
/* Create the mcli_reload listener from the proc_self struct */
memprintf(&path, "sockpair@%d", proc_self->ipc_fd[1]);
if (mworker_cli_proxy_new_listener(path) < 0) {
if (mworker_cli_proxy_new_listener(path) == NULL) {
ha_alert("Cannot create the mcli_reload listener.\n");
exit(EXIT_FAILURE);
}