X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=60b7b7920fecae7dd83aca744fe3a548490926b5;hp=6de95b5f0c87ebb1ed7778c42856fa0c7499f302;hb=028659bfbf164cb7a72831506896e291010b251f;hpb=9d023b1f2e7750f4a0e506c0f61498a44c0b95a8

diff --git a/src/net.c b/src/net.c
index 6de95b5f..60b7b792 100644
--- a/src/net.c
+++ b/src/net.c
@@ -654,8 +654,8 @@ cp
 
   if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
-      syslog(LOG_ERR, "Create connection to %08lx:%d failed: %m", ntohs(cl->real_ip),
-	     cl->port);
+      syslog(LOG_ERR, "Connecting to " IP_ADDR_S ":%d failed: %m",
+	     IP_ADDR_V(cl->real_ip), cl->port);
       return -1;
     }
 
@@ -821,11 +821,12 @@ cp
 
   if(cl->status.outgoing)
     {
-      alarm(5);
       signal(SIGALRM, sigalrm_handler);
+      alarm(5);
       syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds.");
     }
   
+  cl->status.active = 0;
   cl->status.remove = 1;
 cp
 }