What was I thinking? s/vertex/edge/g.

diff --git a/src/Makefile.am b/src/Makefile.am
index 862f73292804a26b8b5ddc15e228d15b649162ab..9a181093c4f4e1007dbefba980ad7178f2b94cce 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 ## Produce this file with automake to get Makefile.in
-# $Id: Makefile.am,v 1.4.4.14 2001/10/13 13:53:07 guus Exp $
+# $Id: Makefile.am,v 1.4.4.15 2001/10/28 08:41:19 guus Exp $
 
 sbin_PROGRAMS = tincd
 
 tincd_SOURCES = conf.c connection.c device.c meta.c net.c netutl.c node.c process.c    \
-       protocol.c route.c subnet.c tincd.c vertex.c
+       protocol.c route.c subnet.c tincd.c edge.c
 
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 noinst_HEADERS = conf.h connection.h device.h meta.h net.h netutl.h node.h process.h   \
-       protocol.h route.h subnet.h vertex.h
+       protocol.h route.h subnet.h edge.h
 
 LIBS = @LIBS@ @INTLLIBS@
 

diff --git a/src/conf.h b/src/conf.h
index 9136efa7b9cb7d0e2e323922f2aacb7c7982bacb..bf3df7040ed5f6d0138479c40f85a3864d3a37d4 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -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: conf.h,v 1.6.4.28 2001/10/27 12:13:17 guus Exp $
+    $Id: conf.h,v 1.6.4.29 2001/10/28 08:41:19 guus Exp $
 */
 
 #ifndef __TINC_CONF_H__
@@ -40,6 +40,7 @@ extern int debug_lvl;
 extern int timeout;
 extern int maxtimeout;
 extern int sighup;
+extern int bypass_security;
 extern char *confbase;
 extern char *netname;
 

diff --git a/src/connection.c b/src/connection.c
index ccc41252d35960e8a5343ef3aceff404b0da9195..8fb96112a9df70ce6bde71643a6f68030faa7238 100644 (file)
--- a/src/connection.c
+++ b/src/connection.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: connection.c,v 1.1.2.21 2001/10/27 15:19:13 guus Exp $
+    $Id: connection.c,v 1.1.2.22 2001/10/28 08:41:19 guus Exp $
 */
 
 #include "config.h"
@@ -65,7 +65,6 @@ connection_t *new_connection(void)
   connection_t *c;
 cp
   c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
-  init_configuration(&c->config_tree);
 cp
   return c;
 }

diff --git a/src/connection.h b/src/connection.h
index b32e329cdb80560a96eaa33f888b58cd8d62074b..4054804266cfb29afa600bf7cb057fdd70d35070 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -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: connection.h,v 1.1.2.17 2001/10/27 12:13:17 guus Exp $
+    $Id: connection.h,v 1.1.2.18 2001/10/28 08:41:19 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -42,7 +42,7 @@
 #include "conf.h"
 
 #include "node.h"
-#include "vertex.h"
+#include "edge.h"
 
 #define OPTION_INDIRECT                0x0001
 #define OPTION_TCPONLY         0x0002
