diff options
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 2408ebac48..ccf3be06ad 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -61,7 +61,7 @@ int connection_or_finished_flushing(connection_t *conn) { case OR_CONN_STATE_OP_SENDING_KEYS: return or_handshake_op_finished_sending_keys(conn); case OR_CONN_STATE_CLIENT_CONNECTING: - if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, &e, &len) < 0) { /* not yet */ + if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) { /* not yet */ if(errno != EINPROGRESS){ /* yuck. kill it. */ log_fn(LOG_DEBUG,"in-progress connect failed. Removing."); @@ -147,7 +147,7 @@ connection_t *connection_or_connect(routerinfo_t *router) { connection_free(conn); return NULL; } - fcntl(s, F_SETFL, O_NONBLOCK); /* set s to non-blocking */ + set_socket_nonblocking(s); memset((void *)&router_addr,0,sizeof(router_addr)); router_addr.sin_family = AF_INET; |