RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-18 19:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tcp: increase the opaque data array

Browse Source 
This patch increase the opaque data array for the tcp_rules.
It is used by the "store" action (next commited) which deal
with variables.
This commit is contained in:
Thierry FOURNIER 2015-06-03 19:32:04 +02:00 committed by Willy Tarreau
parent 9687c77c91
commit fbdb77582d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/proto_tcp.h
View File

@ -57,7 +57,7 @@ struct tcp_rule {
union {
struct track_ctr_prm trk_ctr;
struct capture_prm cap;
void *data;
void *data[4];
} act_prm;
};

8
src/hlua.c
View File

@ -4349,7 +4349,7 @@ static int hlua_request_act_wrapper(struct hlua_rule *rule, struct proxy *px,
int hlua_tcp_req_act_wrapper(struct tcp_rule *tcp_rule, struct proxy *px,
struct stream *s)
{
return hlua_request_act_wrapper((struct hlua_rule *)tcp_rule->act_prm.data,
return hlua_request_act_wrapper((struct hlua_rule *)tcp_rule->act_prm.data[0],
px, s, AN_REQ_INSPECT_FE);
}
@ -4359,7 +4359,7 @@ int hlua_tcp_req_act_wrapper(struct tcp_rule *tcp_rule, struct proxy *px,
int hlua_tcp_res_act_wrapper(struct tcp_rule *tcp_rule, struct proxy *px,
struct stream *s)
{
return hlua_request_act_wrapper((struct hlua_rule *)tcp_rule->act_prm.data,
return hlua_request_act_wrapper((struct hlua_rule *)tcp_rule->act_prm.data[0],
px, s, AN_RES_INSPECT);
}
@ -4389,7 +4389,7 @@ int hlua_http_res_act_wrapper(struct http_res_rule *rule, struct proxy *px,
static int tcp_req_action_register_lua(const char **args, int *cur_arg, struct proxy *px,
struct tcp_rule *rule, char **err)
{
if (!hlua_parse_rule(args, cur_arg, px, (struct hlua_rule **)&rule->act_prm.data, err))
if (!hlua_parse_rule(args, cur_arg, px, (struct hlua_rule **)&rule->act_prm.data[0], err))
return 0;
rule->action = TCP_ACT_CUSTOM_CONT;
rule->action_ptr = hlua_tcp_req_act_wrapper;
@ -4400,7 +4400,7 @@ static int tcp_req_action_register_lua(const char **args, int *cur_arg, struct p
static int tcp_res_action_register_lua(const char **args, int *cur_arg, struct proxy *px,
struct tcp_rule *rule, char **err)
{
if (!hlua_parse_rule(args, cur_arg, px, (struct hlua_rule **)&rule->act_prm.data, err))
if (!hlua_parse_rule(args, cur_arg, px, (struct hlua_rule **)&rule->act_prm.data[0], err))
return 0;
rule->action = TCP_ACT_CUSTOM_CONT;
rule->action_ptr = hlua_tcp_res_act_wrapper;