mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolver: properly handle connect() failures.

Browse Source 
If initial attempt to connect() the UDP socket failed, e.g.
due to network unreachable, no further attempts were made.
This commit is contained in:
Ruslan Ermilov 2014-02-20 17:27:09 +04:00
parent c539aaf352
commit 9ae40c5b54
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/ngx_resolver.c
View File

@ -3037,14 +3037,7 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno, ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
ngx_nonblocking_n " failed"); ngx_nonblocking_n " failed");
ngx_free_connection(c); goto failed;
if (ngx_close_socket(s) == -1) {
ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
ngx_close_socket_n " failed");
}
return NGX_ERROR;
} }
rev = c->read; rev = c->read;
@ -3079,7 +3072,7 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno, ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno,
"connect() failed"); "connect() failed");
return NGX_ERROR; goto failed;
} }
/* UDP sockets are always ready to write */ /* UDP sockets are always ready to write */
@ -3093,16 +3086,23 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
/* eventport event type has no meaning: oneshot only */ /* eventport event type has no meaning: oneshot only */
if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) { if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
return NGX_ERROR; goto failed;
} }
} else { } else {
/* rtsig */ /* rtsig */
if (ngx_add_conn(c) == NGX_ERROR) { if (ngx_add_conn(c) == NGX_ERROR) {
return NGX_ERROR; goto failed;
} }
} }
return NGX_OK; return NGX_OK;
failed:
ngx_close_connection(c);
uc->connection = NULL;
return NGX_ERROR;
} }