torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

it turns out we weren't looking at the result from getsockopt().

Browse Source 
now we do.
but i'm not sure it matters, since we also poll for reads, and if
there's an error with the connecting socket, poll is supposed to
return readable, so we should notice it then.

who knows.


svn:r2057
This commit is contained in:
Roger Dingledine
2004-07-19 23:26:21 +00:00
parent 7597ca3137
commit 47efcccdea
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/connection.c
+11 -2
View File
@@ -834,9 +834,18 @@ int connection_handle_write(connection_t *conn) {
/* Sometimes, "writeable" means "connected". */
if (connection_state_is_connecting(conn)) {
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) {
/* not yet */
log_fn(LOG_WARN,"getsockopt() syscall failed?! Please report to tor-ops.");
connection_close_immediate(conn);
connection_mark_for_close(conn);
return -1;
}
if(e) {
/* some sort of error, but maybe just inprogress still */
errno = e; /* XXX008 this is a kludge. maybe we should rearrange
our error-hunting functions? E.g. pass errno to
tor_socket_errno(). */
if(!ERRNO_IS_CONN_EINPROGRESS(tor_socket_errno(conn->s))) {
log_fn(LOG_DEBUG,"in-progress connect failed. Removing.");
log_fn(LOG_INFO,"in-progress connect failed. Removing.");
connection_close_immediate(conn);
connection_mark_for_close(conn);
/* it's safe to pass OPs to router_mark_as_down(), since it just