[connection] use proper struct for li_connection_simple_tcp state

Change-Id: I8fc02df976a66367306f09404330ebf6621851db

Author: stbuehler

include/lighttpd/connection.h

@@ -35,6 +35,7 @@ typedef enum {
 
 typedef struct liConnectionSocketCallbacks liConnectionSocketCallbacks;
 typedef struct liConnectionSocket liConnectionSocket;
+typedef struct liConnectionSimpleTcpState liConnectionSimpleTcpState;
 
 struct liConnectionSocketCallbacks {
 	void (*finish)(liConnection *con, gboolean aborted);
@@ -84,6 +85,10 @@ struct liConnection {
 	liJob job_reset;
 };
 
+struct liConnectionSimpleTcpState {
+	liBuffer *read_buffer;
+};
+
 /* Internal functions */
 LI_API liConnection* li_connection_new(liWorker *wrk);
 /** Free dead connections */
@@ -106,9 +111,9 @@ LI_API gchar *li_connection_state_str(liConnectionState state);
 LI_API liConnection* li_connection_from_vrequest(liVRequest *vr);
 
 
-/******************************************************/
-/* IO backend stuff (simple tcp, tls implementations) */
-/******************************************************/
+/****************************************************************/
+/* IO backend stuff (simple tcp (or unix), tls implementations) */
+/****************************************************************/
 
 /* call after IO send operations if con->out_has_all_data and out queues are empty */
 LI_API void li_connection_request_done(liConnection *con);
@@ -118,14 +123,26 @@ LI_API void li_connection_request_done(liConnection *con);
  */
 LI_API void li_connection_update_io_timeout(liConnection *con);
 
+INLINE void li_connection_simple_tcp_init(liConnectionSimpleTcpState *state);
+
 /* handles IOStream events for a connection; updates transferred bytes and io timeouts;
  * *pcon is needed to handle cases then the connections gets reset while handling io stuff
  * NULL == *pcon is ok - it won't update transferred bytes and io timeouts then.
  * closes outgoing stream on reading EOF
+ *
+ * clear state by calling with LI_IOSTREAM_DESTROY (through li_iostream_release
+ * and the liIOStreamCB forwarding to li_connection_simple_tcp).
  */
-LI_API void li_connection_simple_tcp(liConnection **pcon, liIOStream *stream, gpointer *context, liIOStreamEvent event);
+LI_API void li_connection_simple_tcp(liConnection **pcon, liIOStream *stream, liConnectionSimpleTcpState *state, liIOStreamEvent event);
 
 /******************************************************/
 
+/********************
+ * Inline functions *
+ ********************/
+
+INLINE void li_connection_simple_tcp_init(liConnectionSimpleTcpState *state) {
+	state->read_buffer = NULL;
+}
 
 #endif

src/main/connection.c

@@ -5,14 +5,14 @@
 
 #define LI_CONNECTION_DEFAULT_CHUNKQUEUE_LIMIT (256*1024)
 
-void li_connection_simple_tcp(liConnection **pcon, liIOStream *stream, gpointer *context, liIOStreamEvent event) {
+void li_connection_simple_tcp(liConnection **pcon, liIOStream *stream, liConnectionSimpleTcpState *state, liIOStreamEvent event) {
 	liConnection *con;
 	goffset transfer_in = 0, transfer_out = 0;
 
 	transfer_in = (NULL != stream->stream_in.out) ? stream->stream_in.out->bytes_in : 0;
 	transfer_out = (NULL != stream->stream_out.out) ? stream->stream_out.out->bytes_out : 0;
 
-	li_stream_simple_socket_io_cb_with_buffer(stream, event, (liBuffer**) context);
+	li_stream_simple_socket_io_cb_with_buffer(stream, event, &state->read_buffer);
 
 	/* li_stream_simple_socket_io_cb_with_buffer might lead to *pcon == NULL */
 	con = *pcon;
@@ -64,7 +64,7 @@ void li_connection_simple_tcp(liConnection **pcon, liIOStream *stream, gpointer
 typedef struct simple_tcp_connection simple_tcp_connection;
 struct simple_tcp_connection {
 	liIOStream *sock_stream;
-	gpointer simple_tcp_context;
+	liConnectionSimpleTcpState simple_tcp_state;
 	liConnection *con;
 };
 
@@ -74,7 +74,7 @@ static void simple_tcp_io_cb(liIOStream *stream, liIOStreamEvent event) {
 	LI_FORCE_ASSERT(NULL == data->con || data == data->con->con_sock.data);
 	LI_FORCE_ASSERT(NULL == data->sock_stream || stream == data->sock_stream);
 
-	li_connection_simple_tcp(&data->con, stream, &data->simple_tcp_context, event);
+	li_connection_simple_tcp(&data->con, stream, &data->simple_tcp_state, event);
 
 	if (NULL != data->con && data->con->out_has_all_data
 	    && (NULL == stream->stream_out.out || 0 == stream->stream_out.out->length)) {
@@ -140,7 +140,7 @@ static const liConnectionSocketCallbacks simple_tcp_cbs = {
 static gboolean simple_tcp_new(liConnection *con, int fd) {
 	simple_tcp_connection *data = g_slice_new0(simple_tcp_connection);
 	data->sock_stream = li_iostream_new(con->wrk, fd, simple_tcp_io_cb, data);
-	data->simple_tcp_context = NULL;
+	li_connection_simple_tcp_init(&data->simple_tcp_state);
 	data->con = con;
 	con->con_sock.data = data;
 	con->con_sock.callbacks = &simple_tcp_cbs;

src/modules/mod_gnutls.c

@@ -46,7 +46,7 @@ struct mod_connection_ctx {
 	liGnuTLSFilter *tls_filter;
 
 	liIOStream *sock_stream;
-	gpointer simple_socket_data;
+	liConnectionSimpleTcpState simple_socket_state;
 
 	liStream *client_hello_stream;
 #ifdef USE_SNI
@@ -344,7 +344,7 @@ static void tcp_io_cb(liIOStream *stream, liIOStreamEvent event) {
 		li_stream_simple_socket_close(stream, TRUE); /* kill it, ssl sent an close alert message */
 	}
 
-	li_connection_simple_tcp(&conctx->con, stream, &conctx->simple_socket_data, event);
+	li_connection_simple_tcp(&conctx->con, stream, &conctx->simple_socket_state, event);
 
 	if (NULL != conctx->con && conctx->con->out_has_all_data
 	    && (NULL == stream->stream_out.out || 0 == stream->stream_out.out->length)
@@ -602,6 +602,7 @@ static gboolean mod_gnutls_con_new(liConnection *con, int fd) {
 	conctx = g_slice_new0(mod_connection_ctx);
 	conctx->session = session;
 	conctx->sock_stream = li_iostream_new(con->wrk, fd, tcp_io_cb, conctx);
+	li_connection_simple_tcp_init(&conctx->simple_socket_state);
 
 	conctx->client_hello_stream = li_ssl_client_hello_stream(&con->wrk->loop, gnutls_client_hello_cb, conctx);
 #ifdef USE_SNI

src/modules/mod_openssl.c

@@ -42,7 +42,7 @@ struct openssl_connection_ctx {
 	liOpenSSLFilter *ssl_filter;
 
 	liIOStream *sock_stream;
-	gpointer simple_socket_data;
+	liConnectionSimpleTcpState simple_socket_state;
 };
 
 struct openssl_context {
@@ -92,7 +92,7 @@ static void tcp_io_cb(liIOStream *stream, liIOStreamEvent event) {
 		li_stream_simple_socket_close(stream, TRUE); /* kill it, ssl sent an close alert message */
 	}
 
-	li_connection_simple_tcp(&conctx->con, stream, &conctx->simple_socket_data, event);
+	li_connection_simple_tcp(&conctx->con, stream, &conctx->simple_socket_state, event);
 
 	if (NULL != conctx->con && conctx->con->out_has_all_data
 	    && (NULL == stream->stream_out.out || 0 == stream->stream_out.out->length)
@@ -206,6 +206,7 @@ static gboolean openssl_con_new(liConnection *con, int fd) {
 	openssl_connection_ctx *conctx = g_slice_new0(openssl_connection_ctx);
 
 	conctx->sock_stream = li_iostream_new(con->wrk, fd, tcp_io_cb, conctx);
+	li_connection_simple_tcp_init(&conctx->simple_socket_state);
 
 	conctx->ssl_filter = li_openssl_filter_new(srv, con->wrk, &filter_callbacks, conctx, ctx->ssl_ctx,
 		&conctx->sock_stream->stream_in, &conctx->sock_stream->stream_out);