MINOR: sample: fill the struct sample with the options.
Options are relative to the sample. Each sample fetched is associated with
fetch options or fetch flags.
This patch adds the 'opt' vaue in the sample struct. This permits to reduce
the sample-fetch function prototype. In other way, the converters will have
more detail about the origin of the sample.
diff --git a/include/types/sample.h b/include/types/sample.h
index 07b12f3..117b060 100644
--- a/include/types/sample.h
+++ b/include/types/sample.h
@@ -252,6 +252,7 @@
struct proxy *px;
struct session *sess;
struct stream *strm;
+ unsigned int opt; /* fetch options (SMP_OPT_*) */
};
/* Used to store sample constant */
diff --git a/src/hlua.c b/src/hlua.c
index d45cac9..2621630 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2773,6 +2773,7 @@
smp.px = hsmp->p;
smp.sess = hsmp->s->sess;
smp.strm = hsmp->s;
+ smp.opt = 0;
if (!f->process(0, args, &smp, f->kw, f->private)) {
if (hsmp->stringsafe)
lua_pushstring(L, "");
@@ -2894,6 +2895,7 @@
smp.px = hsmp->p;
smp.sess = hsmp->s->sess;
smp.strm = hsmp->s;
+ smp.opt = 0;
if (!conv->process(args, &smp, conv->private)) {
if (hsmp->stringsafe)
lua_pushstring(L, "");
diff --git a/src/sample.c b/src/sample.c
index 8cc2234..353d6bb 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -1036,6 +1036,7 @@
p->px = px;
p->sess = sess;
p->strm = strm;
+ p->opt = opt;
if (!expr->fetch->process(opt, expr->arg_p, p, expr->fetch->kw, expr->fetch->private))
return NULL;