@@ -72,7 +72,7 @@ typedef struct connection_t {
   struct connection_status_t status; /* status info */
 
   struct node_t *node;             /* node associated with the other end */
-  struct vertex_t *vertex;         /* vertex associated with this connection */
+  struct edge_t *edge;         /* edge associated with this connection */
 
   RSA *rsa_key;                    /* his public/private key */
   EVP_CIPHER *incipher;            /* Cipher he will use to send data to us */

diff --git a/src/edge.c b/src/edge.c
new file mode 100644 (file)
index 0000000..24c67c3
--- /dev/null
+++ b/src/edge.c
@@ -0,0 +1,146 @@
+/*
+    edge.c -- edge tree management
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id: edge.c,v 1.1.2.1 2001/10/28 08:41:19 guus Exp $
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <syslog.h>
+#include <string.h>
+
+#include <avl_tree.h>
+#include <list.h>
+
+#include "net.h"       /* Don't ask. */
+#include "netutl.h"
+#include "config.h"
+#include "conf.h"
+#include <utils.h>
+#include "subnet.h"
+
+#include "xalloc.h"
+#include "system.h"
+
+avl_tree_t *edge_tree;        /* Tree with all known vertices (replaces active_tree) */
+
+int edge_compare(edge_t *a, edge_t *b)
+{
+  int result;
+
+  result = strcmp(a->from->name, b->from->name);
+  
+  if(result)
+    return result;
+  else
+    return strcmp(a->to->name, b->to->name);
+}
+
+/* Evil edge_compare() from a parallel universe ;)
+
+int edge_compare(edge_t *a, edge_t *b)
+{
+  int result;
+
+  return (result = strcmp(a->from->name, b->from->name)) || (result = strcmp(a->to->name, b->to->name)), result;
+}
+
+*/
+
+void init_vertices(void)
+{
+cp
+  edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
+cp
+}
+
+void exit_vertices(void)
+{
+cp
+  avl_delete_tree(edge_tree);
+cp
+}
+
+/* Creation and deletion of connection elements */
+
+edge_t *new_edge(void)
+{
+cp
+  edge_t *v = (edge_t *)xmalloc_and_zero(sizeof(*v));
+cp
+  return v;
+}
+
+void free_edge(edge_t *v)
+{
+cp
+  free(v);
+cp
+}
+
+void edge_add(edge_t *v)
+{
+cp
+  avl_insert(edge_tree, v);
+cp
+}
+
+void edge_del(edge_t *v)
+{
+cp
+  avl_delete(edge_tree, v);
+cp
+}
+
+edge_t *lookup_edge(node_t *from, node_t *to)
+{
+  edge_t v, *result;
+cp
+  v.from = from;
+  v.to = to;
+
+  result = avl_search(edge_tree, &v);
+
+  if(result)
+    return result;
+cp
+  v.from = to;
+  v.to = from;
+
+  return avl_search(edge_tree, &v);
+}
+
+void dump_vertices(void)
+{
+  avl_node_t *node;
+  edge_t *v;
+cp
+  syslog(LOG_DEBUG, _("Vertices:"));
+
+  for(node = edge_tree->head; node; node = node->next)
+    {
+      v = (edge_t *)node->data;
+      syslog(LOG_DEBUG, _(" %s - %s options %ld"),
+             v->from->name, v->to->name, v->options);
+    }
+    
+  syslog(LOG_DEBUG, _("End of vertices."));
+cp
+}

diff --git a/src/edge.h b/src/edge.h
new file mode 100644 (file)
index 0000000..c2212cc
--- /dev/null
+++ b/src/edge.h
@@ -0,0 +1,62 @@
+/*
+    edge.h -- header for edge.c
+    Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2001 Ivo Timmermans <itimmermans@bigfoot.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id: edge.h,v 1.1.2.1 2001/10/28 08:41:19 guus Exp $
+*/
+
+#ifndef __TINC_EDGE_H__
+#define __TINC_EDGE_H__
+
+#include <avl_tree.h>
+
+#include "node.h"
+#include "connection.h"
+
+/* I don't know if halfconnection_t is useful... */
+
+typedef struct halfconnection_t {
+  struct node_t *node;             /* node associated with this end of the connection */
+
+  ipv4_t address;                  /* real (internet) ip on this end of the meta connection */
+  short unsigned int port;         /* port number of this end of the meta connection */
+  char *hostname;                  /* the hostname of real ip */
+} halfconnection_t;
+
+typedef struct edge_t {
+  struct node_t *from;
+  struct node_t *to;
+
+  long int options;                /* options turned on for this connection */
+  int metric;                      /* weight of this edge */
+  
+  struct connection_t *connection; /* connection associated with this edge, if available */
+} edge_t;
+
+extern avl_tree_t *edge_tree;    /* Tree with all known vertices (replaces active_tree) */
+
+extern void init_vertices(void);
+extern void exit_vertices(void);
+extern edge_t *new_edge(void);
+extern void free_edge(edge_t *);
+extern void edge_add(edge_t *);
+extern void edge_del(edge_t *);
+extern edge_t *lookup_edge(struct node_t *, struct node_t *);
+extern void dump_vertices(void);
+
+#endif /* __TINC_EDGE_H__ */

diff --git a/src/net.c b/src/net.c
index 50f4acb4f44cc46fe78003541d7b6da798becec1..35d9563ce9b9efb6586927008446c38e70e455e4 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.139 2001/10/27 15:19:13 guus Exp $
+    $Id: net.c,v 1.35.4.140 2001/10/28 08:41:19 guus Exp $
 */
 
 #include "config.h"
@@ -458,6 +458,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 +623,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"));
@@ -774,6 +776,7 @@ cp
   init_connections();
   init_subnets();
   init_nodes();
+  init_vertices();
 
   if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout))
     {
@@ -1197,9 +1200,9 @@ cp
           if(FD_ISSET(device_fd, &fset))
             {
               if(read_packet(&packet))
-                route_outgoing(&packet);
-              else
                 return;
+              else
+                route_outgoing(&packet);
             }
         }
     }

