From: William Lallemand <wlallemand@haproxy.org>
Date: Sat, 24 Sep 2022 13:56:25 +0000 (+0200)
Subject: MINOR: mworker: stores the mcli_reload bind_conf
X-Git-Tag: v2.7-dev7~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56f73b21a5c;p=thirdparty%2Fhaproxy.git

MINOR: mworker: stores the mcli_reload bind_conf

Stores the mcli_reload bind_conf in order to identify it later.
---

diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h
index 844df15e5e..379bc3863d 100644
--- a/include/haproxy/cli.h
+++ b/include/haproxy/cli.h
@@ -46,6 +46,8 @@ 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);
 
+extern struct bind_conf *mcli_reload_bind_conf;
+
 /* proxy mode cli functions */
 
 /* analyzers */
diff --git a/src/cli.c b/src/cli.c
index c0d8efabfc..1391345b37 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -85,6 +85,7 @@ static struct cli_kw_list cli_keywords = {
 extern const char *stat_status_codes[];
 
 struct proxy *mworker_proxy; /* CLI proxy of the master */
+struct bind_conf *mcli_reload_bind_conf;
 
 /* CLI context for the "show activity" command */
 struct show_activity_ctx {
diff --git a/src/haproxy.c b/src/haproxy.c
index 93502160f4..1ec16b7d79 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2131,7 +2131,8 @@ 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) == NULL) {
+			mcli_reload_bind_conf = mworker_cli_proxy_new_listener(path);
+			if (mcli_reload_bind_conf == NULL) {
 				ha_alert("Cannot create the mcli_reload listener.\n");
 				exit(EXIT_FAILURE);
 			}