- Use ping timeout mechanism to close connections that don't authenticate

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index d25cec7..e96ae51 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.130 2001/09/24 13:31:15 guus Exp $
+    $Id: net.c,v 1.35.4.136 2001/10/08 13:37:30 guus Exp $
 */
 
 #include "config.h"
@@ -230,6 +230,7 @@ cp
 */
 void send_packet(connection_t *cl, vpn_packet_t *packet)
 {
+  connection_t *via;
 cp
   if(debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
@@ -254,15 +255,22 @@ cp
       return;
     }
 
-  /* Check if it has to go via TCP or UDP... */
-cp
-  if((cl->options | myself->options) & OPTION_TCPONLY)
+  if(cl->via == myself)
+    via = cl->nexthop;
+  else
+    via = cl->via;
+
+  if(via != cl && debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),
+           cl->name, via->name, via->hostname);
+
+  if((myself->options | via->options) & OPTION_TCPONLY)
     {
-      if(send_tcppacket(cl, packet))
-        terminate_connection(cl, 1);
+      if(send_tcppacket(via, packet))
+        terminate_connection(via, 1);
     }
   else
-    send_udppacket(cl, packet);
+    send_udppacket(via, packet);
 }
 
 /* Broadcast a packet to all active direct connections */
@@ -962,6 +970,9 @@ cp
 cp
   /* Done */
 
+  myself->nexthop = myself;
+  myself->prevhop = myself;
+  myself->via = myself;
   myself->status.active = 1;
   id_add(myself);
 
@@ -989,7 +1000,7 @@ cp
     {
       if(setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         retry = 1;
-      cfg = get_config_val(cfg, config_connectto); /* Or else we try the next ConnectTo line */
+      cfg = get_config_val(cfg->next, config_connectto); /* Or else we try the next ConnectTo line */
     }
 
   if(retry)
@@ -1273,17 +1284,18 @@ cp
 void check_dead_connections(void)
 {
   time_t now;
-  avl_node_t *node;
+  avl_node_t *node, *next;
   connection_t *cl;
 cp
   now = time(NULL);
 
-  for(node = connection_tree->head; node; node = node->next)
+  for(node = connection_tree->head; node; node = next)
     {
+      next = node->next;
       cl = (connection_t *)node->data;
-      if(cl->status.active)
+      if(cl->last_ping_time + timeout < now)
         {
-          if(cl->last_ping_time + timeout < now)
+          if(cl->status.active)
             {
               if(cl->status.pinged)
                 {
@@ -1298,6 +1310,13 @@ cp
                   send_ping(cl);
                 }
             }
+          else
+            {
+              if(debug_lvl >= DEBUG_CONNECTIONS)
+                syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+                       cl->name, cl->hostname);
+              terminate_connection(cl, 0);
+            }
         }
     }
 cp
@@ -1356,7 +1375,7 @@ cp
       if(FD_ISSET(p->meta_socket, f))
        if(receive_meta(p) < 0)
          {
-           terminate_connection(p, p->status.meta);
+           terminate_connection(p, p->status.active);
            return;
          }
     }