commit 422a3af4cefaf1adcced7af9153ca0ae2d688ffb
author Thierry FOURNIER <tfournier@arpalert.org> Mon Aug 10 18:30:18 2015 +0200
committer Willy Tarreau <w@1wt.eu> Tue Aug 11 14:08:29 2015 +0200
tree e08c2250a73b2a42ee7d41d52364fdba04b3dea0
parent c89f4f530588a5c23a29d848d4a27a6799359dd4

MINOR: proto_tcp: add session in the action prototype

Some actions require the "struct session" while the "struct stream" is not
avalaible. This patch adds a pointer to the session.

src/hlua.c

diff --git a/src/hlua.c b/src/hlua.c
index 3a325b7..83e3058 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -4380,7 +4380,7 @@
  * "hlua_request_act_wrapper" for executing the LUA code.
  */
 int hlua_tcp_req_act_wrapper(struct tcp_rule *tcp_rule, struct proxy *px,
-                             struct stream *s)
+                             struct session *sess, struct stream *s)
 {
 	return hlua_request_act_wrapper((struct hlua_rule *)tcp_rule->act_prm.data[0],
 	                                px, s, AN_REQ_INSPECT_FE);
@@ -4390,7 +4390,7 @@
  * "hlua_request_act_wrapper" for executing the LUA code.
  */
 int hlua_tcp_res_act_wrapper(struct tcp_rule *tcp_rule, struct proxy *px,
-                             struct stream *s)
+                             struct session *sess, struct stream *s)
 {
 	return hlua_request_act_wrapper((struct hlua_rule *)tcp_rule->act_prm.data[0],
 	                                px, s, AN_RES_INSPECT);

src/proto_tcp.c

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index e499868..00c308a 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -1231,7 +1231,7 @@
 			}
 			else {
 				/* Custom keywords. */
-				if (rule->action_ptr && !rule->action_ptr(rule, s->be, s)) {
+				if (rule->action_ptr && !rule->action_ptr(rule, s->be, s->sess, s)) {
 					s->current_rule = rule;
 					goto missing_data;
 				}
@@ -1356,7 +1356,7 @@
 			}
 			else {
 				/* Custom keywords. */
-				if (rule->action_ptr && !rule->action_ptr(rule, s->be, s)) {
+				if (rule->action_ptr && !rule->action_ptr(rule, s->be, s->sess, s)) {
 					channel_dont_close(rep);
 					s->current_rule = rule;
 					return 0;
@@ -1441,7 +1441,7 @@
 			else {
 				/* Custom keywords. */
 				if (rule->action_ptr) {
-					rule->action_ptr(rule, sess->fe, NULL);
+					rule->action_ptr(rule, sess->fe, sess, NULL);
 					if (rule->action == TCP_ACT_CUSTOM_CONT)
 						continue;
 				}

src/vars.c

diff --git a/src/vars.c b/src/vars.c
index d233c88..02d472a 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -502,7 +502,8 @@
 }
 
 /* Returns 0 if miss data, else returns 1. */
-static int action_tcp_req_store(struct tcp_rule *rule, struct proxy *px, struct stream *s)
+static int action_tcp_req_store(struct tcp_rule *rule, struct proxy *px,
+                                struct session *sess, struct stream *s)
 {
 	struct sample_expr *expr = rule->act_prm.data[0];
 	const char *name = rule->act_prm.data[1];
@@ -512,7 +513,8 @@
 }
 
 /* Returns 0 if miss data, else returns 1. */
-static int action_tcp_res_store(struct tcp_rule *rule, struct proxy *px, struct stream *s)
+static int action_tcp_res_store(struct tcp_rule *rule, struct proxy *px,
+                                struct session *sess, struct stream *s)
 {
 	struct sample_expr *expr = rule->act_prm.data[0];
 	const char *name = rule->act_prm.data[1];