X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet.c;h=db5743af2e9179915aca7686ac5c7fa497050746;hp=10a2d20645951081fef4c68e70fdf4e97f8df111;hb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;hpb=d7bf63c63ab397cf3e5ca4a065922364925788e7

diff --git a/src/net.c b/src/net.c
index 10a2d206..db5743af 100644
--- 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-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
 		  2011      Loïc Grenié <loic.grenie@gmail.com>
 
@@ -139,12 +139,13 @@ void terminate_connection(connection_t *c, bool report) {
 		}
 	}
 
-	/* Check if this was our outgoing connection */
+	free_connection_partially(c);
 
-	if(c->outgoing)
-		retry_outgoing(c->outgoing);
+	/* Check if this was our outgoing connection */
 
-	connection_del(c);
+	if(c->outgoing) {
+		do_outgoing_connection(c);	
+	}
 }
 
 /*
@@ -171,7 +172,7 @@ static void timeout_handler(int fd, short events, void *event) {
 			if(c->status.active) {
 				if(c->status.pinged) {
 					logger(DEBUG_CONNECTIONS, 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);
 					terminate_connection(c, true);
 					continue;
 				} else if(c->last_ping_time + pinginterval <= now) {