Various fixes, tinc is now somewhat capable of actually working again.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index fe9eed7..1e37a79 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.138 2001/10/27 13:13:35 guus Exp $
+    $Id: net.c,v 1.35.4.142 2001/10/30 12:59:12 guus Exp $
 */
 
 #include "config.h"
@@ -192,32 +192,17 @@ cp
       return;
     }
 
-  if(!n->status.active)
-    {
-      if(debug_lvl >= DEBUG_TRAFFIC)
-       syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
-              n->name, n->hostname);
-
-      return;
-    }
-/* FIXME
-  if(n->via == myself)
-    via = n->nexthop;
-  else
-    via = n->via;
-
-  if(via != n && debug_lvl >= DEBUG_TRAFFIC)
+  if(n->via != n && debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),
-           n->name, via->name, via->hostname);
+           n->name, n->via->name, n->via->hostname);
 
-  if((myself->options | via->options) & OPTION_TCPONLY)
+  if((myself->options | n->via->options) & OPTION_TCPONLY)
     {
-      if(send_tcppacket(via->connection, packet))
-        terminate_connection(via->connection, 1);
+      if(send_tcppacket(n->via->connection, packet))
+        terminate_connection(n->via->connection, 1);
     }
   else
-    send_udppacket(via, packet);
-*/
+    send_udppacket(n->via, packet);
 }
 
 /* Broadcast a packet to all active direct connections */
@@ -458,6 +443,7 @@ cp
   c = new_connection();
   c->name = xstrdup(name);
 
+  init_configuration(&c->config_tree);
   read_connection_config(c);
   
   if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname))
@@ -622,6 +608,7 @@ int setup_myself(void)
 cp
   myself = new_node();
   myself->connection = new_connection();
+  init_configuration(&myself->connection->config_tree);
 
   asprintf(&myself->hostname, _("MYSELF"));
   asprintf(&myself->connection->hostname, _("MYSELF"));
@@ -666,9 +653,11 @@ cp
       return -1;
     }
 */
-  if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->connection->port))
+  if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port))
     myself->port = 655;
 
+  myself->connection->port = myself->port;
+
 /* Read in all the subnets specified in the host configuration file */
 
   cfg = lookup_config(myself->connection->config_tree, "Subnet");
@@ -705,7 +694,7 @@ cp
   if(myself->options & OPTION_TCPONLY)
     myself->options |= OPTION_INDIRECT;
 
-  if(get_config_string(lookup_config(myself->connection->config_tree, "Mode"), &mode))
+  if(get_config_string(lookup_config(config_tree, "Mode"), &mode))
     {
       if(!strcasecmp(mode, "router"))
         routing_mode = RMODE_ROUTER;
@@ -746,7 +735,7 @@ cp
   myself->key = (char *)xmalloc(myself->keylength);
   RAND_pseudo_bytes(myself->key, myself->keylength);
 
-  if(!get_config_int(lookup_config(myself->connection->config_tree, "KeyExpire"), &keylifetime))
+  if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
     keylifetime = 3600;
 
   keyexpires = time(NULL) + keylifetime;
@@ -771,8 +760,10 @@ int setup_network_connections(void)
 cp
   init_connections();
   init_subnets();
+  init_nodes();
+  init_edges();
 
-  if(get_config_int(lookup_config(myself->connection->config_tree, "PingTimeout"), &timeout))
+  if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout))
     {
       if(timeout < 1)
         {
@@ -916,7 +907,7 @@ cp
 
   if(!n)
     {
-      syslog(LOG_WARNING, _("Received UDP packets on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+      syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
       return;
     }
 /*
@@ -1055,7 +1046,7 @@ cp
       get_config_string(cfg, &name);
       cfg = lookup_config_next(config_tree, cfg);  /* Next time skip to next ConnectTo line */
 
-      if(!setup_outgoing_connection(name))   /* function returns 0 when there are no problems */
+      if(setup_outgoing_connection(name))   /* function returns 0 when there are no problems */
         retry = 1;
 
     }
@@ -1194,9 +1185,9 @@ cp
           if(FD_ISSET(device_fd, &fset))
             {
               if(read_packet(&packet))
-                route_outgoing(&packet);
-              else
                 return;
+              else
+                route_outgoing(&packet);
             }
         }
     }