9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GNUTLS: Improve the connect callback logic

Browse source
This commit is contained in:
Aaron Jones 2016-09-16 12:54:52 +00:00
parent 77119a5031
commit 4618ec248e
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
libratbox/src/gnutls.c
View file

@ -458,48 +458,45 @@ rb_ssl_listen(rb_fde_t *F, int backlog, int defer_accept)
} }
static void static void
rb_ssl_connect_realcb(rb_fde_t *F, int status, struct ssl_connect *sconn) rb_ssl_connect_realcb(rb_fde_t *const F, const int status, struct ssl_connect *const sconn)
{ {
lrb_assert(F != NULL);
lrb_assert(F->connect != NULL);
F->connect->callback = sconn->callback; F->connect->callback = sconn->callback;
F->connect->data = sconn->data; F->connect->data = sconn->data;
rb_free(sconn);
rb_connect_callback(F, status); rb_connect_callback(F, status);
rb_free(sconn);
} }
static void static void
rb_ssl_tryconn_timeout_cb(rb_fde_t *F, void *data) rb_ssl_tryconn_timeout_cb(rb_fde_t *const F, void *const data)
{ {
rb_ssl_connect_realcb(F, RB_ERR_TIMEOUT, data); rb_ssl_connect_realcb(F, RB_ERR_TIMEOUT, data);
} }
static void static void
rb_ssl_tryconn_cb(rb_fde_t *F, void *data) rb_ssl_connect_common(rb_fde_t *const F, void *const data)
{ {
struct ssl_connect *sconn = data; int ret = do_ssl_handshake(F, rb_ssl_connect_common, data);
int ret;
ret = do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn); if(ret == 0)
switch (ret)
{
case -1:
rb_ssl_connect_realcb(F, RB_ERROR_SSL, sconn);
break;
case 0:
/* do_ssl_handshake does the rb_setselect stuff */
return; return;
default:
break;
struct ssl_connect *const sconn = data;
} if(ret > 0)
rb_ssl_connect_realcb(F, RB_OK, sconn); rb_ssl_connect_realcb(F, RB_OK, sconn);
else
rb_ssl_connect_realcb(F, RB_ERROR_SSL, sconn);
} }
static void static void
rb_ssl_tryconn(rb_fde_t *F, int status, void *data) rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
{ {
struct ssl_connect *sconn = data; struct ssl_connect *const sconn = data;
if(status != RB_OK) if(status != RB_OK)
{ {
rb_ssl_connect_realcb(F, status, sconn); rb_ssl_connect_realcb(F, status, sconn);
@ -508,8 +505,6 @@ rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
F->type |= RB_FD_SSL; F->type |= RB_FD_SSL;
rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
F->ssl = rb_malloc(sizeof(gnutls_session_t)); F->ssl = rb_malloc(sizeof(gnutls_session_t));
gnutls_init(F->ssl, GNUTLS_CLIENT); gnutls_init(F->ssl, GNUTLS_CLIENT);
gnutls_set_default_priority(SSL_P(F)); gnutls_set_default_priority(SSL_P(F));
@ -518,42 +513,43 @@ rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
gnutls_transport_set_ptr(SSL_P(F), (gnutls_transport_ptr_t) (long int)F->fd); gnutls_transport_set_ptr(SSL_P(F), (gnutls_transport_ptr_t) (long int)F->fd);
gnutls_priority_set(SSL_P(F), default_priority); gnutls_priority_set(SSL_P(F), default_priority);
do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn); rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
rb_ssl_connect_common(F, sconn);
} }
void void
rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest, rb_connect_tcp_ssl(rb_fde_t *const F, struct sockaddr *const dest, struct sockaddr *const clocal,
struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout) const int socklen, CNCB *const callback, void *const data, const int timeout)
{ {
struct ssl_connect *sconn;
if(F == NULL) if(F == NULL)
return; return;
sconn = rb_malloc(sizeof(struct ssl_connect)); struct ssl_connect *const sconn = rb_malloc(sizeof(struct ssl_connect));
sconn->data = data; sconn->data = data;
sconn->callback = callback; sconn->callback = callback;
sconn->timeout = timeout; sconn->timeout = timeout;
rb_connect_tcp(F, dest, clocal, socklen, rb_ssl_tryconn, sconn, timeout); rb_connect_tcp(F, dest, clocal, socklen, rb_ssl_tryconn, sconn, timeout);
} }
void void
rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout) rb_ssl_start_connected(rb_fde_t *const F, CNCB *const callback, void *const data, const int timeout)
{ {
struct ssl_connect *sconn;
if(F == NULL) if(F == NULL)
return; return;
sconn = rb_malloc(sizeof(struct ssl_connect)); struct ssl_connect *const sconn = rb_malloc(sizeof(struct ssl_connect));
sconn->data = data; sconn->data = data;
sconn->callback = callback; sconn->callback = callback;
sconn->timeout = timeout; sconn->timeout = timeout;
F->connect = rb_malloc(sizeof(struct conndata)); F->connect = rb_malloc(sizeof(struct conndata));
F->connect->callback = callback; F->connect->callback = callback;
F->connect->data = data; F->connect->data = data;
F->type |= RB_FD_SSL;
F->ssl = rb_malloc(sizeof(gnutls_session_t));
F->type |= RB_FD_SSL;
F->ssl = rb_malloc(sizeof(gnutls_session_t));
gnutls_init(F->ssl, GNUTLS_CLIENT); gnutls_init(F->ssl, GNUTLS_CLIENT);
gnutls_set_default_priority(SSL_P(F)); gnutls_set_default_priority(SSL_P(F));
gnutls_credentials_set(SSL_P(F), GNUTLS_CRD_CERTIFICATE, server_cert_key); gnutls_credentials_set(SSL_P(F), GNUTLS_CRD_CERTIFICATE, server_cert_key);
@ -562,8 +558,7 @@ rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout)
gnutls_priority_set(SSL_P(F), default_priority); gnutls_priority_set(SSL_P(F), default_priority);
rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn); rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
rb_ssl_connect_common(F, sconn);
do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
} }
int int