From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 26 Oct 2018 12:47:48 +0000 (+0200)
Subject: MINOR: cli: helper to write an response message and close
X-Git-Tag: v1.9-dev5~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=deeaa593f3e1975d776bb41c7d1dae4949b16e54;p=thirdparty%2Fhaproxy.git

MINOR: cli: helper to write an response message and close

pcli_reply_and_close() writes a message to the client and close the
connection. To be used only in the CLI proxy.
---

diff --git a/src/cli.c b/src/cli.c
index 5e8df25e9d..e1b527465f 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1635,6 +1635,14 @@ void pcli_write_prompt(struct stream *s)
 
 /* The pcli_* functions are used for the CLI proxy in the master */
 
+void pcli_reply_and_close(struct stream *s, const char *msg)
+{
+	struct buffer *buf = get_trash_chunk();
+
+	chunk_initstr(buf, msg);
+	stream_int_retnclose(&s->si[0], buf);
+}
+
 static enum obj_type *pcli_pid_to_server(int proc_pid)
 {
 	struct mworker_proc *child;
@@ -1894,8 +1902,8 @@ read_again:
 			s->pcli_next_pid = target_pid;
 			pcli_write_prompt(s);
 		} else {
-			// TODO: pcli_reply() error
 			s->pcli_next_pid = 0;
+			pcli_reply_and_close(s, "Can't find the target CLI!\n");
 		}
 
 		/* we trimmed things but we might have other commands to consume */