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

factor out socket_connect_failed()

Browse source
This commit is contained in:
Oswald Buddenhagen 2013-03-29 17:51:50 +01:00
parent 37a28d8133
commit 2ef6dc8a90
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/socket.c
View file

@ -296,6 +296,7 @@ static void start_tls_p3( conn_t *conn, int ok )
static void socket_fd_cb( int, void * ); static void socket_fd_cb( int, void * );
static void socket_connect_failed( conn_t * );
static void socket_connected2( conn_t * ); static void socket_connected2( conn_t * );
static void socket_connect_bail( conn_t * ); static void socket_connect_bail( conn_t * );
@ -355,7 +356,8 @@ socket_connect( conn_t *sock, void (*cb)( int ok, void *aux ) )
he = gethostbyname( conf->host ); he = gethostbyname( conf->host );
if (!he) { if (!he) {
error( "IMAP error: Cannot resolve server '%s'\n", conf->host ); error( "IMAP error: Cannot resolve server '%s'\n", conf->host );
goto bail; socket_connect_bail( sock );
return;
} }
info( "\vok\n" ); info( "\vok\n" );
@ -375,9 +377,8 @@ socket_connect( conn_t *sock, void (*cb)( int ok, void *aux ) )
infon( "Connecting to %s... ", sock->name ); infon( "Connecting to %s... ", sock->name );
if (connect( s, (struct sockaddr *)&addr, sizeof(addr) )) { if (connect( s, (struct sockaddr *)&addr, sizeof(addr) )) {
if (errno != EINPROGRESS) { if (errno != EINPROGRESS) {
sys_error( "Cannot connect to %s", sock->name ); socket_connect_failed( sock );
socket_close_internal( sock ); return;
goto bail;
} }
conf_fd( s, 0, POLLOUT ); conf_fd( s, 0, POLLOUT );
sock->state = SCK_CONNECTING; sock->state = SCK_CONNECTING;
@ -389,9 +390,14 @@ socket_connect( conn_t *sock, void (*cb)( int ok, void *aux ) )
info( "\vok\n" ); info( "\vok\n" );
socket_connected2( sock ); socket_connected2( sock );
return; return;
}
bail: static void
socket_connect_bail( sock ); socket_connect_failed( conn_t *conn )
{
sys_error( "Cannot connect to %s", conn->name );
socket_close_internal( conn );
socket_connect_bail( conn );
} }
static void static void
@ -406,9 +412,7 @@ socket_connected( conn_t *conn )
} }
if (soerr) { if (soerr) {
errno = soerr; errno = soerr;
sys_error( "Cannot connect to %s", conn->name ); socket_connect_failed( conn );
socket_close_internal( conn );
socket_connect_bail( conn );
return; return;
} }
socket_connected2( conn ); socket_connected2( conn );