Removed everything from connection.c that has already been moved to node.c and

vertex.c.

diff --git a/src/connection.c b/src/connection.c
index 186a60b110d32db45be36d1aa91d701ed5b91af2..f01b2e7a6a69bb6507985f2adc66881e6d37616b 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.17 2001/10/08 11:47:55 guus Exp $
+    $Id: connection.c,v 1.1.2.18 2001/10/10 09:42:29 guus Exp $
 */
 
 #include "config.h"
@@ -39,232 +39,91 @@
 #include "xalloc.h"
 #include "system.h"
 
-/* Root of the connection list */
-
 avl_tree_t *connection_tree;   /* Meta connections */
-avl_tree_t *active_tree;       /* Activated hosts, sorted by address and port */
-avl_tree_t *id_tree;           /* Activated hosts, sorted by name */
-avl_tree_t *prune_tree;                /* connection_t structures which have to be freed */
-
-/* Pointer to connection describing myself */
-
-connection_t *myself = NULL;
-
-/* Initialization and callbacks */
 
 int connection_compare(connection_t *a, connection_t *b)
 {
-  return a->meta_socket - b->meta_socket;
-}
-
-int active_compare(connection_t *a, connection_t *b)
-{
-  ipv4_t result;
-
-  result = a->address - b->address;
-  if(result)
-    return result;
-  else
-    return a->port - b->port;
-}
-
-int id_compare(connection_t *a, connection_t *b)
-{
-  return strcmp(a->name, b->name);
-}
-
-int prune_compare(connection_t *a, connection_t *b)
-{
-  if(a < b)
-    return -1;
-  else if(a > b)
-    return 1;
-  else
-    return 0;
+  return a->socket - b->socket;
 }
 
 void init_connections(void)
-{
-  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
-  active_tree = avl_alloc_tree((avl_compare_t)active_compare, NULL);
-  id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL);
-  prune_tree = avl_alloc_tree((avl_compare_t)prune_compare, (avl_action_t)free_connection);
-}
-
-/* Creation and deletion of connection elements */
-
-connection_t *new_connection(void)
-{
-  connection_t *p = (connection_t *)xmalloc_and_zero(sizeof(*p));
-cp
-  p->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
-  p->queue = list_alloc((list_action_t)free);
-cp
-  return p;
-}
-
-void free_connection(connection_t *p)
 {
 cp
-  if(p->queue)
-    list_delete_list(p->queue);
-  if(p->name)
-    free(p->name);
-  if(p->hostname)
-    free(p->hostname);
-  if(p->rsa_key)
-    RSA_free(p->rsa_key);
-  if(p->cipher_pktkey)
-    free(p->cipher_pktkey);
-  if(p->buffer)
-    free(p->buffer);
-  if(p->config)
-    clear_config(&p->config);
-  free(p);
+  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
 cp
 }
 
-/*
-  Free all trees.
-*/
-void destroy_trees(void)
+void exit_connection(void)
 {
 cp
-  avl_delete_tree(id_tree);
-  avl_delete_tree(active_tree);
   avl_delete_tree(connection_tree);
-  avl_delete_tree(prune_tree);
-cp
-}
-
-/* Connection management */
-
-void connection_add(connection_t *cl)
-{
-cp
-  avl_insert(connection_tree, cl);
-cp
-}
-
-void connection_del(connection_t *cl)
-{
-cp
-  active_del(cl);
-
-  if(cl->status.meta)
-    avl_delete(connection_tree, cl);
 cp
 }
 
-void active_add(connection_t *cl)
-{
-cp
-  avl_insert(active_tree, cl);
-  avl_insert(id_tree, cl);
-  cl->status.active = 1;
-cp
-}
-
-void active_del(connection_t *cl)
+connection_t *new_connection(void)
 {
 cp
-  if(cl->status.active)
-  {
-    avl_delete(id_tree, cl);
-    avl_delete(active_tree, cl);
-  }
-cp
+  return (connection_t *)xmalloc_and_zero(sizeof(*c));
 }
 
