RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-25 04:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cli: parse prompt command in the CLI proxy

Browse Source 
Handle the prompt command. Works the same way as the CLI.
This commit is contained in:
William Lallemand 2018-12-11 16:10:54 +01:00 committed by Willy Tarreau
parent bddd33af0b
commit 5b80fa2864
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/stream.h
View File

@ -163,6 +163,8 @@ struct stream {
struct stream_interface *si);
int pcli_next_pid; /* next target PID to use for the CLI proxy */
int pcli_prompt; /* is there a prompt ?! */
char *unique_id; /* custom unique ID */
/* These two pointers are used to resume the execution of the rule lists. */

6
src/cli.c
View File

@ -1657,6 +1657,9 @@ void pcli_write_prompt(struct stream *s)
struct buffer *msg = get_trash_chunk();
struct channel *oc = si_oc(&s->si[0]);
if (!s->pcli_prompt)
return;
if (s->pcli_next_pid == 0)
chunk_appendf(msg, "master> ");
else
@ -1781,6 +1784,9 @@ int pcli_find_and_exec_kw(struct stream *s, char **args, int argl, char **errmsg
else
*next_pid = target_pid;
return 1;
} else if (!strcmp("prompt", args[0])) {
s->pcli_prompt ^= 1;
return argl; /* return the number of elements in the array */
}
return 0;

1
src/stream.c
View File

@ -201,6 +201,7 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
s->flags |= SF_INITIALIZED;
s->pcli_next_pid = 0;
s->pcli_prompt = 0;
s->unique_id = NULL;
if ((t = task_new(tid_bit)) == NULL)