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/src/proto_tcp.c b/src/proto_tcp.c
index e4d0a51..34f936b 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -1102,7 +1102,7 @@
int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit)
{
struct session *sess = s->sess;
- struct tcp_rule *rule;
+ struct act_rule *rule;
struct stksess *ts;
struct stktable *t;
int partial;
@@ -1269,7 +1269,7 @@
int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit)
{
struct session *sess = s->sess;
- struct tcp_rule *rule;
+ struct act_rule *rule;
int partial;
DPRINTF(stderr,"[%u] %s: stream=%p b=%p, exp(r,w)=%u,%u bf=%08x bh=%d analysers=%02x\n",
@@ -1386,7 +1386,7 @@
*/
int tcp_exec_req_rules(struct session *sess)
{
- struct tcp_rule *rule;
+ struct act_rule *rule;
struct stksess *ts;
struct stktable *t = NULL;
struct connection *conn = objt_conn(sess->origin);
@@ -1457,7 +1457,7 @@
/* Parse a tcp-response rule. Return a negative value in case of failure */
static int tcp_parse_response_rule(char **args, int arg, int section_type,
struct proxy *curpx, struct proxy *defpx,
- struct tcp_rule *rule, char **err,
+ struct act_rule *rule, char **err,
unsigned int where,
const char *file, int line)
{
@@ -1516,7 +1516,7 @@
/* 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,
struct proxy *curpx, struct proxy *defpx,
- struct tcp_rule *rule, char **err,
+ struct act_rule *rule, char **err,
unsigned int where, const char *file, int line)
{
if (curpx == defpx) {
@@ -1729,7 +1729,7 @@
unsigned int val;
int warn = 0;
int arg;
- struct tcp_rule *rule;
+ struct act_rule *rule;
unsigned int where;
const struct acl *acl;
const char *kw;
@@ -1835,7 +1835,7 @@
unsigned int val;
int warn = 0;
int arg;
- struct tcp_rule *rule;
+ struct act_rule *rule;
unsigned int where;
const struct acl *acl;
const char *kw;