Check for writability when waiting for a socket to finish connecting.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 3d17d3c..97b1e5d 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -281,23 +281,6 @@ static void periodic_handler(void *data) {
 }
 
 void handle_meta_connection_data(connection_t *c) {
-       int result;
-       socklen_t len = sizeof result;
-
-       if(c->status.connecting) {
-               c->status.connecting = false;
-
-               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
-
-               if(!result)
-                       finish_connecting(c);
-               else {
-                       logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
-                       terminate_connection(c, false);
-                       return;
-               }
-       }
-
        if (!receive_meta(c)) {
                terminate_connection(c, c->status.active);
                return;