MEDIUM: actions: Merge (http|tcp)-(request|reponse) action structs
This patch is the first of a serie which merge all the action structs. The
function "tcp-request content", "tcp-response-content", "http-request" and
"http-response" have the same values and the same process for some defined
actions, but the struct and the prototype of the declared function are
different.
This patch try to unify all of these entries.
diff --git a/include/types/proto_tcp.h b/include/types/proto_tcp.h
index 88f6999..4ab0985 100644
--- a/include/types/proto_tcp.h
+++ b/include/types/proto_tcp.h
@@ -25,6 +25,7 @@
#include <common/config.h>
#include <common/mini-clist.h>
+#include <types/action.h>
#include <types/acl.h>
#include <types/stream.h>
@@ -43,28 +44,10 @@
TCP_ACT_CUSTOM_CONT, /* Use for custom registered keywords. */
};
-struct capture_prm {
- struct sample_expr *expr; /* expression used as the key */
- struct cap_hdr *hdr; /* the capture storage */
-};
-
-struct tcp_rule {
- struct list list;
- struct acl_cond *cond;
- int action;
- int (*action_ptr)(struct tcp_rule *rule, struct proxy *px,
- struct session *sess, struct stream *s);
- union {
- struct track_ctr_prm trk_ctr;
- struct capture_prm cap;
- void *data[4];
- } act_prm;
-};
-
struct tcp_action_kw {
const char *kw;
int (*parse)(const char **args, int *cur_arg, struct proxy *px,
- struct tcp_rule *rule, char **err);
+ struct act_rule *rule, char **err);
int match_pfx;
};