diff --git a/src/protocol.c b/src/protocol.c
index f275f3e221ffaccbba3fdf31f926fbbd73c7c366..d1bb524fc2e53913aa68885c029d37ae194e70d5 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.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: protocol.c,v 1.28.4.109 2001/10/27 12:13:17 guus Exp $
+    $Id: protocol.c,v 1.28.4.110 2001/10/28 08:41:19 guus Exp $
 */
 
 #include "config.h"
@@ -55,7 +55,7 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
-#include "vertex.h"
+#include "edge.h"
 
 #include "system.h"
 
@@ -176,10 +176,11 @@ cp
 int id_h(connection_t *c)
 {
   char name[MAX_STRING_SIZE];
+int bla;
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" %d", name, &c->protocol_version) != 2)
     {
-       syslog(LOG_ERR, _("Got bad %s from %s"), "ID", c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name, c->hostname);
        return -1;
     }
 
@@ -187,7 +188,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Peer %s uses invalid identity name"), c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ID", c->name, c->hostname, "invalid name");
       return -1;
     }
 
@@ -213,9 +214,19 @@ cp
       return -1;
     }
   
+  if(bypass_security)
+    {
+      if(!c->config_tree)
+        init_configuration(&c->config_tree);
+      c->allow_request = ACK;
+      return send_ack(c);
+    }
+
   if(!c->config_tree)
     {
-      if(read_connection_config(c))
+      init_configuration(&c->config_tree);
+
+      if((bla = read_connection_config(c)))
         {
           syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name);
           return -1;
@@ -314,7 +325,7 @@ int metakey_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
-       syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
        return -1;
     }
 
@@ -324,7 +335,7 @@ cp
 
   if(strlen(buffer) != len*2)
     {
-      syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong keylength");
       return -1;
     }
 
@@ -412,7 +423,7 @@ int challenge_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
-       syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name, c->hostname);
        return -1;
     }
 
@@ -422,7 +433,7 @@ cp
 
   if(strlen(buffer) != len*2)
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong challenge length");
       return -1;
     }
 
@@ -446,12 +457,6 @@ int send_chal_reply(connection_t *c)
 {
   char hash[SHA_DIGEST_LENGTH*2+1];
 cp
-  if(!c->mychallenge)
-    {
-      syslog(LOG_ERR, _("Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"), c->name, c->hostname);
-      return -1;
-    }
-     
   /* Calculate the hash from the challenge we received */
 
   SHA1(c->mychallenge, RSA_size(myself->connection->rsa_key), hash);
@@ -474,7 +479,7 @@ int chal_reply_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, hishash) != 1)
     {
-       syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name, c->hostname);
        return -1;
     }
 
@@ -482,7 +487,7 @@ cp
 
   if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply length"));
       return -1;
     }
 
