mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-27 05:41:10 +01:00
Code Issues Projects Releases Wiki Activity

[CLEANUP] proto_tcp: make the config parser a little bit more flexible

Browse Source 
We'll need to let the tcp-request parser able to delegate parsing of
track-counters to a commun function, let's prepare it.
This commit is contained in:
Willy Tarreau 2010-06-14 16:44:27 +02:00
parent 5214be1b22
commit 6a984fa7c1
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/proto_tcp.c
View File

@ -759,10 +759,9 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
const char *ptr = NULL; const char *ptr = NULL;
unsigned int val; unsigned int val;
int retlen; int retlen;
int action;
int warn = 0; int warn = 0;
int pol = ACL_COND_NONE; int pol = ACL_COND_NONE;
struct acl_cond *cond; int arg;
struct tcp_rule *rule; struct tcp_rule *rule;
if (!*args[1]) { if (!*args[1]) {
@ -804,47 +803,50 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
return 0; return 0;
} }
rule = (struct tcp_rule *)calloc(1, sizeof(*rule));
arg = 1;
if (!strcmp(args[1], "content")) { if (!strcmp(args[1], "content")) {
if (curpx == defpx) { if (curpx == defpx) {
snprintf(err, errlen, "%s %s is not allowed in 'defaults' sections", snprintf(err, errlen, "%s %s is not allowed in 'defaults' sections",
args[0], args[1]); args[0], args[1]);
return -1; goto error;
} }
if (!strcmp(args[2], "accept")) if (!strcmp(args[2], "accept"))
action = TCP_ACT_ACCEPT; rule->action = TCP_ACT_ACCEPT;
else if (!strcmp(args[2], "reject")) else if (!strcmp(args[2], "reject"))
action = TCP_ACT_REJECT; rule->action = TCP_ACT_REJECT;
else { else {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"'%s %s' expects 'accept' or 'reject', in %s '%s' (was '%s')", "'%s %s' expects 'accept' or 'reject', in %s '%s' (was '%s')",
args[0], args[1], proxy_type_str(curpx), curpx->id, args[2]); args[0], args[1], proxy_type_str(curpx), curpx->id, args[2]);
return -1; goto error;
} }
pol = ACL_COND_NONE; pol = ACL_COND_NONE;
cond = NULL; rule->cond = NULL;
if (strcmp(args[3], "if") == 0 || strcmp(args[3], "unless") == 0) { if (strcmp(args[3], "if") == 0 || strcmp(args[3], "unless") == 0) {
if ((cond = build_acl_cond(NULL, 0, curpx, (const char **)args+3)) == NULL) { if ((rule->cond = build_acl_cond(NULL, 0, curpx, (const char **)args+3)) == NULL) {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"error detected in %s '%s' while parsing '%s' condition", "error detected in %s '%s' while parsing '%s' condition",
proxy_type_str(curpx), curpx->id, args[3]); proxy_type_str(curpx), curpx->id, args[3]);
return -1; goto error;
} }
} }
else if (*args[3]) { else if (*args[3]) {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"'%s %s %s' only accepts 'if' or 'unless', in %s '%s' (was '%s')", "'%s %s %s' only accepts 'if' or 'unless', in %s '%s' (was '%s')",
args[0], args[1], args[2], proxy_type_str(curpx), curpx->id, args[3]); args[0], args[1], args[2], proxy_type_str(curpx), curpx->id, args[3]);
return -1; goto error;
} }
if (cond && (cond->requires & ACL_USE_RTR_ANY)) { if (rule->cond && (rule->cond->requires & ACL_USE_RTR_ANY)) {
struct acl *acl; struct acl *acl;
const char *name; const char *name;
acl = cond_find_require(cond, ACL_USE_RTR_ANY); acl = cond_find_require(rule->cond, ACL_USE_RTR_ANY);
name = acl ? acl->name : "(unknown)"; name = acl ? acl->name : "(unknown)";
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
@ -852,62 +854,60 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
name); name);
warn++; warn++;
} }
rule = (struct tcp_rule *)calloc(1, sizeof(*rule));
rule->cond = cond;
rule->action = action;
LIST_INIT(&rule->list); LIST_INIT(&rule->list);
LIST_ADDQ(&curpx->tcp_req.inspect_rules, &rule->list); LIST_ADDQ(&curpx->tcp_req.inspect_rules, &rule->list);
return warn; return warn;
} }
/* OK so we're in front of plain L4 rules */ /* OK so we're in front of plain L4 rules */
if (!strcmp(args[1], "accept"))
action = TCP_ACT_ACCEPT; if (strcmp(args[1], "accept") == 0)
else if (!strcmp(args[1], "reject")) rule->action = TCP_ACT_ACCEPT;
action = TCP_ACT_REJECT; else if (strcmp(args[1], "reject") == 0)
rule->action = TCP_ACT_REJECT;
else { else {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"'%s' expects 'inspect-delay', 'content', 'accept' or 'reject', in %s '%s' (was '%s')", "'%s' expects 'inspect-delay', 'content', 'accept' or 'reject', in %s '%s' (was '%s')",
args[0], proxy_type_str(curpx), curpx->id, args[1]); args[0], proxy_type_str(curpx), curpx->id, args[1]);
return -1; goto error;
} }
if (curpx == defpx) { if (curpx == defpx) {
snprintf(err, errlen, "%s %s is not allowed in 'defaults' sections", snprintf(err, errlen, "%s %s is not allowed in 'defaults' sections",
args[0], args[1]); args[0], args[1]);
return -1; goto error;
} }
arg++;
pol = ACL_COND_NONE; pol = ACL_COND_NONE;
cond = NULL;
if (strcmp(args[2], "if") == 0 || strcmp(args[2], "unless") == 0) { if (strcmp(args[arg], "if") == 0 || strcmp(args[arg], "unless") == 0) {
if ((cond = build_acl_cond(NULL, 0, curpx, (const char **)args+2)) == NULL) { if ((rule->cond = build_acl_cond(NULL, 0, curpx, (const char **)args+arg)) == NULL) {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"error detected in %s '%s' while parsing '%s' condition", "error detected in %s '%s' while parsing '%s' condition",
proxy_type_str(curpx), curpx->id, args[2]); proxy_type_str(curpx), curpx->id, args[arg]);
return -1; goto error;
} }
} }
else if (*args[2]) { else if (*args[arg]) {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"'%s %s' only accepts 'if' or 'unless', in %s '%s' (was '%s')", "'%s %s' only accepts 'if' or 'unless', in %s '%s' (was '%s')",
args[0], args[1], proxy_type_str(curpx), curpx->id, args[2]); args[0], args[1], proxy_type_str(curpx), curpx->id, args[arg]);
return -1; goto error;
} }
if (cond && (cond->requires & (ACL_USE_RTR_ANY|ACL_USE_L6_ANY|ACL_USE_L7_ANY))) { if (rule->cond && (rule->cond->requires & (ACL_USE_RTR_ANY|ACL_USE_L6_ANY|ACL_USE_L7_ANY))) {
struct acl *acl; struct acl *acl;
const char *name; const char *name;
acl = cond_find_require(cond, ACL_USE_RTR_ANY|ACL_USE_L6_ANY|ACL_USE_L7_ANY); acl = cond_find_require(rule->cond, ACL_USE_RTR_ANY|ACL_USE_L6_ANY|ACL_USE_L7_ANY);
name = acl ? acl->name : "(unknown)"; name = acl ? acl->name : "(unknown)";
if (acl->requires & (ACL_USE_L6_ANY|ACL_USE_L7_ANY)) { if (acl->requires & (ACL_USE_L6_ANY|ACL_USE_L7_ANY)) {
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
"'%s %s' may not reference acl '%s' which makes use of payload in %s '%s'. Please use '%s content' for this.", "'%s %s' may not reference acl '%s' which makes use of payload in %s '%s'. Please use '%s content' for this.",
args[0], args[1], name, proxy_type_str(curpx), curpx->id, args[0]); args[0], args[1], name, proxy_type_str(curpx), curpx->id, args[0]);
return -1; goto error;
} }
if (acl->requires & ACL_USE_RTR_ANY) if (acl->requires & ACL_USE_RTR_ANY)
retlen = snprintf(err, errlen, retlen = snprintf(err, errlen,
@ -917,12 +917,12 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
warn++; warn++;
} }
rule = (struct tcp_rule *)calloc(1, sizeof(*rule));
rule->cond = cond;
rule->action = action;
LIST_INIT(&rule->list); LIST_INIT(&rule->list);
LIST_ADDQ(&curpx->tcp_req.l4_rules, &rule->list); LIST_ADDQ(&curpx->tcp_req.l4_rules, &rule->list);
return warn; return warn;
error:
free(rule);
return -1;
} }