MAJOR: sample: don't pass l7 anymore to sample fetch functions
All of them can now retrieve the HTTP transaction *if it exists* from
the stream and be sure to get NULL there when called with an embryonic
session.
The patch is a bit large because many locations were touched (all fetch
functions had to have their prototype adjusted). The opportunity was
taken to also uniformize the call names (the stream is now always "strm"
instead of "l4") and to fix indent where it was broken. This way when
we later introduce the session here there will be less confusion.
diff --git a/include/proto/acl.h b/include/proto/acl.h
index ee5b14b..7cadfce 100644
--- a/include/proto/acl.h
+++ b/include/proto/acl.h
@@ -99,7 +99,7 @@
* function only computes the condition, it does not apply the polarity required
* by IF/UNLESS, it's up to the caller to do this.
*/
-enum acl_test_res acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct stream *l4, void *l7, unsigned int opt);
+enum acl_test_res acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct stream *strm, unsigned int opt);
/* Returns a pointer to the first ACL conflicting with usage at place <where>
* which is one of the SMP_VAL_* bits indicating a check place, or NULL if
diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index a8056af..97b3096 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -127,10 +127,10 @@
struct chunk *http_error_message(struct stream *s, int msgnum);
struct redirect_rule *http_parse_redirect_rule(const char *file, int linenum, struct proxy *curproxy,
const char **args, char **errmsg, int use_fmt);
-int smp_fetch_cookie(struct proxy *px, struct stream *l4, void *l7, unsigned int opt,
- const struct arg *args, struct sample *smp, const char *kw, void *private);
+int smp_fetch_cookie(struct proxy *px, struct stream *strm, unsigned int opt,
+ const struct arg *args, struct sample *smp, const char *kw, void *private);
int
-smp_fetch_base32(struct proxy *px, struct stream *l4, void *l7, unsigned int opt,
+smp_fetch_base32(struct proxy *px, struct stream *strm, unsigned int opt,
const struct arg *args, struct sample *smp, const char *kw, void *private);
enum http_meth_t find_http_meth(const char *str, const int len);
diff --git a/include/proto/sample.h b/include/proto/sample.h
index e9f9e25..2880d00 100644
--- a/include/proto/sample.h
+++ b/include/proto/sample.h
@@ -30,10 +30,10 @@
struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, int line, char **err, struct arg_list *al);
struct sample_conv *find_sample_conv(const char *kw, int len);
-struct sample *sample_process(struct proxy *px, struct stream *l4,
- void *l7, unsigned int dir, struct sample_expr *expr,
- struct sample *p);
-struct sample *sample_fetch_string(struct proxy *px, struct stream *l4, void *l7,
+struct sample *sample_process(struct proxy *px, struct stream *strm,
+ unsigned int dir, struct sample_expr *expr,
+ struct sample *p);
+struct sample *sample_fetch_string(struct proxy *px, struct stream *strm,
unsigned int opt, struct sample_expr *expr);
void sample_register_fetches(struct sample_fetch_kw_list *psl);
void sample_register_convs(struct sample_conv_kw_list *psl);
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 9320430..9beaa54 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -48,8 +48,8 @@
struct stksess *stktable_update_key(struct stktable *table, struct stktable_key *key);
struct stktable_key *smp_to_stkey(struct sample *smp, struct stktable *t);
struct stktable_key *stktable_fetch_key(struct stktable *t, struct proxy *px,
- struct stream *l4, void *l7, unsigned int opt,
- struct sample_expr *expr, struct sample *smp);
+ struct stream *strm, unsigned int opt,
+ struct sample_expr *expr, struct sample *smp);
int stktable_compatible_sample(struct sample_expr *expr, unsigned long table_type);
int stktable_register_data_store(int idx, const char *name, int std_type, int arg_type);
int stktable_get_data_type(char *name);