commit 3610c39c8c67797fbd7cb589c694cc70386627db
author Thierry Fournier <tfournier@arpalert.org> Wed Apr 13 18:27:51 2016 +0200
committer Willy Tarreau <w@1wt.eu> Wed Apr 27 10:48:15 2016 +0200
tree 49234d9a24443db4c4d0b6ab5af4bf03155a0e12
parent 5c3ed3452943c187bac0b3132ee6d8f7cb48f746

MINOR: filters: add opaque data

Add opaque data between the filter keyword registrering and the parsing
function. This opaque data allow to use the same parser with differents
registered keywords. The opaque data is used for giving data which mainly
makes difference between the two keywords.

It will be used with Lua keywords registering.

include/types/filters.h

diff --git a/include/types/filters.h b/include/types/filters.h
index 0e4d99a..34818cf 100644
--- a/include/types/filters.h
+++ b/include/types/filters.h
@@ -38,7 +38,8 @@
 struct flt_kw {
 	const char *kw;
 	int (*parse)(char **args, int *cur_arg, struct proxy *px,
-		     struct flt_conf *fconf, char **err);
+		     struct flt_conf *fconf, char **err, void *private);
+	void *private;
 };
 
 /*

src/filters.c

diff --git a/src/filters.c b/src/filters.c
index cceca50..e96af31 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -206,7 +206,7 @@
 					  file, line, args[0], args[cur_arg]);
 				goto error;
 			}
-			if (kw->parse(args, &cur_arg, curpx, fconf, err) != 0) {
+			if (kw->parse(args, &cur_arg, curpx, fconf, err, kw->private) != 0) {
 				if (err && *err)
 					memprintf(err, "'%s' : '%s'",
 						  args[0], *err);

src/flt_http_comp.c

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index ee8f13b..fb431c1 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -830,7 +830,7 @@
 
 static int
 parse_http_comp_flt(char **args, int *cur_arg, struct proxy *px,
-			 struct flt_conf *fconf, char **err)
+                    struct flt_conf *fconf, char **err, void *private)
 {
 	struct flt_conf *fc, *back;
 
@@ -939,8 +939,8 @@
 
 /* Declare the filter parser for "compression" keyword */
 static struct flt_kw_list filter_kws = { "COMP", { }, {
-		{ "compression", parse_http_comp_flt },
-		{ NULL, NULL },
+		{ "compression", parse_http_comp_flt, NULL },
+		{ NULL, NULL, NULL },
 	}
 };
 

src/flt_trace.c

diff --git a/src/flt_trace.c b/src/flt_trace.c
index a45f4a0..8b47651 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -414,7 +414,7 @@
 /* Return -1 on error, else 0 */
 static int
 parse_trace_flt(char **args, int *cur_arg, struct proxy *px,
-		struct flt_conf *fconf, char **err)
+                struct flt_conf *fconf, char **err, void *private)
 {
 	struct trace_config *conf;
 	int                  pos = *cur_arg;
@@ -467,8 +467,8 @@
 
 /* Declare the filter parser for "trace" keyword */
 static struct flt_kw_list flt_kws = { "TRACE", { }, {
-		{ "trace", parse_trace_flt },
-		{ NULL, NULL },
+		{ "trace", parse_trace_flt, NULL },
+		{ NULL, NULL, NULL },
 	}
 };