-void id_add(connection_t *cl)
+void free_connection(connection_t *c)
 {
 cp
-  avl_insert(id_tree, cl);
+  if(c->hostname)
+    free(c->hostname);
+  if(c->rsa_key)
+    RSA_free(c->rsa_key);
+  if(c->inpktkey)
+    free(c->inpktkey);
+  if(c->outpktkey)
+    free(c->outpktkey);
+  if(c->mychallenge)
+    free(c->mychallenge);
+  if(c->hischallenge)
+    free(c->hischallenge);
+  free(c);
 cp
 }
 
-void prune_add(connection_t *cl)
+void connection_add(connection_t *c)
 {
 cp
-  avl_insert(prune_tree, cl);
+  avl_insert(connection_tree, c);
 cp
 }
 
-void prune_flush(void)
+void connection_del(connection_t *c)
 {
-  avl_node_t *node, *next;
 cp
-  for(node = prune_tree->head; node; node = next)
-    {
-      next = node->next;
-      avl_delete_node(prune_tree, node);
-    }
+  avl_delete(connection_tree, c);
 cp
 }
 
-/* Lookup functions */
-
-connection_t *lookup_active(ipv4_t address, short unsigned int port)
+connection_t *lookup_connection(ipv4_t address, short unsigned int port)
 {
-  connection_t cl;
+  connection_t c;
 cp
-  cl.address = address;
-  cl.port = port;
-
-  return avl_search(active_tree, &cl);
-}
+  c.address = address;
+  c.port = port;
 
-connection_t *lookup_id(char *name)
-{
-  connection_t cl, *p;
-cp
-  cl.name = name;
-  p = avl_search(id_tree, &cl);
-  if(p)
-    return p;
-  else
-    return NULL;
+  return avl_search(connection_tree, &c);
 }
 
-/* Debugging */
-
-void dump_connection_list(void)
+void dump_connections(void)
 {
   avl_node_t *node;
-  connection_t *cl;
+  connection_t *c;
 cp
-  syslog(LOG_DEBUG, _("Connection list:"));
+  syslog(LOG_DEBUG, _("Connections:"));
 
   for(node = connection_tree->head; node; node = node->next)
     {
-      cl = (connection_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
-             cl->name, cl->hostname, cl->port, cl->options,
-             cl->socket, cl->meta_socket, cl->status);
-    }
-    
-  syslog(LOG_DEBUG, _("Known hosts:"));
-
-  for(node = id_tree->head; node; node = node->next)
-    {
-      cl = (connection_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x nexthop %s prevhop %s via %s"),
-             cl->name, cl->hostname, cl->port, cl->options,
-             cl->socket, cl->meta_socket, cl->status, cl->nexthop->name, cl->prevhop->name, cl->via->name);
+      c = (connection_t *)node->data;
+      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
+             c->node->name, c->hostname, c->port, c->options,
+             cl->socket, c->status);
     }
     
-  syslog(LOG_DEBUG, _("End of connection list."));
-cp
-}
-
-int read_host_config(connection_t *cl)
-{
-  char *fname;
-  int x;
-cp
-  asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
-  x = read_config_file(&cl->config, fname);
-  free(fname);
+  syslog(LOG_DEBUG, _("End of connections."));
 cp
-  return x;
 }

diff --git a/src/connection.h b/src/connection.h
index c60562c245471a247a7990240ce74b05bcc084c4..9d38263a19b55ac88dc112b9814ab537dd82fcf3 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.14 2001/10/10 08:49:47 guus Exp $
+    $Id: connection.h,v 1.1.2.15 2001/10/10 09:42:29 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -89,7 +89,7 @@ typedef struct connection_t {
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */
 
-  char *buffer;                    /* metadata input buffer */
+  char buffer[MAXBUFSIZE];         /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */
   int tcplen;                      /* length of incoming TCPpacket */
   int allow_request;               /* defined if there's only one request possible */