From 2f836de100ee0346b0360dd64c1e29aab3d05cfb Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 26 Mar 2021 15:36:44 +0100 Subject: [PATCH] MINOR: action: add a new ACT_F_CLI_PARSER origin designation In order to process samples from the command line interface we'll need rules as well, and these rules will have to be marked as coming from the CLI parser. This new origin is used for this. --- include/haproxy/action-t.h | 1 + src/vars.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h index 77097773f..9009e4aae 100644 --- a/include/haproxy/action-t.h +++ b/include/haproxy/action-t.h @@ -35,6 +35,7 @@ enum act_from { ACT_F_HTTP_RES, /* http-response */ ACT_F_TCP_CHK, /* tcp-check. */ ACT_F_CFG_PARSER, /* config parser */ + ACT_F_CLI_PARSER, /* command line parser */ }; enum act_return { diff --git a/src/vars.c b/src/vars.c index 5c8d45e39..9be070b71 100644 --- a/src/vars.c +++ b/src/vars.c @@ -654,6 +654,7 @@ static enum act_return action_store(struct act_rule *rule, struct proxy *px, case ACT_F_HTTP_RES: dir = SMP_OPT_DIR_RES; break; case ACT_F_TCP_CHK: dir = SMP_OPT_DIR_REQ; break; case ACT_F_CFG_PARSER: dir = SMP_OPT_DIR_REQ; break; /* not used anyway */ + case ACT_F_CLI_PARSER: dir = SMP_OPT_DIR_REQ; break; /* not used anyway */ default: send_log(px, LOG_ERR, "Vars: internal error while execute action store."); if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) @@ -780,6 +781,7 @@ static enum act_parse_ret parse_store(const char **args, int *arg, struct proxy case ACT_F_HTTP_RES: flags = SMP_VAL_BE_HRS_HDR; break; case ACT_F_TCP_CHK: flags = SMP_VAL_BE_CHK_RUL; break; case ACT_F_CFG_PARSER: flags = SMP_VAL_CFG_PARSER; break; + case ACT_F_CLI_PARSER: flags = SMP_VAL_CLI_PARSER; break; default: memprintf(err, "internal error, unexpected rule->from=%d, please report this bug!",