mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-11 09:37:20 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: proto_http: replace generic opaque types by real used types in "http_capture" by id

Browse Source 
This patch removes the generic opaque type for storing the configuration of the
action "http_capture" by id.
This commit is contained in:
Thierry FOURNIER 2015-07-31 08:56:35 +02:00 committed by Willy Tarreau
parent 32b15003fe
commit e209797ef0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types/action.h
View File

@ -65,6 +65,10 @@ struct act_rule {
struct sample_expr *expr; struct sample_expr *expr;
struct cap_hdr *hdr; struct cap_hdr *hdr;
} cap; } cap;
struct {
struct sample_expr *expr;
int idx;
} capid;
struct hlua_rule *hlua_rule; struct hlua_rule *hlua_rule;
struct { struct {
struct sample_expr *expr; struct sample_expr *expr;

20
src/proto_http.c
View File

@ -12352,9 +12352,7 @@ int http_action_req_capture_by_id(struct act_rule *rule, struct proxy *px,
struct session *sess, struct stream *s) struct session *sess, struct stream *s)
{ {
struct sample *key; struct sample *key;
struct sample_expr *expr = rule->arg.act.p[0];
struct cap_hdr *h; struct cap_hdr *h;
int idx = (long)rule->arg.act.p[1];
char **cap = s->req_cap; char **cap = s->req_cap;
struct proxy *fe = strm_fe(s); struct proxy *fe = strm_fe(s);
int len; int len;
@ -12362,12 +12360,12 @@ int http_action_req_capture_by_id(struct act_rule *rule, struct proxy *px,
/* Look for the original configuration. */ /* Look for the original configuration. */
for (h = fe->req_cap, i = fe->nb_req_cap - 1; for (h = fe->req_cap, i = fe->nb_req_cap - 1;
h != NULL && i != idx ; h != NULL && i != rule->arg.capid.idx ;
i--, h = h->next); i--, h = h->next);
if (!h) if (!h)
return 1; return 1;
key = sample_fetch_as_type(s->be, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, expr, SMP_T_STR); key = sample_fetch_as_type(s->be, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, rule->arg.capid.expr, SMP_T_STR);
if (!key) if (!key)
return 1; return 1;
@ -12498,8 +12496,8 @@ int parse_http_req_capture(const char **args, int *orig_arg, struct proxy *px, s
rule->action = HTTP_REQ_ACT_CUSTOM_CONT; rule->action = HTTP_REQ_ACT_CUSTOM_CONT;
rule->action_ptr = http_action_req_capture_by_id; rule->action_ptr = http_action_req_capture_by_id;
rule->arg.act.p[0] = expr; rule->arg.capid.expr = expr;
rule->arg.act.p[1] = (void *)(long)id; rule->arg.capid.idx = id;
} }
else { else {
@ -12521,9 +12519,7 @@ int http_action_res_capture_by_id(struct act_rule *rule, struct proxy *px,
struct session *sess, struct stream *s) struct session *sess, struct stream *s)
{ {
struct sample *key; struct sample *key;
struct sample_expr *expr = rule->arg.act.p[0];
struct cap_hdr *h; struct cap_hdr *h;
int idx = (long)rule->arg.act.p[1];
char **cap = s->res_cap; char **cap = s->res_cap;
struct proxy *fe = strm_fe(s); struct proxy *fe = strm_fe(s);
int len; int len;
@ -12531,12 +12527,12 @@ int http_action_res_capture_by_id(struct act_rule *rule, struct proxy *px,
/* Look for the original configuration. */ /* Look for the original configuration. */
for (h = fe->rsp_cap, i = fe->nb_rsp_cap - 1; for (h = fe->rsp_cap, i = fe->nb_rsp_cap - 1;
h != NULL && i != idx ; h != NULL && i != rule->arg.capid.idx ;
i--, h = h->next); i--, h = h->next);
if (!h) if (!h)
return 1; return 1;
key = sample_fetch_as_type(s->be, sess, s, SMP_OPT_DIR_RES|SMP_OPT_FINAL, expr, SMP_T_STR); key = sample_fetch_as_type(s->be, sess, s, SMP_OPT_DIR_RES|SMP_OPT_FINAL, rule->arg.capid.expr, SMP_T_STR);
if (!key) if (!key)
return 1; return 1;
@ -12622,8 +12618,8 @@ int parse_http_res_capture(const char **args, int *orig_arg, struct proxy *px, s
rule->action = HTTP_RES_ACT_CUSTOM_CONT; rule->action = HTTP_RES_ACT_CUSTOM_CONT;
rule->action_ptr = http_action_res_capture_by_id; rule->action_ptr = http_action_res_capture_by_id;
rule->arg.act.p[0] = expr; rule->arg.capid.expr = expr;
rule->arg.act.p[1] = (void *)(long)id; rule->arg.capid.idx = id;
*orig_arg = cur_arg; *orig_arg = cur_arg;
return 0; return 0;