Fix compiler warnings about format string errors on BSD.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index e5ffc4f..b82dae8 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                  2011      Loïc Grenié <loic.grenie@gmail.com>
 
@@ -182,6 +182,12 @@ void terminate_connection(connection_t *c, bool report) {
                closesocket(c->socket);
 
        if(c->edge) {
+               if(!c->node) {
+                       logger(LOG_ERR, "Connection to %s (%s) has an edge but node is NULL!", c->name, c->hostname);
+                       // And that should never happen.
+                       abort();
+               }
+
                if(report && !tunnelserver)
                        send_del_edge(everyone, c->edge);
 
@@ -212,6 +218,12 @@ void terminate_connection(connection_t *c, bool report) {
                c->status.remove = false;
                do_outgoing_connection(c);      
        }
+
+#ifndef HAVE_MINGW
+       /* Clean up dead proxy processes */
+
+       while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
 }
 
 /*
@@ -234,7 +246,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, (long)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 +275,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, (long)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);
                        }
@@ -490,7 +502,8 @@ int main_loop(void) {
                        expire_events();
                        for(node = connection_tree->head; node; node = node->next) {
                                connection_t *c = node->data;
-                               send_ping(c);
+                               if(c->status.active)
+                                       send_ping(c);
                        }
                        sigalrm = false;
                }