MAJOR: sample: pass a pointer to the session to each sample fetch function
Many such function need a session, and till now they used to dereference
the stream. Once we remove the stream from the embryonic session, this
will not be possible anymore.
So as of now, sample fetch functions will be called with this :
- sess = NULL, strm = NULL : never
- sess = valid, strm = NULL : tcp-req connection
- sess = valid, strm = valid, strm->txn = NULL : tcp-req content
- sess = valid, strm = valid, strm->txn = valid : http-req / http-res
diff --git a/src/listener.c b/src/listener.c
index 5d459b6..86f5d5a 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -590,21 +590,21 @@
/* set temp integer to the number of connexions to the same listening socket */
static int
-smp_fetch_dconn(struct proxy *px, struct stream *strm, unsigned int opt,
+smp_fetch_dconn(struct proxy *px, struct session *sess, struct stream *strm, unsigned int opt,
const struct arg *args, struct sample *smp, const char *kw, void *private)
{
smp->type = SMP_T_UINT;
- smp->data.uint = strm_sess(strm)->listener->nbconn;
+ smp->data.uint = sess->listener->nbconn;
return 1;
}
/* set temp integer to the id of the socket (listener) */
static int
-smp_fetch_so_id(struct proxy *px, struct stream *strm, unsigned int opt,
+smp_fetch_so_id(struct proxy *px, struct session *sess, struct stream *strm, unsigned int opt,
const struct arg *args, struct sample *smp, const char *kw, void *private)
{
smp->type = SMP_T_UINT;
- smp->data.uint = strm_sess(strm)->listener->luid;
+ smp->data.uint = sess->listener->luid;
return 1;
}