MINOR: action: add a new ACT_F_CFG_PARSER origin designation

In order to process samples from the config file we'll need rules as
well, and these rules will have to be marked as coming from the
config parser. This new origin is used for this.

diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h
index 91042e0910ab1b05809717ba7b11163df59c8b46..77097773f23d58a55c4ff3de8d2fb46604c6cbd5 100644 (file)
--- a/include/haproxy/action-t.h
+++ b/include/haproxy/action-t.h
@@ -34,6 +34,7 @@ enum act_from {
        ACT_F_HTTP_REQ,    /* http-request */
        ACT_F_HTTP_RES,    /* http-response */
        ACT_F_TCP_CHK,     /* tcp-check. */
+       ACT_F_CFG_PARSER,  /* config parser */
 };
 
 enum act_return {

diff --git a/src/vars.c b/src/vars.c
index 8690863e84396c928bdcd34f7299ee194cb9e8f8..1077a798edd1d9092516b8049f8820fa6fec142e 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -653,6 +653,7 @@ static enum act_return action_store(struct act_rule *rule, struct proxy *px,
        case ACT_F_HTTP_REQ:    dir = SMP_OPT_DIR_REQ; break;
        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 */
        default:
                send_log(px, LOG_ERR, "Vars: internal error while execute action store.");
                if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
@@ -777,6 +778,7 @@ static enum act_parse_ret parse_store(const char **args, int *arg, struct proxy
        case ACT_F_HTTP_REQ:    flags = SMP_VAL_FE_HRQ_HDR; break;
        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;
        default:
                memprintf(err,
                          "internal error, unexpected rule->from=%d, please report this bug!",