From: William Lallemand <wlallemand@haproxy.org>
Date: Sat, 24 Sep 2022 13:51:27 +0000 (+0200)
Subject: MINOR: mworker: mworker_cli_proxy_new_listener() returns a bind_conf
X-Git-Tag: v2.7-dev7~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21623b59499ac21094b2635b1fa555fec6ffcd3b;p=thirdparty%2Fhaproxy.git

MINOR: mworker: mworker_cli_proxy_new_listener() returns a bind_conf

mworker_cli_proxy_new_listener() now returns a bind_conf * or NULL upon
failure.
---

diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h
index 444c09b66c..844df15e5e 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);
-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);
 
diff --git a/src/cli.c b/src/cli.c
index d238a23a1f..c0d8efabfc 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -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;
 
 }
 
diff --git a/src/haproxy.c b/src/haproxy.c
index 9b3b37f7b2..93502160f4 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -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);
 			}