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

tls_recv -> cstp_recv

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2016-01-19 14:02:21 +01:00
parent 3e556f21df
commit f5e5bde862
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tlslib.c
View File

@@ -135,7 +135,7 @@ int ret;
}
/* Restores gnutls_record_recv() on EAGAIN */
ssize_t tls_recv(worker_st *ws, void *data, size_t data_size)
ssize_t cstp_recv(worker_st *ws, void *data, size_t data_size)
{
int ret;
int counter = 5;

21
src/tlslib.h
View File

@@ -37,25 +37,6 @@ typedef struct
unsigned int entries;
} tls_sess_db_st;
#if 0
#define tls_puts(s, str) tls_send(s, str, sizeof(str)-1)
int __attribute__ ((format(printf, 2, 3)))
tls_printf(gnutls_session_t session, const char *fmt, ...);
#define tls_recv_nb gnutls_record_recv
ssize_t tls_recv(gnutls_session_t session, void *data, size_t data_size);
ssize_t tls_send(gnutls_session_t session, const void *data,
size_t data_size);
ssize_t tls_send_nb(gnutls_session_t session, const void *data,
size_t data_size);
void tls_cork(gnutls_session_t session);
int tls_uncork(gnutls_session_t session);
ssize_t tls_send_file(gnutls_session_t session, const char *file);
#endif
typedef struct tls_st {
gnutls_certificate_credentials_t xcred;
gnutls_priority_t cprio;
@@ -131,7 +112,7 @@ int __attribute__ ((format(printf, 2, 3)))
void cstp_close(struct worker_st *ws);
void cstp_fatal_close(struct worker_st *ws,
gnutls_alert_description_t a);
ssize_t tls_recv(struct worker_st *ws, void *data, size_t data_size);
ssize_t cstp_recv(struct worker_st *ws, void *data, size_t data_size);
ssize_t cstp_recv_nb(struct worker_st *ws, void *data, size_t data_size);
ssize_t cstp_send_file(struct worker_st *ws, const char *file);
ssize_t cstp_send(struct worker_st *ws, const void *data,

4
src/worker-vpn.c
View File

@@ -504,7 +504,7 @@ void vpn_server(struct worker_st *ws)
http_req_reset(ws);
/* parse as we go */
do {
nrecvd = tls_recv(ws, ws->buffer, sizeof(ws->buffer));
nrecvd = cstp_recv(ws, ws->buffer, sizeof(ws->buffer));
if (nrecvd <= 0) {
if (nrecvd == 0)
goto finish;
@@ -540,7 +540,7 @@ void vpn_server(struct worker_st *ws)
/* continue reading */
oclog(ws, LOG_HTTP_DEBUG, "HTTP POST %s", ws->req.url);
while (ws->req.message_complete == 0) {
nrecvd = tls_recv(ws, ws->buffer, sizeof(ws->buffer));
nrecvd = cstp_recv(ws, ws->buffer, sizeof(ws->buffer));
CSTP_FATAL_ERR(ws, nrecvd);
if (nrecvd == 0) {