@@ -498,7 +503,7 @@ cp
 
   if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
     {
-      syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply"));
       if(debug_lvl >= DEBUG_SCARY_THINGS)
         {
           bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
@@ -520,7 +525,7 @@ cp
 int send_ack(connection_t *c)
 {
   /* ACK message contains rest of the information the other end needs
-     to create node_t and vertex_t structures. */
+     to create node_t and edge_t structures. */
 cp
   return send_request(c, "%d %d", ACK, myself->port);
 }
@@ -534,7 +539,7 @@ int ack_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d %hd", &port) != 1)
     {
-       syslog(LOG_ERR, _("Got bad %s from %s"), "ACK", c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
        return -1;
     }
 
@@ -589,20 +594,21 @@ cp
 
   */
 
-  /* Create a vertex_t for this connection */
+  /* Create a edge_t for this connection */
 
-  c->vertex = new_vertex();
+  c->edge = new_edge();
   
-  c->vertex->from = myself;
-  c->vertex->to = n;
-  c->vertex->metric = 1;
-  c->vertex->connection = c;
+  c->edge->from = myself;
+  c->edge->to = n;
+  c->edge->metric = 1;
+  c->edge->connection = c;
 
-  vertex_add(c->vertex);
+  edge_add(c->edge);
 
   /* Activate this connection */
 
   c->allow_request = ALL;
+  c->status.active = 1;
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
@@ -621,23 +627,23 @@ cp
   for(node = node_tree->head; node; node = node->next)
     {
       n = (node_t *)node->data;
-      
-      if(n != c->node)
-        {
-          /* Notify others of this connection */
 
-          if(n->connection)
-            send_add_node(n->connection, c->node);
+      if(n == c->node || n == myself)
+        continue;
 
-          /* Notify new connection of everything we know */
+      /* Notify others of this connection */
 
-          send_add_node(c, n);
+      if(n->connection)
+        send_add_node(n->connection, c->node);
 
-          for(node2 = c->node->subnet_tree->head; node2; node2 = node2->next)
-            {
-              s = (subnet_t *)node2->data;
-              send_add_subnet(c, s);
-            }
+      /* Notify new connection of everything we know */
+
+      send_add_node(c, n);
+
+      for(node2 = c->node->subnet_tree->head; node2; node2 = node2->next)
+        {
+          s = (subnet_t *)node2->data;
+          send_add_subnet(c, s);
         }
     }
 cp
@@ -671,7 +677,7 @@ int add_subnet_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
     {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
       return -1;
     }
 
@@ -679,7 +685,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
@@ -687,7 +693,7 @@ cp
 
   if(!(s = str2net(subnetstr)))
     {
-      syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
@@ -695,7 +701,7 @@ cp
 
   if(!(owner = lookup_node(name)))
     {
-      syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
+      syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
              name, c->name, c->hostname);
       return -1;
     }
@@ -738,7 +744,7 @@ int del_subnet_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
     {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
       return -1;
     }
 
@@ -746,7 +752,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
@@ -754,7 +760,7 @@ cp
 
   if(!(s = str2net(subnetstr)))
     {
-      syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
@@ -762,8 +768,8 @@ cp
 
   if(!(owner = lookup_node(name)))
     {
-      syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
-             name, c->name, c->hostname);
+      syslog(LOG_ERR, _("Got %s from %s (%s) for %s which is not in our connection list"),
+             "DEL_SUBNET", c->name, c->hostname, name);
       return -1;
     }
 
@@ -773,8 +779,8 @@ cp
   
   if(!find)
     {
-      syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which does not appear in his subnet tree"),
-             name, c->name, c->hostname);
+      syslog(LOG_ERR, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
+             "DEL_SUBNET", c->name, c->hostname, name);
       return -1;
     }
   
@@ -812,7 +818,7 @@ int add_node_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
     {
-       syslog(LOG_ERR, _("Got bad ADD_NODE from %s (%s)"), c->name, c->hostname);
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_NODE", c->name, c->hostname);
        return -1;
     }
 
@@ -820,18 +826,10 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad ADD_NODE from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_NODE", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
-  /* Check if somebody tries to add ourself */
-
-  if(!strcmp(name, myself->name))
-    {
-      syslog(LOG_ERR, _("Got ADD_NODE from %s (%s) for ourself!"), c->name, c->hostname);
-      return -1;
-    }
-    
   /* Check if node already exists */
   
   n = lookup_node(name);
@@ -880,7 +878,7 @@ int del_node_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
     {
-      syslog(LOG_ERR, _("Got bad DEL_NODE from %s (%s)"),
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_NODE",
              c->name, c->hostname);
       return -1;
     }
@@ -889,7 +887,7 @@ cp
 
   if(check_id(name))
     {
-      syslog(LOG_ERR, _("Got bad DEL_NODE from %s (%s): invalid identity name"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_NODE", c->name, c->hostname, _("invalid name"));
       return -1;
     }
 
@@ -897,7 +895,7 @@ cp
 
   if(!strcmp(name, myself->name))
     {
-      syslog(LOG_ERR, _("Got DEL_NODE from %s (%s) for ourself!"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) for ourself!"), "DEL_NODE",
              c->name, c->hostname);
       return -1;
     }
@@ -908,7 +906,7 @@ cp
 
   if(!n)
     {
-      syslog(LOG_WARNING, _("Got DEL_NODE from %s (%s) for %s which does not exist"), c->name, c->hostname, n->name);
+      syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not exist"), "DEL_NODE", c->name, c->hostname, n->name);
       return 0;
     }
   
@@ -916,7 +914,7 @@ cp
   
   if(address != n->address || port != n->port)
     {
-      syslog(LOG_WARNING, _("Got DEL_NODE from %s (%s) for %s which doesn't match"), c->name, c->hostname, n->name);
+      syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which doesn't match"), "DEL_NODE", c->name, c->hostname, n->name);
       return 0;
     }
 
@@ -936,6 +934,180 @@ cp
   return 0;
 }
 
+/* Vertices */
+
+int send_add_edge(connection_t *c, edge_t *v)
+{
+cp
+  return send_request(c, "%d %s %s %lx", ADD_NODE,
+                      v->from->name, v->to->name, v->options);
+}
+
+int add_edge_h(connection_t *c)
+{
+  connection_t *other;
+  edge_t *v;
+  node_t *from, *to;
+  char from_name[MAX_STRING_SIZE];
+  char to_name[MAX_STRING_SIZE];
+  long int options;
+  avl_node_t *node;
+cp
+  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx", from_name, to_name, &options) != 3)
+    {
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
+       return -1;
+    }
+
+  /* Check if names are valid */
+
+  if(check_id(from_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  if(check_id(to_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  /* Lookup nodes */
+
+  from = lookup_node(from_name);
+  
+  if(!from)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  to = lookup_node(to_name);
+  
+  if(!to)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  /* Check if node already exists */
+  
+  v = lookup_edge(from, to);
+  
+  if(v)
+    {
+      /* Check if it matches */
+    }
+  else
+    {
+      v = new_edge();
+      v->from = from;
+      v->to = to;
+      v->options = options;
+      edge_add(v);
+    }
+
+  /* Tell the rest about the new edge */
+
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      other = (connection_t *)node->data;
+      if(other->status.active && other != c)
+        send_add_edge(other, v);
+    }
+
+cp
+  return 0;
+}
+
+int send_del_edge(connection_t *c, edge_t *v)
+{
+cp
+  return send_request(c, "%d %s %s %lx", DEL_EDGE,
+                      v->from->name, v->to->name, v->options);
+}
+
+int del_edge_h(connection_t *c)
+{
+  edge_t *v;
+  char from_name[MAX_STRING_SIZE];
+  char to_name[MAX_STRING_SIZE];
+  node_t *from, *to;
+  long int options;
+  connection_t *other;
+  avl_node_t *node;
+cp
+  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx", from_name, to_name, &options) != 3)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE",
+             c->name, c->hostname);
+      return -1;
+    }
+
+  /* Check if names are valid */
+
+  if(check_id(from_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  if(check_id(to_name))
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
+      return -1;
+    }
+
+  /* Lookup nodes */
+
+  from = lookup_node(from_name);
+  
+  if(!from)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  to = lookup_node(to_name);
+  
+  if(!to)
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
+      return -1;
+    }
+
+  /* Check if edge exists */
+  
+  v = lookup_edge(from, to);
+  
+  if(v)
+    {
+      /* Check if it matches */
+    }
+  else
+    {
+      syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));
+      return -1;
+    }
+
+  /* Tell the rest about the deleted edge */
+
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      other = (connection_t *)node->data;
+      if(other->status.active && other != c)
+        send_del_edge(other, v);
+    }
+
+  /* Delete the edge */
+  
+  edge_del(v);
+cp
+  return 0;
+}
+
+
 /* Status and error notification routines */
 
 int send_status(connection_t *c, int statusno, char *statusstring)
@@ -954,7 +1126,7 @@ int status_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
     {
-       syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
               c->name, c->hostname);
        return -1;
     }
@@ -984,7 +1156,7 @@ int error_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
     {
-       syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
               c->name, c->hostname);
        return -1;
     }
