Call connect() from the metadata handler thread.

diff --git a/src/net.c b/src/net.c
index e52363e4a685f8586d6652639e452e9867df6e1c..d80a7129de593312c9912ed3e917c5e95d97dc6e 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -216,13 +216,12 @@ void handle_meta_connection_data(void *data) {
        int result;
        socklen_t len = sizeof result;
 
-       if(c->status.connecting) {
-               c->status.connecting = false;
-
-               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+       while(c->status.connecting) {
+               result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
 
                if(!result) {
                        mutex_lock(&mutex);
+                       c->status.connecting = false;
                        finish_connecting(c);
                        mutex_unlock(&mutex);
                } else {
@@ -230,10 +229,10 @@ void handle_meta_connection_data(void *data) {
                                           "Error while connecting to %s (%s): %s",
                                           c->name, c->hostname, sockstrerror(result));
                        closesocket(c->socket);
+                       c->status.connecting = false;
                        mutex_lock(&mutex);
                        do_outgoing_connection(c);
                        mutex_unlock(&mutex);
-                       return;
                }
        }
 

diff --git a/src/net_socket.c b/src/net_socket.c
index 3c79ceeabacd401210c4ba3a21c004cb251c3874..d12810fc9d79b321049347bf040ad6578d13aa45 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -392,25 +392,7 @@ begin:
 
        configure_tcp(c);
 
-       /* Connect */
-
-       result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
-
-       if(result == -1) {
-               if(sockinprogress(sockerrno)) {
-                       c->status.connecting = true;
-                       return;
-               }
-
-               closesocket(c->socket);
-
-               ifdebug(CONNECTIONS) logger(LOG_ERR, "%s: %s", c->hostname, sockstrerror(sockerrno));
-
-               goto begin;
-       }
-
-       finish_connecting(c);
-
+       c->status.connecting = true;
        return;
 }