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

MINOR: checks: Introduce flags to configure in tcp-check expect rules

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2020-04-10 09:58:42 +02:00
parent f930e4c4df
commit 12d5740a38
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/types/checks.h
View File

@ -259,18 +259,21 @@ enum tcpcheck_expect_type {
TCPCHK_EXPECT_CUSTOM, /* Execute a custom function. */ 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 { 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 { union {
struct ist data; /* Matching a literal string / binary anywhere in the response. */ struct ist data; /* Matching a literal string / binary anywhere in the response. */
struct my_regex *regex; /* Matching a regex pattern. */ struct my_regex *regex; /* Matching a regex pattern. */
/* custom function to eval epxect rule */ /* custom function to eval epxect rule */
enum tcpcheck_eval_ret (*custom)(struct check *, struct tcpcheck_rule *, int); enum tcpcheck_eval_ret (*custom)(struct check *, struct tcpcheck_rule *, int);
}; };
struct tcpcheck_rule *head; /* first expect of a chain. */ 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) */ 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 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) */ struct list onsuccess_fmt; /* log-format string to use as comment on success (if last rule) */

23
src/checks.c
View File

@ -2340,7 +2340,7 @@ static void tcpcheck_onerror_message(struct buffer *msg, struct check *check, st
/* If references to the matched text were made, divide the /* If references to the matched text were made, divide the
* offsets by 2 to match offset of the original response buffer. * 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; int i;
for (i = 1; i < MAX_MATCH && pmatch[i].rm_so != -1; i++) { for (i = 1; i < MAX_MATCH && pmatch[i].rm_so != -1; i++) {
@ -2360,7 +2360,7 @@ static void tcpcheck_onerror_message(struct buffer *msg, struct check *check, st
comment: comment:
if (rule->comment) { if (rule->comment) {
chunk_strcat(msg, " 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); 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 */ if (ret != -1) /* ignore comment if too large */
msg->data += ret; msg->data += ret;
@ -3107,7 +3107,7 @@ static enum tcpcheck_eval_ret tcpcheck_eval_expect(struct check *check, struct t
enum tcpcheck_eval_ret ret = TCPCHK_EVAL_CONTINUE; enum tcpcheck_eval_ret ret = TCPCHK_EVAL_CONTINUE;
struct tcpcheck_expect *expect = &rule->expect; struct tcpcheck_expect *expect = &rule->expect;
struct buffer *msg = NULL; struct buffer *msg = NULL;
int match; int match, inverse;
/* The current expect might need more data than the previous one, check again /* The current expect might need more data than the previous one, check again
* that the minimum amount data required to match is respected. * that the minimum amount data required to match is respected.
@ -3124,8 +3124,9 @@ static enum tcpcheck_eval_ret tcpcheck_eval_expect(struct check *check, struct t
} }
} }
inverse = !!(expect->flags & TCPCHK_EXPT_FL_INV);
/* Make GCC happy ; initialize match to a failure state. */ /* Make GCC happy ; initialize match to a failure state. */
match = expect->inverse; match = inverse;
switch (expect->type) { switch (expect->type) {
case TCPCHK_EXPECT_STRING: case TCPCHK_EXPECT_STRING:
@ -3133,7 +3134,7 @@ static enum tcpcheck_eval_ret tcpcheck_eval_expect(struct check *check, struct t
match = my_memmem(b_head(&check->bi), b_data(&check->bi), expect->data.ptr, istlen(expect->data)) != NULL; match = my_memmem(b_head(&check->bi), b_data(&check->bi), expect->data.ptr, istlen(expect->data)) != NULL;
break; break;
case TCPCHK_EXPECT_REGEX: 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), match = regex_exec_match2(expect->regex, b_head(&check->bi), MIN(b_data(&check->bi), b_size(&check->bi)-1),
MAX_MATCH, pmatch, 0); MAX_MATCH, pmatch, 0);
else else
@ -3143,7 +3144,7 @@ static enum tcpcheck_eval_ret tcpcheck_eval_expect(struct check *check, struct t
case TCPCHK_EXPECT_REGEX_BINARY: case TCPCHK_EXPECT_REGEX_BINARY:
chunk_reset(&trash); chunk_reset(&trash);
dump_binary(&trash, b_head(&check->bi), b_data(&check->bi)); 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), match = regex_exec_match2(expect->regex, b_head(&trash), MIN(b_data(&trash), b_size(&trash)-1),
MAX_MATCH, pmatch, 0); MAX_MATCH, pmatch, 0);
else else
@ -3169,7 +3170,7 @@ static enum tcpcheck_eval_ret tcpcheck_eval_expect(struct check *check, struct t
} }
/* Result as expected, next rule. */ /* Result as expected, next rule. */
if (match ^ expect->inverse) if (match ^ inverse)
goto out; goto out;
@ -3770,7 +3771,7 @@ static int add_tcpcheck_expect_str(struct tcpcheck_rules *rules, const char *str
tcpcheck->expect.head = tcpcheck; tcpcheck->expect.head = tcpcheck;
list_for_each_entry_rev(prev_check, rules->list, list) { list_for_each_entry_rev(prev_check, rules->list, list) {
if (prev_check->action == TCPCHK_ACT_EXPECT) { 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; tcpcheck->expect.head = prev_check;
continue; continue;
} }
@ -4966,8 +4967,8 @@ static struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, str
chk->comment = comment; comment = NULL; chk->comment = comment; comment = NULL;
chk->expect.type = type; chk->expect.type = type;
chk->expect.min_recv = min_recv; chk->expect.min_recv = min_recv;
chk->expect.inverse = inverse; chk->expect.flags |= (inverse ? TCPCHK_EXPT_FL_INV : 0);
chk->expect.with_capture = with_capture; chk->expect.flags |= (with_capture ? TCPCHK_EXPT_FL_CAP : 0);
chk->expect.ok_status = ok_st; chk->expect.ok_status = ok_st;
chk->expect.err_status = err_st; chk->expect.err_status = err_st;
chk->expect.tout_status = tout_st; chk->expect.tout_status = tout_st;
@ -5026,7 +5027,7 @@ static struct tcpcheck_rule *parse_tcpcheck_expect(char **args, int cur_arg, str
chk->expect.head = chk; chk->expect.head = chk;
list_for_each_entry_rev(prev_check, rules, list) { list_for_each_entry_rev(prev_check, rules, list) {
if (prev_check->action == TCPCHK_ACT_EXPECT) { 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; chk->expect.head = prev_check;
continue; continue;
} }