@@ -1083,7 +1255,7 @@ int key_changed_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
     {
-      syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
              c->name, c->hostname);
       return -1;
     }
@@ -1092,7 +1264,7 @@ cp
 
   if(!n)
     {
-      syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"), "KEY_CHANGED",
              c->name, c->hostname, name);
       return -1;
     }
@@ -1121,7 +1293,7 @@ int req_key_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, from_name, to_name) != 2)
     {
-       syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY",
               c->name, c->hostname);
        return -1;
     }
@@ -1130,7 +1302,7 @@ cp
 
   if(!from)
     {
-      syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "REQ_KEY",
              c->name, c->hostname, from_name);
       return -1;
     }
@@ -1139,7 +1311,7 @@ cp
   
   if(!to)
     {
-      syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "REQ_KEY",
              c->name, c->hostname, to_name);
       return -1;
     }
@@ -1186,7 +1358,7 @@ int ans_key_h(connection_t *c)
 cp
   if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_name, to_name, key) != 3)
     {
-       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
+       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY",
               c->name, c->hostname);
        return -1;
     }
@@ -1195,7 +1367,7 @@ cp
 
   if(!from)
     {
-      syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "ANS_KEY",
              c->name, c->hostname, from_name);
       return -1;
     }
@@ -1204,7 +1376,7 @@ cp
 
   if(!to)
     {
-      syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"),
+      syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "ANS_KEY",
              c->name, c->hostname, to_name);
       return -1;
     }
