mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stream: provide a new stream creation function for connections

Browse Source 
The purpose will be to create new streams for a given connection so
that we can later abstract this from a mux.
This commit is contained in:
Willy Tarreau 2017-08-28 17:18:36 +02:00
parent 0b74eae1f1
commit 5790eb0a76
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/stream.h
View File

@ -36,6 +36,7 @@ extern struct list streams;
extern struct data_cb sess_conn_cb; extern struct data_cb sess_conn_cb;
struct stream *stream_new(struct session *sess, enum obj_type *origin); struct stream *stream_new(struct session *sess, enum obj_type *origin);
int stream_create_from_conn(struct connection *conn);
/* perform minimal intializations, report 0 in case of error, 1 if OK. */ /* perform minimal intializations, report 0 in case of error, 1 if OK. */
int init_stream(); int init_stream();

9
src/session.c
View File

@ -111,7 +111,6 @@ int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr
struct connection *cli_conn; struct connection *cli_conn;
struct proxy *p = l->bind_conf->frontend; struct proxy *p = l->bind_conf->frontend;
struct session *sess; struct session *sess;
struct stream *strm;
int ret; int ret;
@ -268,10 +267,9 @@ int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr
goto out_free_sess; goto out_free_sess;
session_count_new(sess); session_count_new(sess);
if ((strm = stream_new(sess, &cli_conn->obj_type)) == NULL) if (stream_create_from_conn(cli_conn) < 0)
goto out_free_sess; goto out_free_sess;
task_wakeup(strm->task, TASK_WOKEN_INIT);
return 1; return 1;
out_free_sess: out_free_sess:
@ -417,7 +415,6 @@ static struct task *session_expire_embryonic(struct task *t)
static int conn_complete_session(struct connection *conn) static int conn_complete_session(struct connection *conn)
{ {
struct session *sess = conn->owner; struct session *sess = conn->owner;
struct stream *strm;
conn_clear_xprt_done_cb(conn); conn_clear_xprt_done_cb(conn);
@ -436,11 +433,9 @@ static int conn_complete_session(struct connection *conn)
goto fail; goto fail;
session_count_new(sess); session_count_new(sess);
if ((strm = stream_new(sess, &conn->obj_type)) == NULL) if (stream_create_from_conn(conn) < 0)
goto fail; goto fail;
task_wakeup(strm->task, TASK_WOKEN_INIT);
/* the embryonic session's task is not needed anymore */ /* the embryonic session's task is not needed anymore */
task_delete(sess->task); task_delete(sess->task);
task_free(sess->task); task_free(sess->task);

17
src/stream.c
View File

@ -65,6 +65,23 @@ struct list streams;
/* List of all use-service keywords. */ /* List of all use-service keywords. */
static struct list service_keywords = LIST_HEAD_INIT(service_keywords); static struct list service_keywords = LIST_HEAD_INIT(service_keywords);
/* Create a new stream for connection <conn>. Return < 0 on error. This is only
* valid right after the handshake, before the connection's data layer is
* initialized, because it relies on the session to be in conn->owner.
*/
int stream_create_from_conn(struct connection *conn)
{
struct stream *strm;
strm = stream_new(conn->owner, &conn->obj_type);
if (strm == NULL)
return -1;
task_wakeup(strm->task, TASK_WOKEN_INIT);
return 0;
}
/* This function is called from the session handler which detects the end of /* 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 * handshake, in order to complete initialization of a valid stream. It must be
* called with a completley initialized session. It returns the pointer to * called with a completley initialized session. It returns the pointer to