[stream] simple_socket_io: convert opaque context type to buffer

Change-Id: I9106315018ff0ca8d5f1db3fdceba4221c0d7794

Author: stbuehler

include/lighttpd/stream.h

@@ -100,8 +100,10 @@ LI_API void li_iostream_attach(liIOStream *iostream, liWorker *wrk);
 
 /* handles basic tcp/unix socket connections, writing and reading data, supports throttling */
 LI_API void li_stream_simple_socket_close(liIOStream *stream, gboolean aborted);
+/* li_stream_simple_socket_io_cb can be used with li_iostream_new and uses stream->data as buffer */
 LI_API void li_stream_simple_socket_io_cb(liIOStream *stream, liIOStreamEvent event);
-LI_API void li_stream_simple_socket_io_cb_with_context(liIOStream *stream, liIOStreamEvent event, gpointer *data);
+/* read buffer probably should be (indirectly) stored in stream->data; LI_IOSTREAM_DESTROY frees the buffer and clears the pointer */
+LI_API void li_stream_simple_socket_io_cb_with_buffer(liIOStream *stream, liIOStreamEvent event, liBuffer **buffer);
 /* tries to flush TCP sockets by disabling nagle */
 LI_API void li_stream_simple_socket_flush(liIOStream *stream);
 

src/main/connection.c

@@ -12,9 +12,9 @@ void li_connection_simple_tcp(liConnection **pcon, liIOStream *stream, gpointer
 	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_context(stream, event, context);
+	li_stream_simple_socket_io_cb_with_buffer(stream, event, (liBuffer**) context);
 
-	/* li_stream_simple_socket_io_cb_with_context might lead to *pcon == NULL */
+	/* li_stream_simple_socket_io_cb_with_buffer might lead to *pcon == NULL */
 	con = *pcon;
 	if (NULL != con) {
 		if (NULL != stream->stream_in.out) {

src/main/stream_simple_socket.c

@@ -42,7 +42,7 @@ static void stream_simple_socket_read_throttle_notify(liThrottleState *state, gp
 	stream->can_read = TRUE;
 	li_stream_again(&stream->stream_out);
 }
-static void stream_simple_socket_read(liIOStream *stream, gpointer *data) {
+static void stream_simple_socket_read(liIOStream *stream, liBuffer **buffer) {
 	liNetworkStatus res;
 	GError *err = NULL;
 	liWorker *wrk = li_worker_from_iostream(stream);
@@ -58,27 +58,25 @@ static void stream_simple_socket_read(liIOStream *stream, gpointer *data) {
 		}
 	}
 
-	if (NULL == *data && NULL != wrk->network_read_buf) {
+	if (NULL == *buffer && NULL != wrk->network_read_buf) {
 		/* reuse worker buf if needed */
-		*data = wrk->network_read_buf;
+		*buffer = wrk->network_read_buf;
 		wrk->network_read_buf = NULL;
 	}
 
 	{
 		goffset current_in_bytes = raw_in->bytes_in;
-		liBuffer *raw_in_buffer = *data;
-		res = li_network_read(fd, raw_in, max_read, &raw_in_buffer, &err);
-		*data = raw_in_buffer;
+		res = li_network_read(fd, raw_in, max_read, buffer, &err);
 		if (NULL != stream->throttle_in) {
 			li_throttle_update(stream->throttle_in, raw_in->bytes_in - current_in_bytes);
 		}
 	}
 
-	if (NULL == wrk->network_read_buf && NULL != *data
-		&& 1 == g_atomic_int_get(&((liBuffer*)*data)->refcount)) {
+	if (NULL == wrk->network_read_buf && NULL != *buffer
+		&& 1 == g_atomic_int_get(&((liBuffer*)*buffer)->refcount)) {
 		/* move buffer back to worker if we didn't use it */
-		wrk->network_read_buf = *data;
-		*data = NULL;
+		wrk->network_read_buf = *buffer;
+		*buffer = NULL;
 	}
 
 	switch (res) {
@@ -165,21 +163,21 @@ static void stream_simple_socket_write(liIOStream *stream) {
 }
 
 void li_stream_simple_socket_io_cb(liIOStream *stream, liIOStreamEvent event) {
-	li_stream_simple_socket_io_cb_with_context(stream, event, &stream->data);
+	li_stream_simple_socket_io_cb_with_buffer(stream, event, (liBuffer**) &stream->data);
 }
 
-void li_stream_simple_socket_io_cb_with_context(liIOStream *stream, liIOStreamEvent event, gpointer *data) {
+void li_stream_simple_socket_io_cb_with_buffer(liIOStream *stream, liIOStreamEvent event, liBuffer **buffer) {
 	switch (event) {
 	case LI_IOSTREAM_READ:
-		stream_simple_socket_read(stream, data);
+		stream_simple_socket_read(stream, buffer);
 		break;
 	case LI_IOSTREAM_WRITE:
 		stream_simple_socket_write(stream);
 		break;
 	case LI_IOSTREAM_DESTROY:
-		if (NULL != *data) {
-			li_buffer_release(*data);
-			*data = NULL;
+		if (NULL != *buffer) {
+			li_buffer_release(*buffer);
+			*buffer = NULL;
 		}
 	default:
 		break;

src/modules/mod_proxy.c

@@ -33,7 +33,7 @@ struct proxy_context {
 struct proxy_connection {
 	proxy_context *ctx;
 	liBackendConnection *bcon;
-	gpointer simple_socket_data;
+	liBuffer *simple_socket_buffer;
 };
 
 /**********************************************************************************/
@@ -169,7 +169,7 @@ static void proxy_io_cb(liIOStream *stream, liIOStreamEvent event) {
 	proxy_connection *con = stream->data;
 	liWorker *wrk = li_worker_from_iostream(stream);
 
-	li_stream_simple_socket_io_cb_with_context(stream, event, &con->simple_socket_data);
+	li_stream_simple_socket_io_cb_with_buffer(stream, event, &con->simple_socket_buffer);
 
 	switch (event) {
 	case LI_IOSTREAM_DESTROY:

src/modules/mod_scgi.c

@@ -30,7 +30,7 @@ struct scgi_context {
 struct scgi_connection {
 	scgi_context *ctx;
 	liBackendConnection *bcon;
-	gpointer simple_socket_data;
+	liBuffer *simple_socket_buffer;
 };
 
 /**********************************************************************************/
@@ -143,7 +143,7 @@ static void scgi_io_cb(liIOStream *stream, liIOStreamEvent event) {
 	scgi_connection *con = stream->data;
 	liWorker *wrk = li_worker_from_iostream(stream);
 
-	li_stream_simple_socket_io_cb_with_context(stream, event, &con->simple_socket_data);
+	li_stream_simple_socket_io_cb_with_buffer(stream, event, &con->simple_socket_buffer);
 
 	switch (event) {
 	case LI_IOSTREAM_DESTROY: