MINOR: checks: Introduce flags to configure in tcp-check expect rules
Instead of having 2 independent integers, used as boolean values, to know if the
expect rule is invered and to know if the matching regexp has captures, we know
use a 32-bits bitfield.
diff --git a/include/types/checks.h b/include/types/checks.h
index 983cf5f..a43efd7 100644
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -259,18 +259,21 @@
TCPCHK_EXPECT_CUSTOM, /* Execute a custom function. */
};
+/* tcp-check expect flags */
+#define TCPCHK_EXPT_FL_INV 0x0001 /* Matching is inversed */
+#define TCPCHK_EXPT_FL_CAP 0x0002 /* Regex matching with capture */
+
struct tcpcheck_expect {
- enum tcpcheck_expect_type type; /* Type of pattern used for matching. */
+ enum tcpcheck_expect_type type; /* Type of pattern used for matching. */
+ unsigned int flags; /* TCPCHK_EXPT_FL_* */
union {
- struct ist data; /* Matching a literal string / binary anywhere in the response. */
- struct my_regex *regex; /* Matching a regex pattern. */
+ struct ist data; /* Matching a literal string / binary anywhere in the response. */
+ struct my_regex *regex; /* Matching a regex pattern. */
/* custom function to eval epxect rule */
enum tcpcheck_eval_ret (*custom)(struct check *, struct tcpcheck_rule *, int);
};
struct tcpcheck_rule *head; /* first expect of a chain. */
- int inverse; /* Match is inversed. */
- int with_capture; /* Match will store captured groups for back-reference in comment. */
int min_recv; /* Minimum amount of data before an expect can be applied. (default: -1, ignored) */
struct list onerror_fmt; /* log-format string to use as comment on error */
struct list onsuccess_fmt; /* log-format string to use as comment on success (if last rule) */
diff --git a/src/checks.c b/src/checks.c
index 6f46ef3..e43e732 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -2340,7 +2340,7 @@
/* If references to the matched text were made, divide the
* offsets by 2 to match offset of the original response buffer.
*/
- if (rule->expect.with_capture) {
+ if (rule->expect.flags & TCPCHK_EXPT_FL_CAP) {
int i;
for (i = 1; i < MAX_MATCH && pmatch[i].rm_so != -1; i++) {
@@ -2360,7 +2360,7 @@
comment:
if (rule->comment) {
chunk_strcat(msg, " comment: ");
- if (rule->expect.with_capture) {
+ if (rule->expect.flags & TCPCHK_EXPT_FL_CAP) {
int ret = exp_replace(b_tail(msg), b_room(msg), b_head(&check->bi), rule->comment, pmatch);
if (ret != -1) /* ignore comment if too large */
msg->data += ret;
@@ -3107,7 +3107,7 @@
enum tcpcheck_eval_ret ret = TCPCHK_EVAL_CONTINUE;
struct tcpcheck_expect *expect = &rule->expect;
struct buffer *msg = NULL;
- int match;
+ int match, inverse;
/* The current expect might need more data than the previous one, check again
* that the minimum amount data required to match is respected.
@@ -3124,8 +3124,9 @@
}
}
+ inverse = !!(expect->flags & TCPCHK_EXPT_FL_INV);
/* Make GCC happy ; initialize match to a failure state. */
- match = expect->inverse;
+ match = inverse;
switch (expect->type) {
case TCPCHK_EXPECT_STRING:
@@ -3133,7 +3134,7 @@
match = my_memmem(b_head(&check->bi), b_data(&check->bi), expect->data.ptr, istlen(expect->data)) != NULL;
break;
case TCPCHK_EXPECT_REGEX:
- if (expect->with_capture)
+ if (expect->flags & TCPCHK_EXPT_FL_CAP)
match = regex_exec_match2(expect->regex, b_head(&check->bi), MIN(b_data(&check->bi), b_size(&check->bi)-1),
MAX_MATCH, pmatch, 0);
else
@@ -3143,7 +3144,7 @@
case TCPCHK_EXPECT_REGEX_BINARY:
chunk_reset(&trash);
dump_binary(&trash, b_head(&check->bi), b_data(&check->bi));
- if (expect->with_capture)
+ if (expect->flags & TCPCHK_EXPT_FL_CAP)
match = regex_exec_match2(expect->regex, b_head(&trash), MIN(b_data(&trash), b_size(&trash)-1),
MAX_MATCH, pmatch, 0);
else
@@ -3169,7 +3170,7 @@
}
/* Result as expected, next rule. */
- if (match ^ expect->inverse)
+ if (match ^ inverse)
goto out;
@@ -3770,7 +3771,7 @@
tcpcheck->expect.head = tcpcheck;
list_for_each_entry_rev(prev_check, rules->list, list) {
if (prev_check->action == TCPCHK_ACT_EXPECT) {
- if (prev_check->expect.inverse)
+ if (prev_check->expect.flags & TCPCHK_EXPT_FL_INV)
tcpcheck->expect.head = prev_check;
continue;
}
@@ -4966,8 +4967,8 @@
chk->comment = comment; comment = NULL;
chk->expect.type = type;
chk->expect.min_recv = min_recv;
- chk->expect.inverse = inverse;
- chk->expect.with_capture = with_capture;
+ chk->expect.flags |= (inverse ? TCPCHK_EXPT_FL_INV : 0);
+ chk->expect.flags |= (with_capture ? TCPCHK_EXPT_FL_CAP : 0);
chk->expect.ok_status = ok_st;
chk->expect.err_status = err_st;
chk->expect.tout_status = tout_st;
@@ -5026,7 +5027,7 @@
chk->expect.head = chk;
list_for_each_entry_rev(prev_check, rules, list) {
if (prev_check->action == TCPCHK_ACT_EXPECT) {
- if (prev_check->expect.inverse)
+ if (prev_check->expect.flags & TCPCHK_EXPT_FL_INV)
chk->expect.head = prev_check;
continue;
}