@@ -1215,8 +1387,8 @@ cp
 
   if(keylength != from->keylength * 2)
     {
-      syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
-             c->name, c->hostname, from->name);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s) origin %s: %s"), "ANS_KEY",
+             c->name, c->hostname, from->name, _("invalid key length"));
       return -1;
     }
 
@@ -1265,7 +1437,7 @@ int tcppacket_h(connection_t *c)
 cp  
   if(sscanf(c->buffer, "%*d %hd", &len) != 1)
     {
-      syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname);
       return -1;
     }
 
@@ -1284,6 +1456,7 @@ int (*request_handlers[])(connection_t*) = {
   ping_h, pong_h,
   add_node_h, del_node_h,
   add_subnet_h, del_subnet_h,
+  add_edge_h, del_edge_h,
   key_changed_h, req_key_h, ans_key_h,
   tcppacket_h,
 };
@@ -1296,7 +1469,7 @@ char (*request_name[]) = {
   "PING", "PONG",
   "ADD_NODE", "DEL_NODE",
   "ADD_SUBNET", "DEL_SUBNET",
-  "ADD_VERTEX", "DEL_VERTEX",
+  "ADD_EDGE", "DEL_EDGE",
   "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
   "PACKET",
 };

diff --git a/src/protocol.h b/src/protocol.h
index 64e17ad0d67840797145cdaaedd0d80bf410d59a..5fc30f3866d6ff6e8006e105c14e9d6e8eda2268 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -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: protocol.h,v 1.5.4.23 2001/10/27 12:13:17 guus Exp $
+    $Id: protocol.h,v 1.5.4.24 2001/10/28 08:41:19 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
@@ -42,7 +42,7 @@ enum {
   PING, PONG,
   ADD_NODE, DEL_NODE,
   ADD_SUBNET, DEL_SUBNET,
-  ADD_VERTEX, DEL_VERTEX,
+  ADD_EDGE, DEL_EDGE,
   KEY_CHANGED, REQ_KEY, ANS_KEY,
   PACKET,
   LAST                               /* Guardian for the highest request number */
@@ -69,8 +69,8 @@ extern int send_add_node(connection_t*, node_t*);
 extern int send_del_node(connection_t*, node_t*);
 extern int send_add_subnet(connection_t*, subnet_t*);
 extern int send_del_subnet(connection_t*, subnet_t*);
-extern int send_add_vertex(connection_t*, node_t*);
-extern int send_del_vertex(connection_t*, node_t*);
+extern int send_add_edge(connection_t*, edge_t*);
+extern int send_del_edge(connection_t*, edge_t*);
 extern int send_key_changed(connection_t*, node_t*);
 extern int send_req_key(connection_t*, node_t*, node_t*);
 extern int send_ans_key(connection_t*, node_t*, node_t*, char*);

diff --git a/src/tincd.c b/src/tincd.c
index 2943d0bfc60276f7f5082a43a03c327496374fe4..0ccbdee6f13f6e7bca8a95b8efd580132f771afa 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.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: tincd.c,v 1.10.4.54 2001/10/27 15:19:13 guus Exp $
+    $Id: tincd.c,v 1.10.4.55 2001/10/28 08:41:19 guus Exp $
 */
 
 #include "config.h"
@@ -58,16 +58,19 @@
 char *program_name;
 
 /* If nonzero, display usage information and exit. */
-static int show_help;
+int show_help;
 
 /* If nonzero, print the version on standard output and exit.  */
-static int show_version;
+int show_version;
 
 /* If nonzero, it will attempt to kill a running tincd and exit. */
-static int kill_tincd = 0;
+int kill_tincd = 0;
 
 /* If nonzero, generate public/private keypair for this host/net. */
-static int generate_keys = 0;
+int generate_keys = 0;
+
+/* If nonzero, use null ciphers and skip all key exchanges. */
+int bypass_security = 0;
 
 char *identname;                 /* program name for syslog */
 char *pidfilename;               /* pid file location */
@@ -85,6 +88,7 @@ static struct option const long_options[] =
   { "no-detach", no_argument, &do_detach, 0 },
   { "generate-keys", optional_argument, NULL, 'K'},
   { "debug", optional_argument, NULL, 'd'},
+  { "bypass-security", no_argument, &bypass_security, 1 },
   { NULL, 0, NULL, 0 }
 };
 

