From 73b65acd46dda979577f667729e36966f8e0b511 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 8 Apr 2015 18:26:29 +0200
Subject: [PATCH] MINOR: stream: pass the pointer to the origin explicitly to
 stream_new()

We don't pass sess->origin anymore but the pointer to the previous step. Now
it should be much easier to chain elements together once applets are moved out
of streams. Indeed, the session is only used for configuration and not for the
dynamic chaining anymore.
---
 include/proto/stream.h |  2 +-
 src/hlua.c             |  2 +-
 src/peers.c            |  2 +-
 src/session.c          |  4 ++--
 src/stream.c           | 18 +++++++++---------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/proto/stream.h b/include/proto/stream.h
index 820cf4747..d4f82136b 100644
--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@@ -36,7 +36,7 @@ extern struct list buffer_wq;
 
 extern struct data_cb sess_conn_cb;
 
-struct stream *stream_new(struct session *sess, struct task *t);
+struct stream *stream_new(struct session *sess, struct task *t, enum obj_type *origin);
 
 /* perform minimal intializations, report 0 in case of error, 1 if OK. */
 int init_stream();
diff --git a/src/hlua.c b/src/hlua.c
index 1beafeb01..702ba4093 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2197,7 +2197,7 @@ __LJMP static int hlua_socket_new(lua_State *L)
 	}
 	task->nice = 0;
 
-	strm = stream_new(sess, task);
+	strm = stream_new(sess, task, &appctx->obj_type);
 	if (!strm) {
 		hlua_pusherror(L, "socket: out of memory");
 		goto out_fail_stream;
diff --git a/src/peers.c b/src/peers.c
index 084a97b8d..067612082 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1140,7 +1140,7 @@ static struct stream *peer_session_create(struct peer *peer, struct peer_session
 	}
 	t->nice = l->nice;
 
-	if ((s = stream_new(sess, t)) == NULL) {
+	if ((s = stream_new(sess, t, &appctx->obj_type)) == NULL) {
 		Alert("Failed to initialize stream in peer_session_create().\n");
 		goto out_free_task;
 	}
diff --git a/src/session.c b/src/session.c
index 714d15ccf..7189fbeeb 100644
--- a/src/session.c
+++ b/src/session.c
@@ -259,7 +259,7 @@ int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr
 		cli_conn->flags |= CO_FL_XPRT_TRACKED;
 
 	session_count_new(sess);
-	strm = stream_new(sess, t);
+	strm = stream_new(sess, t, &cli_conn->obj_type);
 	if (!strm)
 		goto out_free_task;
 
@@ -424,7 +424,7 @@ static int conn_complete_session(struct connection *conn)
 
 	session_count_new(sess);
 	task->process = sess->listener->handler;
-	strm = stream_new(sess, task);
+	strm = stream_new(sess, task, &conn->obj_type);
 	if (!strm)
 		goto fail;
 
diff --git a/src/stream.c b/src/stream.c
index ea24f9f42..e9a4b0d5b 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -57,18 +57,18 @@ struct list streams;
 struct list buffer_wq = LIST_HEAD_INIT(buffer_wq);
 
 /* This function is called from the session handler which detects the end of
- * handshake, in order to complete initialization of a valid stream. It must
- * be called with an embryonic session. It returns the pointer to the newly
- * created stream, or NULL in case of fatal error. For now the client-side
- * end point is taken from the session's origin, which must be valid.
- * The task's context is set to the new stream, and its function is set to
- * process_stream(). Target and analysers are null.
+ * handshake, in order to complete initialization of a valid stream. It must be
+ * called with a session (which may be embryonic). It returns the pointer to
+ * the newly created stream, or NULL in case of fatal error. The client-facing
+ * end point is assigned to <origin>, which must be valid. The task's context
+ * is set to the new stream, and its function is set to process_stream().
+ * Target and analysers are null.
  */
-struct stream *stream_new(struct session *sess, struct task *t)
+struct stream *stream_new(struct session *sess, struct task *t, enum obj_type *origin)
 {
 	struct stream *s;
-	struct connection *conn = objt_conn(sess->origin);
-	struct appctx *appctx   = objt_appctx(sess->origin);
+	struct connection *conn = objt_conn(origin);
+	struct appctx *appctx   = objt_appctx(origin);
 
 	if (unlikely((s = pool_alloc2(pool2_stream)) == NULL))
 		return s;