MEDIUM: stream: allocate the session when a stream is created
This is where we'll put some session-wide information.
diff --git a/src/haproxy.c b/src/haproxy.c
index 591bb96..4510375 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1433,6 +1433,7 @@
}
pool_destroy2(pool2_stream);
+ pool_destroy2(pool2_session);
pool_destroy2(pool2_connection);
pool_destroy2(pool2_buffer);
pool_destroy2(pool2_requri);
diff --git a/src/hlua.c b/src/hlua.c
index cdbce00..4b56187 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -31,6 +31,7 @@
#include <proto/raw_sock.h>
#include <proto/sample.h>
#include <proto/server.h>
+#include <proto/session.h>
#include <proto/stream.h>
#include <proto/ssl_sock.h>
#include <proto/stream_interface.h>
@@ -2025,17 +2026,22 @@
* Get memory for the request.
*
*/
+ socket->s->sess = pool_alloc2(pool2_session);
+ if (!socket->s->sess) {
+ hlua_pusherror(L, "socket: out of memory");
+ goto out_fail_conf;
+ }
socket->s = pool_alloc2(pool2_stream);
if (!socket->s) {
hlua_pusherror(L, "socket: out of memory");
- goto out_fail_conf;
+ goto out_fail_stream;
}
socket->s->task = task_new();
if (!socket->s->task) {
hlua_pusherror(L, "socket: out of memory");
- goto out_free_session;
+ goto out_fail_task;
}
socket->s->req.buf = pool_alloc2(pool2_buffer);
@@ -2127,7 +2133,6 @@
/* The stream dont have listener. The listener is used with real
* proxies.
*/
- socket->s->sess = NULL;
socket->s->listener = NULL;
/* The flags are initialized to 0. Values are setted later. */
@@ -2228,8 +2233,10 @@
pool_free2(pool2_buffer, socket->s->req.buf);
out_fail_req_buf:
task_free(socket->s->task);
-out_free_session:
+out_fail_task:
pool_free2(pool2_stream, socket->s);
+out_fail_stream:
+ pool_free2(pool2_session, socket->s->sess);
out_fail_conf:
WILL_LJMP(lua_error(L));
return 0;
diff --git a/src/peers.c b/src/peers.c
index 0a66010..2801320 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -38,6 +38,7 @@
#include <proto/proto_tcp.h>
#include <proto/proto_http.h>
#include <proto/proxy.h>
+#include <proto/session.h>
#include <proto/stream.h>
#include <proto/signal.h>
#include <proto/stick_table.h>
@@ -1132,7 +1133,7 @@
*/
if ((t = task_new()) == NULL) { /* disable this proxy for a while */
Alert("out of memory in peer_session_create().\n");
- goto out_free_session;
+ goto out_free_stream;
}
ps->reconnect = tick_add(now_ms, MS_TO_TICKS(5000));
@@ -1144,7 +1145,11 @@
s->task = t;
s->listener = l;
- s->sess = NULL;
+ s->sess = pool_alloc2(pool2_session);
+ if (!s->sess) {
+ Alert("out of memory in peer_session_create().\n");
+ goto out_free_task;
+ }
/* Note: initially, the stream's backend points to the frontend.
* This changes later when switching rules are executed or
@@ -1275,8 +1280,10 @@
/* Error unrolling */
out_fail_conn1:
+ pool_free2(pool2_session, s->sess);
+ out_free_task:
task_free(t);
- out_free_session:
+ out_free_stream:
LIST_DEL(&s->list);
pool_free2(pool2_stream, s);
out_close:
diff --git a/src/stream.c b/src/stream.c
index aaea9c0..e81de2a 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -37,6 +37,7 @@
#include <proto/listener.h>
#include <proto/log.h>
#include <proto/raw_sock.h>
+#include <proto/session.h>
#include <proto/stream.h>
#include <proto/pipe.h>
#include <proto/proto_http.h>
@@ -116,7 +117,10 @@
memset(s->stkctr, 0, sizeof(s->stkctr));
- s->sess = NULL;
+ s->sess = pool_alloc2(pool2_session);
+ if (!s->sess)
+ goto out_free_stream;
+
s->listener = l;
s->fe = p;
@@ -235,6 +239,8 @@
out_free_task:
task_free(t);
out_free_session:
+ pool_free2(pool2_session, s->sess);
+ out_free_stream:
p->feconn--;
stream_store_counters(s);
pool_free2(pool2_stream, s);
@@ -352,6 +358,10 @@
task_delete(s->task);
task_free(s->task);
+ /* FIXME: for now we have a 1:1 relation between stream and session so
+ * the stream must free the session.
+ */
+ pool_free2(pool2_session, s->sess);
pool_free2(pool2_stream, s);
}
@@ -655,6 +665,11 @@
LIST_DEL(&s->list);
si_release_endpoint(&s->si[1]);
si_release_endpoint(&s->si[0]);
+
+ /* FIXME: for now we have a 1:1 relation between stream and session so
+ * the stream must free the session.
+ */
+ pool_free2(pool2_session, s->sess);
pool_free2(pool2_stream, s);
/* We may want to free the maximum amount of pools if the proxy is stopping */
@@ -664,6 +679,7 @@
pool_flush2(pool2_requri);
pool_flush2(pool2_capture);
pool_flush2(pool2_stream);
+ pool_flush2(pool2_session);
pool_flush2(pool2_connection);
pool_flush2(pool2_pendconn);
pool_flush2(fe->req_cap_pool);