lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use null timer instead of faking a socket notification

Browse Source
This commit is contained in:
Oswald Buddenhagen 2014-11-30 19:44:41 +01:00
parent 7b76d9ff7e
commit a4e2f1a60d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/socket.c
View File

@ -231,6 +231,7 @@ init_ssl_ctx( const server_conf_t *conf )
static void start_tls_p2( conn_t * ); static void start_tls_p2( conn_t * );
static void start_tls_p3( conn_t *, int ); static void start_tls_p3( conn_t *, int );
static void ssl_fake_cb( void * );
void void
socket_start_tls( conn_t *conn, void (*cb)( int ok, void *aux ) ) socket_start_tls( conn_t *conn, void (*cb)( int ok, void *aux ) )
@ -250,6 +251,7 @@ socket_start_tls( conn_t *conn, void (*cb)( int ok, void *aux ) )
return; return;
} }
init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn );
conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext ); conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext );
SSL_set_fd( conn->ssl, conn->fd ); SSL_set_fd( conn->ssl, conn->fd );
SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER ); SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER );
@ -493,6 +495,7 @@ socket_close( conn_t *sock )
if (sock->ssl) { if (sock->ssl) {
SSL_free( sock->ssl ); SSL_free( sock->ssl );
sock->ssl = 0; sock->ssl = 0;
wipe_wakeup( &sock->ssl_fake );
} }
#endif #endif
while (sock->write_buf) while (sock->write_buf)
@ -517,7 +520,7 @@ socket_fill( conn_t *sock )
if ((n = ssl_return( "read from", sock, SSL_read( sock->ssl, buf, len ) )) <= 0) if ((n = ssl_return( "read from", sock, SSL_read( sock->ssl, buf, len ) )) <= 0)
return; return;
if (n == len && SSL_pending( sock->ssl )) if (n == len && SSL_pending( sock->ssl ))
fake_notifier( &sock->notify, POLLIN ); conf_wakeup( &sock->ssl_fake, 0 );
} else } else
#endif #endif
{ {
@ -632,7 +635,7 @@ do_queued_write( conn_t *conn )
} }
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
if (conn->ssl && SSL_pending( conn->ssl )) if (conn->ssl && SSL_pending( conn->ssl ))
fake_notifier( &conn->notify, POLLIN ); conf_wakeup( &conn->ssl_fake, 0 );
#endif #endif
return conn->write_callback( conn->callback_aux ); return conn->write_callback( conn->callback_aux );
} }
@ -720,3 +723,13 @@ socket_fd_cb( int events, void *aux )
if (events & POLLIN) if (events & POLLIN)
socket_fill( conn ); socket_fill( conn );
} }
#ifdef HAVE_LIBSSL
static void
ssl_fake_cb( void *aux )
{
conn_t *conn = (conn_t *)aux;
socket_fill( conn );
}
#endif

1
src/socket.h
View File

@ -75,6 +75,7 @@ typedef struct {
char *name; char *name;
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
SSL *ssl; SSL *ssl;
wakeup_t ssl_fake;
#endif #endif
void (*bad_callback)( void *aux ); /* async fail while sending or listening */ void (*bad_callback)( void *aux ); /* async fail while sending or listening */