GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not separately allocate buffer, but place it instead into worker structure.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-05-10 13:26:22 +02:00
parent 0c86299a18
commit 93db512921
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/worker-vpn.c
View File

@@ -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);

2
src/worker.h
View File

@@ -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 */