mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 09:07:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: connection: remove an unwelcome dependency on struct stream

Browse Source 
There was a reference to struct stream in conn_free() for the case
where we're freeing a connection that doesn't have a mux attached.
For now we know it's always a stream, and we only need to do it to
put a NULL in s->si[1].end.

Let's do it better by storing the pointer to si[1].end in the context
and specifying that this pointer is always nulled if the mux is null.
This way it allows a connection to detach itself from wherever it's
being used. Maybe we could even get rid of the condition on the mux.
This commit is contained in:
Willy Tarreau 2018-12-19 14:36:29 +01:00
parent 3d2ee55ebd
commit 94031d30d7
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/proto/connection.h
View File

@ -669,15 +669,14 @@ static inline void conn_free(struct connection *conn)
sess->resp_conns--; sess->resp_conns--;
LIST_DEL(&conn->session_list); LIST_DEL(&conn->session_list);
} }
/* If we temporarily stored the connection as the stream_interface's
* end point, remove it.
*/
if (conn->ctx != NULL && conn->mux == NULL) {
struct stream *s = conn->ctx;
if (objt_conn(s->si[1].end) == conn) /* By convention we always place a NULL where the ctx points to if the
s->si[1].end = NULL; * mux is null. It may have been used to store the connection as a
} * stream_interface's end point for example.
*/
if (conn->ctx != NULL && conn->mux == NULL)
*(void **)conn->ctx = NULL;
/* The connection is currently in the server's idle list, so tell it /* The connection is currently in the server's idle list, so tell it
* there's one less connection available in that list. * there's one less connection available in that list.
*/ */

9
src/backend.c
View File

@ -1052,12 +1052,13 @@ static void assign_tproxy_address(struct stream *s)
#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation) #if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
/* /*
* Pick the right mux once the connection is established, we should now have * Pick the right mux once the connection is established, we should now have
* an alpn if available, so we are now able to choose. * an alpn if available, so we are now able to choose. In this specific case
* the connection's context is &si[i].end.
*/ */
static int conn_complete_server(struct connection *conn) static int conn_complete_server(struct connection *conn)
{ {
struct conn_stream *cs = NULL; struct conn_stream *cs = NULL;
struct stream *s = conn->ctx; struct stream *s = container_of(conn->ctx, struct stream, si[1].end);
struct server *srv; struct server *srv;
task_wakeup(s->task, TASK_WOKEN_IO); task_wakeup(s->task, TASK_WOKEN_IO);
@ -1066,8 +1067,6 @@ static int conn_complete_server(struct connection *conn)
if (unlikely(!(conn->flags & (CO_FL_WAIT_L4_CONN | CO_FL_WAIT_L6_CONN | CO_FL_CONNECTED)))) if (unlikely(!(conn->flags & (CO_FL_WAIT_L4_CONN | CO_FL_WAIT_L6_CONN | CO_FL_CONNECTED))))
conn->flags |= CO_FL_CONNECTED; conn->flags |= CO_FL_CONNECTED;
if (!s)
goto fail;
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
goto fail; goto fail;
si_detach_endpoint(&s->si[1]); si_detach_endpoint(&s->si[1]);
@ -1338,7 +1337,7 @@ int connect_server(struct stream *s)
} }
#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation) #if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
else { else {
srv_conn->ctx = s; srv_conn->ctx = &s->si[1].end;
/* Store the connection into the stream interface, /* Store the connection into the stream interface,
* while we still don't have a mux, so that if the * while we still don't have a mux, so that if the
* stream is destroyed before the connection is * stream is destroyed before the connection is