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 327bdd3..e5ffc4f 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -134,7 +134,7 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
                                purge();
                } else {
                        FD_SET(c->socket, readset);
-                       if(c->outbuflen > 0)
+                       if(c->outbuflen > 0 || c->status.connecting)
                                FD_SET(c->socket, writeset);
                        if(c->socket > max)
                                max = c->socket;
@@ -234,7 +234,7 @@ static void check_dead_connections(void) {
                        if(c->status.active) {
                                if(c->status.pinged) {
                                        ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
-                                                          c->name, c->hostname, now - c->last_ping_time);
+                                                          c->name, c->hostname, (long)now - c->last_ping_time);
                                        c->status.timeout = true;
                                        terminate_connection(c, true);
                                } else if(c->last_ping_time + pinginterval <= now) {
@@ -263,7 +263,7 @@ static void check_dead_connections(void) {
                        if(c->status.active) {
                                ifdebug(CONNECTIONS) logger(LOG_INFO,
                                                "%s (%s) could not flush for %ld seconds (%d bytes remaining)",
-                                               c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
+                                               c->name, c->hostname, (long)now - c->last_flushed_time, c->outbuflen);
                                c->status.timeout = true;
                                terminate_connection(c, true);
                        }
@@ -308,7 +308,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
                if(c->status.remove)
                        continue;
 
-               if(FD_ISSET(c->socket, readset)) {
+               if(FD_ISSET(c->socket, writeset)) {
                        if(c->status.connecting) {
                                c->status.connecting = false;
                                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
@@ -325,14 +325,14 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
                                }
                        }
 
-                       if(!receive_meta(c)) {
+                       if(!flush_meta(c)) {
                                terminate_connection(c, c->status.active);
                                continue;
                        }
                }
 
-               if(FD_ISSET(c->socket, writeset)) {
-                       if(!flush_meta(c)) {
+               if(FD_ISSET(c->socket, readset)) {
+                       if(!receive_meta(c)) {
                                terminate_connection(c, c->status.active);
                                continue;
                        }