From 93db5129213a95393705c723be828e32d5ce9198 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 10 May 2014 13:26:22 +0200
Subject: [PATCH] do not separately allocate buffer, but place it instead into
 worker structure.

---
 src/worker-vpn.c | 19 ++++---------------
 src/worker.h     |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/worker-vpn.c b/src/worker-vpn.c
index 3a74cc2a..ef9e48ea 100644
--- a/src/worker-vpn.c
+++ b/src/worker-vpn.c
@@ -1323,15 +1323,7 @@ static int connect_handler(worker_st * ws)
 	sigemptyset(&emptyset);
 	sigaddset(&blockset, SIGTERM);
 
-	ws->buffer_size = 16 * 1024;
-	ws->buffer = talloc_size(ws, ws->buffer_size);
-	if (ws->buffer == NULL) {
-		oclog(ws, LOG_INFO, "memory error");
-		tls_puts(ws->session,
-			 "HTTP/1.1 503 Service Unavailable\r\n\r\n");
-		tls_close(ws->session);
-		exit_worker(ws);
-	}
+	ws->buffer_size = sizeof(ws->buffer);
 
 	if (ws->auth_state != S_AUTH_COMPLETE && req->cookie_set == 0) {
 		oclog(ws, LOG_INFO, "connect request without authentication");
@@ -1760,13 +1752,10 @@ static int connect_handler(worker_st * ws)
 	SEND_ERR(ret);
 
 	if (ws->buffer_size <= ws->conn_mtu + CSTP_OVERHEAD) {
-		oclog(ws, LOG_WARNING,
-		      "buffer size is smaller than MTU (%u < %u); adjusting",
+		oclog(ws, LOG_ERR,
+		      "buffer size is smaller than MTU (%u < %u)",
 		      ws->buffer_size, ws->conn_mtu);
-		ws->buffer_size = ws->conn_mtu + CSTP_OVERHEAD;
-		ws->buffer = talloc_realloc_size(ws, ws->buffer, ws->buffer_size);
-		if (ws->buffer == NULL)
-			goto exit;
+		goto exit;
 	}
 
 	mtu_send(ws, ws->conn_mtu);
diff --git a/src/worker.h b/src/worker.h
index 626df961..f718f3eb 100644
--- a/src/worker.h
+++ b/src/worker.h
@@ -188,7 +188,7 @@ typedef struct worker_st {
 	unsigned full_ipv6;
 
 	/* Buffer used by worker */
-	uint8_t * buffer;
+	uint8_t buffer[16*1024];
 	unsigned buffer_size;
 
 	/* the following are set only if authentication is complete */