mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tcp-rules: Add release functions for existing TCP actions

Browse Source 
TCP actions allocating memory during configuration parsing now use dedicated
functions to release it.
This commit is contained in:
Christopher Faulet 2020-01-14 15:05:33 +01:00
parent 1337b328d9
commit adfc6e8e14
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tcp_rules.c
View File

@ -702,6 +702,17 @@ static enum act_return tcp_action_capture(struct act_rule *rule, struct proxy *p
return ACT_RET_CONT; return ACT_RET_CONT;
} }
static void release_tcp_capture(struct act_rule * rule)
{
release_sample_expr(rule->arg.cap.expr);
}
static void release_tcp_track_sc(struct act_rule * rule)
{
release_sample_expr(rule->arg.trk_ctr.expr);
}
/* Parse a tcp-request rule. Return a negative value in case of failure */ /* Parse a tcp-request rule. Return a negative value in case of failure */
static int tcp_parse_request_rule(char **args, int arg, int section_type, static int tcp_parse_request_rule(char **args, int arg, int section_type,
struct proxy *curpx, struct proxy *defpx, struct proxy *curpx, struct proxy *defpx,
@ -811,6 +822,7 @@ static int tcp_parse_request_rule(char **args, int arg, int section_type,
rule->action = ACT_CUSTOM; rule->action = ACT_CUSTOM;
rule->action_ptr = tcp_action_capture; rule->action_ptr = tcp_action_capture;
rule->check_ptr = check_capture; rule->check_ptr = check_capture;
rule->release_ptr = release_tcp_capture;
} }
else if (strncmp(args[arg], "track-sc", 8) == 0) { else if (strncmp(args[arg], "track-sc", 8) == 0) {
struct sample_expr *expr; struct sample_expr *expr;
@ -863,6 +875,7 @@ static int tcp_parse_request_rule(char **args, int arg, int section_type,
rule->arg.trk_ctr.expr = expr; rule->arg.trk_ctr.expr = expr;
rule->action_ptr = tcp_action_track_sc; rule->action_ptr = tcp_action_track_sc;
rule->check_ptr = check_trk_action; rule->check_ptr = check_trk_action;
rule->release_ptr = release_tcp_track_sc;
} }
else if (strcmp(args[arg], "expect-proxy") == 0) { else if (strcmp(args[arg], "expect-proxy") == 0) {
if (strcmp(args[arg+1], "layer4") != 0) { if (strcmp(args[arg+1], "layer4") != 0) {