diff --git a/src/vertex.c b/src/vertex.c
deleted file mode 100644 (file)
index 9e72f9e..0000000
--- a/src/vertex.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-    vertex.c -- vertex tree management
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: vertex.c,v 1.1.2.3 2001/10/27 13:13:35 guus Exp $
-*/
-
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
-
-#include "net.h"       /* Don't ask. */
-#include "netutl.h"
-#include "config.h"
-#include "conf.h"
-#include <utils.h>
-#include "subnet.h"
-
-#include "xalloc.h"
-#include "system.h"
-
-avl_tree_t *vertex_tree;        /* Tree with all known vertices (replaces active_tree) */
-
-int vertex_compare(vertex_t *a, vertex_t *b)
-{
-  int result;
-
-  result = strcmp(a->from->name, b->from->name);
-  
-  if(result)
-    return result;
-  else
-    return strcmp(a->to->name, b->to->name);
-}
-
-/* Evil vertex_compare() from a parallel universe ;)
-
-int vertex_compare(vertex_t *a, vertex_t *b)
-{
-  int result;
-
-  return (result = strcmp(a->from->name, b->from->name)) || (result = strcmp(a->to->name, b->to->name)), result;
-}
-
-*/
-
-void init_vertices(void)
-{
-cp
-  vertex_tree = avl_alloc_tree((avl_compare_t)vertex_compare, NULL);
-cp
-}
-
-void exit_vertices(void)
-{
-cp
-  avl_delete_tree(vertex_tree);
-cp
-}
-
-/* Creation and deletion of connection elements */
-
-vertex_t *new_vertex(void)
-{
-cp
-  vertex_t *v = (vertex_t *)xmalloc_and_zero(sizeof(*v));
-cp
-  return v;
-}
-
-void free_vertex(vertex_t *v)
-{
-cp
-  free(v);
-cp
-}
-
-void vertex_add(vertex_t *v)
-{
-cp
-  avl_insert(vertex_tree, v);
-cp
-}
-
-void vertex_del(vertex_t *v)
-{
-cp
-  avl_delete(vertex_tree, v);
-cp
-}
-
-vertex_t *lookup_vertex(node_t *from, node_t *to)
-{
-  vertex_t v, *result;
-cp
-  v.from = from;
-  v.to = to;
-
-  result = avl_search(vertex_tree, &v);
-
-  if(result)
-    return result;
-cp
-  v.from = to;
-  v.to = from;
-
-  return avl_search(vertex_tree, &v);
-}
-
-void dump_vertices(void)
-{
-  avl_node_t *node;
-  vertex_t *v;
-cp
-  syslog(LOG_DEBUG, _("Vertices:"));
-
-  for(node = vertex_tree->head; node; node = node->next)
-    {
-      v = (vertex_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s - %s options %ld"),
-             v->from->name, v->to->name, v->options);
-    }
-    
-  syslog(LOG_DEBUG, _("End of vertices."));
-cp
-}

