X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=f8c7306d18bdc7512f20b082e18b1b8aa2a61e2a;hp=b6007b4871a4781341ea51ad1038df735640e797;hb=803f908078e87f433727a3ddf2d61734e1ed9233;hpb=e20e143f1e99bdc0a7d92e97da1bd0dc40e8a83b

diff --git a/src/net.c b/src/net.c
index b6007b48..f8c7306d 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;
     }
 
@@ -851,21 +851,22 @@ cp
       if(p->status.active && p->status.meta)
 	{
           if(p->last_ping_time + timeout < now)
-            if(p->status.pinged && !p->status.got_pong)
-              {
-	        syslog(LOG_INFO, "%s (" IP_ADDR_S ") didn't respond to ping",
-		       p->hostname, IP_ADDR_V(p->vpn_ip));
-	        p->status.timeout = 1;
-	        terminate_connection(p);
-              }
-            else if(p->want_ping)
-              {
-                send_ping(p);
-                p->last_ping_time = now;
-                p->status.pinged = 1;
-                p->status.get_pong = 0;
-              }
-          }
+            {
+              if(p->status.pinged && !p->status.got_pong)
+                {
+	          syslog(LOG_INFO, "%s (" IP_ADDR_S ") didn't respond to ping",
+		         p->hostname, IP_ADDR_V(p->vpn_ip));
+	          p->status.timeout = 1;
+	          terminate_connection(p);
+                }
+              else if(p->want_ping)
+                {
+                  send_ping(p);
+                  p->last_ping_time = now;
+                  p->status.pinged = 1;
+                  p->status.got_pong = 0;
+                }
+            }
 	}
     }
 cp