diff --git a/src/vertex.h b/src/vertex.h
deleted file mode 100644 (file)
index b967a2e..0000000
--- a/src/vertex.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    vertex.h -- header for vertex.c
-    Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001 Ivo Timmermans <itimmermans@bigfoot.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: vertex.h,v 1.1.2.5 2001/10/27 12:13:17 guus Exp $
-*/
-
-#ifndef __TINC_VERTEX_H__
-#define __TINC_VERTEX_H__
-
-#include <avl_tree.h>
-
-#include "node.h"
-#include "connection.h"
-
-/* I don't know if halfconnection_t is useful... */
-
-typedef struct halfconnection_t {
-  struct node_t *node;             /* node associated with this end of the connection */
-
-  ipv4_t address;                  /* real (internet) ip on this end of the meta connection */
-  short unsigned int port;         /* port number of this end of the meta connection */
-  char *hostname;                  /* the hostname of real ip */
-} halfconnection_t;
-
-typedef struct vertex_t {
-  struct node_t *from;
-  struct node_t *to;
-
-  long int options;                /* options turned on for this connection */
-  int metric;                      /* weight of this vertex */
-  
-  struct connection_t *connection; /* connection associated with this vertex, if available */
-} vertex_t;
-
-extern avl_tree_t *vertex_tree;    /* Tree with all known vertices (replaces active_tree) */
-
-extern void init_vertices(void);
-extern void exit_vertices(void);
-extern vertex_t *new_vertex(void);
-extern void free_vertex(vertex_t *);
-extern void vertex_add(vertex_t *);
-extern void vertex_del(vertex_t *);
-extern vertex_t *lookup_vertex(struct node_t *, struct node_t *);
-extern void dump_vertices(void);
-
-#endif /* __TINC_VERTEX_H__ */