- Very big cleanup.

diff --git a/src/conf.c b/src/conf.c
index 1536b58..ca6640a 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: conf.c,v 1.9.4.17 2000/10/24 15:46:15 guus Exp $
+    $Id: conf.c,v 1.9.4.18 2000/10/29 00:02:17 guus Exp $

 */
 
 
 */
 
 


@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>

+#include <stdio.h>

 
 #include <xalloc.h>
 
 
 #include <xalloc.h>
 


@@ -85,7 +86,7 @@ static internal_config_t hazahaza[] = {
 config_t *
 add_config_val(config_t **cfg, int argtype, char *val)
 {
 config_t *
 add_config_val(config_t **cfg, int argtype, char *val)
 {

-  config_t *p, *r;
+  config_t *p;

   char *q;
 cp
   p = (config_t*)xmalloc(sizeof(*p));
   char *q;
 cp
   p = (config_t*)xmalloc(sizeof(*p));

diff --git a/src/connlist.c b/src/connlist.c
index ebb276e..2965ced 100644 (file)
--- a/src/connlist.c
+++ b/src/connlist.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.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: connlist.c,v 1.1.2.9 2000/10/28 16:41:37 guus Exp $
+    $Id: connlist.c,v 1.1.2.10 2000/10/29 00:02:17 guus Exp $

 */
 
 #include <syslog.h>
 */
 
 #include <syslog.h>


@@ -27,6 +27,7 @@
 #include "conf.h"
 #include <utils.h>
 
 #include "conf.h"
 #include <utils.h>
 

+#include "xalloc.h"

 #include "system.h"
 
 /* Root of the connection list */
 #include "system.h"
 
 /* Root of the connection list */


@@ -79,14 +80,7 @@ cp
       next = p->next;
 
       if(p->status.remove)
       next = p->next;
 
       if(p->status.remove)

-       {
-         if(prev)
-           prev->next = next;
-         else
-           conn_list = next;
-
-         free_conn_list(p);
-       }
+        conn_list_del(p);

       else
        prev = p;
 
       else
        prev = p;
 


@@ -120,8 +114,10 @@ void conn_list_add(conn_list_t *cl)
 cp
   cl->next = conn_list;
   cl->prev = NULL;
 cp
   cl->next = conn_list;
   cl->prev = NULL;

+

   if(cl->next)
     cl->next->prev = cl;
   if(cl->next)
     cl->next->prev = cl;

+

   conn_list = cl;
 cp
 }
   conn_list = cl;
 cp
 }


@@ -134,7 +130,9 @@ cp
   else
     conn_list = cl->next;
   
   else
     conn_list = cl->next;
   

-  cl->next->prev = cl->prev;
+  if(cl->next)
+    cl->next->prev = cl->prev;
+

   free_conn_list(cl);
 cp
 }
   free_conn_list(cl);
 cp
 }


@@ -170,20 +168,20 @@ cp
   for(s = myself->subnets; s != NULL; s = s->next)
     {
       netstr = net2str(s);
   for(s = myself->subnets; s != NULL; s = s->next)
     {
       netstr = net2str(s);

-      syslog(LOG_DEBUG, ": %s", netstr);
+      syslog(LOG_DEBUG, "  %s", netstr);

       free(netstr);
     }
 
   for(p = conn_list; p != NULL; p = p->next)
     {
       free(netstr);
     }
 
   for(p = conn_list; p != NULL; p = p->next)
     {

-      syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"),
+      syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),

             p->name, p->hostname, p->port, p->flags,
             p->socket, p->meta_socket, p->status);
 
       for(s = p->subnets; s != NULL; s = s->next)
         {
           netstr = net2str(s);
             p->name, p->hostname, p->port, p->flags,
             p->socket, p->meta_socket, p->status);
 
       for(s = p->subnets; s != NULL; s = s->next)
         {
           netstr = net2str(s);

-          syslog(LOG_DEBUG, ": %s", netstr);
+          syslog(LOG_DEBUG, "  %s", netstr);

           free(netstr);
         }
     }
           free(netstr);
         }
     }

diff --git a/src/connlist.h b/src/connlist.h
index 3ea64ee..ee91aea 100644 (file)
--- a/src/connlist.h
+++ b/src/connlist.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.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: connlist.h,v 1.1.2.5 2000/10/28 16:41:37 guus Exp $
+    $Id: connlist.h,v 1.1.2.6 2000/10/29 00:02:18 guus Exp $

 */
 
 #ifndef __TINC_CONNLIST_H__
 */
 
 #ifndef __TINC_CONNLIST_H__


@@ -31,11 +31,11 @@
 
 typedef struct conn_list_t {
   char *name;                      /* name of this connection */
 
 typedef struct conn_list_t {
   char *name;                      /* name of this connection */

-  ipv4_t address;                    /* his real (internet) ip */
+  ipv4_t address;                  /* his real (internet) ip */

   char *hostname;                  /* the hostname of its real ip */
   short unsigned int port;         /* his portnumber */
   int protocol_version;            /* used protocol */
   char *hostname;                  /* the hostname of its real ip */
   short unsigned int port;         /* his portnumber */
   int protocol_version;            /* used protocol */

-  int options;                     /* options turned on for this connection */
+  long int options;                /* options turned on for this connection */

 
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
 
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */


@@ -64,10 +64,8 @@ typedef struct conn_list_t {
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */
 
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */
 

-  struct conn_list_t *nexthop;     /* nearest meta-hop in this direction, will be changed to myuplink (GS) */
-  struct conn_list_t *hisuplink;   /* his nearest meta-hop in our direction */
-  struct conn_list_t *myuplink;    /* our nearest meta-hop in his direction */
-
+  struct conn_list_t *nexthop;     /* nearest meta-hop in this direction */
+  

   struct subnet_t *subnets;        /* Pointer to a list of subnets belonging to this connection */
 
   struct config_t *config;         /* Pointer to configuration tree belonging to this host */
   struct subnet_t *subnets;        /* Pointer to a list of subnets belonging to this connection */
 
   struct config_t *config;         /* Pointer to configuration tree belonging to this host */


@@ -83,8 +81,8 @@ extern conn_list_t *myself;
 
 extern conn_list_t *new_conn_list();
 extern void free_conn_list(conn_list_t *);
 
 extern conn_list_t *new_conn_list();
 extern void free_conn_list(conn_list_t *);

-extern void add_conn_list(conn_list_t *);
-extern void del_conn_list(conn_list_t *);
+extern void conn_list_add(conn_list_t *);
+extern void conn_list_del(conn_list_t *);

 extern conn_list_t *lookup_id(char *);
 extern void dump_conn_list(void);
 extern int read_host_config(conn_list_t *);
 extern conn_list_t *lookup_id(char *);
 extern void dump_conn_list(void);
 extern int read_host_config(conn_list_t *);

diff --git a/src/meta.c b/src/meta.c
index bc9d0b5..5774bb9 100644 (file)
--- a/src/meta.c
+++ b/src/meta.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.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: meta.c,v 1.1.2.6 2000/10/24 15:46:16 guus Exp $
+    $Id: meta.c,v 1.1.2.7 2000/10/29 00:02:18 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -28,9 +28,12 @@
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <openssl/evp.h>
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <openssl/evp.h>

+#include <unistd.h>
+#include <string.h>

 
 #include "net.h"
 #include "system.h"
 
 #include "net.h"
 #include "system.h"

+#include "protocol.h"

 
 int send_meta(conn_list_t *cl, char *buffer, int length)
 {
 
 int send_meta(conn_list_t *cl, char *buffer, int length)
 {

diff --git a/src/net.c b/src/net.c
index 3da023c..8b243a5 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.
 
     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.49 2000/10/28 21:52:22 guus Exp $
+    $Id: net.c,v 1.35.4.50 2000/10/29 00:02:18 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -38,6 +38,7 @@
 #include <sys/types.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <syslog.h>
 #include <unistd.h>

+#include <sys/ioctl.h>

 
 #ifdef HAVE_TUNTAP
 #include LINUX_IF_TUN_H
 
 #ifdef HAVE_TUNTAP
 #include LINUX_IF_TUN_H


@@ -660,7 +661,6 @@ int setup_myself(void)
 {
   config_t const *cfg;
   subnet_t *net;
 {
   config_t const *cfg;
   subnet_t *net;

-  int i;

 cp
   myself = new_conn_list();
 
 cp
   myself = new_conn_list();
 


@@ -731,7 +731,7 @@ cp
 
 /* Read in all the subnets specified in the host configuration file */
 
 
 /* Read in all the subnets specified in the host configuration file */
 

-  for(cfg = myself->config; cfg = get_config_val(cfg, subnet); cfg = cfg->next)
+  for(cfg = myself->config; (cfg = get_config_val(cfg, subnet)); cfg = cfg->next)

     {
       net = new_subnet();
       net->type = SUBNET_IPV4;
     {
       net = new_subnet();
       net->type = SUBNET_IPV4;


@@ -868,7 +868,6 @@ cp
        }
       if(p->status.meta)
        {
        }
       if(p->status.meta)
        {

-         send_termreq(p);

          shutdown(p->meta_socket, 0); /* No more receptions */
           close(p->meta_socket);
         }
          shutdown(p->meta_socket, 0); /* No more receptions */
           close(p->meta_socket);
         }


@@ -1016,7 +1015,6 @@ cp
 int handle_incoming_vpn_data()
 {
   vpn_packet_t pkt;
 int handle_incoming_vpn_data()
 {
   vpn_packet_t pkt;

-  int lenin;

   int x, l = sizeof(x);
   struct sockaddr from;
   socklen_t fromlen = sizeof(from);
   int x, l = sizeof(x);
   struct sockaddr from;
   socklen_t fromlen = sizeof(from);


@@ -1056,10 +1054,14 @@ cp
 void terminate_connection(conn_list_t *cl)
 {
   conn_list_t *p;
 void terminate_connection(conn_list_t *cl)
 {
   conn_list_t *p;

-
+  subnet_t *s;

 cp
   if(cl->status.remove)
 cp
   if(cl->status.remove)

-    return;
+    {
+      return;
+    }
+
+  cl->status.remove = 1;

 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),


@@ -1070,36 +1072,33 @@ cp
   if(cl->status.meta)
     close(cl->meta_socket);
 
   if(cl->status.meta)
     close(cl->meta_socket);
 

-  cl->status.remove = 1;
-
-  /* If this cl isn't active, don't send any DEL_HOSTs. */
-
-/* FIXME: reprogram this.
-  if(cl->status.active)
-    notify_others(cl,NULL,send_del_host);
-*/
-    

 cp
   /* Find all connections that were lost because they were behind cl
      (the connection that was dropped). */
 cp
   /* Find all connections that were lost because they were behind cl
      (the connection that was dropped). */

+

   if(cl->status.meta)
     for(p = conn_list; p != NULL; p = p->next)
   if(cl->status.meta)
     for(p = conn_list; p != NULL; p = p->next)

-      {
-        if((p->nexthop == cl) && (p != cl))
-          {
-            if(cl->status.active && p->status.active)
-/* FIXME: reprogram this
-              notify_others(p,cl,send_del_host);
-*/;
-           if(cl->socket)
-             close(cl->socket);
-           p->status.active = 0;
-           p->status.remove = 1;
-          }
-      }
-    
+      if((p->nexthop == cl) && (p != cl))
+        terminate_connection(p);       /* Sounds like recursion, but p does not have a meta connection :) */
+
+  /* Inform others of termination if it was still active */
+
+  if(cl->status.active)
+    for(p = conn_list; p != NULL; p = p->next)
+      if(p->status.meta && p->status.active && p!=cl)
+        send_del_host(p, cl);
+
+  /* Remove the associated subnets */
+
+  for(s = cl->subnets; s; s = s->next)
+    subnet_del(s);
+
+  /* Inactivate */
+

   cl->status.active = 0;
   cl->status.active = 0;

-  
+
+  /* Check if this was our outgoing connection */
+    

   if(cl->status.outgoing)
     {
       signal(SIGALRM, sigalrm_handler);
   if(cl->status.outgoing)
     {
       signal(SIGALRM, sigalrm_handler);


@@ -1126,8 +1125,6 @@ cp
   now = time(NULL);
   for(p = conn_list; p != NULL; p = p->next)
     {
   now = time(NULL);
   for(p = conn_list; p != NULL; p = p->next)
     {

-      if(p->status.remove)
-       continue;

       if(p->status.active && p->status.meta)
        {
           if(p->last_ping_time + timeout < now)
       if(p->status.active && p->status.meta)
        {
           if(p->last_ping_time + timeout < now)


@@ -1178,9 +1175,7 @@ cp
       return 0;
     }
 
       return 0;
     }
 

-  ncn->status.meta = 1;
-  ncn->next = conn_list;
-  conn_list = ncn;
+  conn_list_add(ncn);

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -1239,8 +1234,6 @@ cp
 void handle_tap_input(void)
 {
   vpn_packet_t vp;
 void handle_tap_input(void)
 {
   vpn_packet_t vp;

-  subnet_t *subnet;
-  ipv4_t dest;

   int lenin;
 cp  
   if(taptype == TAP_TYPE_TUNTAP)
   int lenin;
 cp  
   if(taptype == TAP_TYPE_TUNTAP)

diff --git a/src/protocol.c b/src/protocol.c
index c3681af..71b1367 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.
 
     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.46 2000/10/28 21:05:18 guus Exp $
+    $Id: protocol.c,v 1.28.4.47 2000/10/29 00:02:19 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -37,6 +37,7 @@
 #include <netinet/in.h>
 
 #include <openssl/sha.h>
 #include <netinet/in.h>
 
 #include <openssl/sha.h>

+#include <openssl/rand.h>

 
 #include "conf.h"
 #include "encr.h"
 
 #include "conf.h"
 #include "encr.h"


@@ -44,6 +45,7 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "meta.h"
 #include "netutl.h"
 #include "protocol.h"
 #include "meta.h"

+#include "connlist.h"

 
 #include "system.h"
 
 
 #include "system.h"
 


@@ -108,6 +110,7 @@ cp
             syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
                   request_name[request], cl->name, cl->hostname);
        }
             syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
                   request_name[request], cl->name, cl->hostname);
        }

+

       if(request_handlers[request](cl))
        /* Something went wrong. Probably scriptkiddies. Terminate. */
         {
       if(request_handlers[request](cl))
        /* Something went wrong. Probably scriptkiddies. Terminate. */
         {


@@ -122,6 +125,8 @@ cp
             cl->name, cl->hostname);
       return -1;
     }
             cl->name, cl->hostname);
       return -1;
     }

+cp
+  return 0;

 }
 
 /* Connection protocol:
 }
 
 /* Connection protocol:


@@ -214,19 +219,17 @@ cp
         }
     }
 cp    
         }
     }
 cp    

-  if(!(cfg = get_config_val(cl->config, publickey)))
-    {
-      syslog(LOG_ERR, _("No public key known for %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
-  else
+  if((cfg = get_config_val(cl->config, publickey)))

     {
     {

-cp

       cl->rsa_key = RSA_new();
       BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
       BN_hex2bn(&cl->rsa_key->e, "FFFF");
     }
       cl->rsa_key = RSA_new();
       BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
       BN_hex2bn(&cl->rsa_key->e, "FFFF");
     }

-
+  else
+    {
+      syslog(LOG_ERR, _("No public key known for %s (%s)"), cl->name, cl->hostname);
+      return -1;
+    }

 cp
   return send_challenge(cl);
 }
 cp
   return send_challenge(cl);
 }


@@ -452,16 +455,10 @@ cp
       if(debug_lvl >= DEBUG_CONNECTIONS)
         syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
         cl->name, old->hostname, cl->hostname);
       if(debug_lvl >= DEBUG_CONNECTIONS)
         syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
         cl->name, old->hostname, cl->hostname);

-      old->status.active = 0;
+

       terminate_connection(old);
     }
 
       terminate_connection(old);
     }
 

-  /* Notify others of this connection */
-  
-  for(p = conn_list; p; p = p->next)
-    if(p->status.active)
-      send_add_host(p, cl);
-

   /* Activate this connection */
 
   cl->allow_request = ALL;
   /* Activate this connection */
 
   cl->allow_request = ALL;


@@ -479,6 +476,24 @@ cp
   
   for(s = myself->subnets; s; s = s->next)
     send_add_subnet(cl, s);
   
   for(s = myself->subnets; s; s = s->next)
     send_add_subnet(cl, s);

+
+  /* And send him all the hosts and their subnets we know... */
+  
+  for(p = conn_list; p; p = p->next)
+    if(p != cl && p->status.active)
+      {
+        /* Notify others of this connection */
+  
+        if(p->status.meta)
+          send_add_host(p, cl);
+
+        /* Notify new connection of everything we know */
+
+        send_add_host(cl, p);
+        
+        for(s = p->subnets; s; s = s->next)
+          send_add_subnet(cl, s);
+      }

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -501,8 +516,8 @@ int add_subnet_h(conn_list_t *cl)
 {
   char *subnetstr;
   char *name;
 {
   char *subnetstr;
   char *name;

-  conn_list_t *owner;
-  subnet_t *subnet, *old;
+  conn_list_t *owner, *p;
+  subnet_t *subnet;

 cp
   if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 2)
     {
 cp
   if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 2)
     {


@@ -555,6 +570,12 @@ cp
   /* If everything is correct, add the subnet to the list of the owner */
 
   subnet_add(owner, subnet);
   /* If everything is correct, add the subnet to the list of the owner */
 
   subnet_add(owner, subnet);

+
+  /* Tell the rest */
+  
+  for(p = conn_list; p; p = p->next)
+    if(p->status.meta && p->status.active && p!= cl)
+      send_add_subnet(p, subnet);

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -575,8 +596,8 @@ int del_subnet_h(conn_list_t *cl)
 {
   char *subnetstr;
   char *name;
 {
   char *subnetstr;
   char *name;

-  conn_list_t *owner;
-  subnet_t *subnet, *old;
+  conn_list_t *owner, *p;
+  subnet_t *subnet;

 cp
   if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3)
     {
 cp
   if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3)
     {


@@ -629,6 +650,12 @@ cp
   /* If everything is correct, delete the subnet from the list of the owner */
 
   subnet_del(subnet);
   /* If everything is correct, delete the subnet from the list of the owner */
 
   subnet_del(subnet);

+
+  /* Tell the rest */
+  
+  for(p = conn_list; p; p = p->next)
+    if(p->status.meta && p->status.active && p!= cl)
+      send_del_subnet(p, subnet);

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -638,18 +665,18 @@ cp
 int send_add_host(conn_list_t *cl, conn_list_t *other)
 {
 cp
 int send_add_host(conn_list_t *cl, conn_list_t *other)
 {
 cp

-  return send_request(cl, "%d %s %s %lx:%d %lx", ADD_HOST,
-                      myself->name, other->name, other->address, other->port, other->options);
+  return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
+                      other->name, other->address, other->port, other->options);

 }
 
 int add_host_h(conn_list_t *cl)
 {
 }
 
 int add_host_h(conn_list_t *cl)
 {

-  char *sender;
-  conn_list_t *old, *new, *hisuplink;
+  conn_list_t *old, *new;
+  conn_list_t *p;

 cp
   new = new_conn_list();
 
 cp
   new = new_conn_list();
 

-  if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &new->name, &new->address, &new->port, &new->options) != 5)
+  if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &new->name, &new->address, &new->port, &new->options) != 4)

     {
        syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
        return -1;
     {
        syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
        return -1;


@@ -657,10 +684,10 @@ cp
 
   /* Check if identity is a valid name */
 
 
   /* Check if identity is a valid name */
 

-  if(check_id(new->name) || check_id(sender))
+  if(check_id(new->name))

     {
       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
     {
       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);

-      free(sender);
+      free_conn_list(new);

       return -1;
     }
 
       return -1;
     }
 


@@ -670,32 +697,10 @@ cp
     {
       syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
       sighup = 1;
     {
       syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
       sighup = 1;

-      free(sender);
-      return 0;
-    }
-
-  /* We got an ADD_HOST from ourself!? */
-
-  if(!strcmp(sender, myself->name))
-    {
-      syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) from ourself, restarting"), cl->name, cl->hostname);
-      sighup = 1;
-      free(sender);
+      free_conn_list(new);

       return 0;
     }
       return 0;
     }

-
-  /* Lookup his uplink */
-
-  if(!(new->hisuplink = lookup_id(sender)))
-    {
-      syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"),
-             sender, cl->name, cl->hostname);
-      free(sender);
-      return -1;
-    }

     
     

-  free(sender);
-

   /* Fill in more of the new conn_list structure */
 
   new->hostname = hostlookup(htonl(new->address));
   /* Fill in more of the new conn_list structure */
 
   new->hostname = hostlookup(htonl(new->address));


@@ -709,31 +714,34 @@ cp
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
                    old->name, old->hostname, new->name, new->hostname);
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
                    old->name, old->hostname, new->name, new->hostname);

+          free_conn_list(new);

           return 0;
         }
       else
         {
           if(debug_lvl >= DEBUG_CONNECTIONS)
           return 0;
         }
       else
         {
           if(debug_lvl >= DEBUG_CONNECTIONS)

-            syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"),
+            syslog(LOG_NOTICE, _("Removing old entry for %s (%s) in favour of new connection"),

                    old->name, old->hostname);
                    old->name, old->hostname);

-          old->status.active = 0;
+

           terminate_connection(old);
         }
     }
 
           terminate_connection(old);
         }
     }
 

+  /* Hook it up into the conn_list */
+
+  conn_list_add(new);
+
+  /* Tell the rest about the new host */
+
+  for(p = conn_list; p; p = p->next)
+    if(p->status.meta && p->status.active && p!=cl)
+      send_add_host(p, new);
+

   /* Fill in rest of conn_list structure */
 
   new->nexthop = cl;
   new->status.active = 1;
 
   /* Fill in rest of conn_list structure */
 
   new->nexthop = cl;
   new->status.active = 1;
 

-  /* Hook it up into the conn_list */
-
-  conn_list_add(conn_list, new);
-
-  /* Tell the rest about the new host */
-/* FIXME: reprogram this.
-  notify_others(new, cl, send_add_host);
-*/

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -741,21 +749,19 @@ cp
 int send_del_host(conn_list_t *cl, conn_list_t *other)
 {
 cp
 int send_del_host(conn_list_t *cl, conn_list_t *other)
 {
 cp

-  return send_request(cl, "%d %s %s %lx:%d %lx", DEL_HOST,
-                      myself->name, other->name, other->address, other->port, other->options);
+  return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
+                      other->name, other->address, other->port, other->options);

 }
 
 int del_host_h(conn_list_t *cl)
 {
   char *name;
 }
 
 int del_host_h(conn_list_t *cl)
 {
   char *name;

-  char *sender;

   ip_t address;
   port_t port;
   ip_t address;
   port_t port;

-  int options;
-  conn_list_t *old, *hisuplink;
-
+  long int options;
+  conn_list_t *old, *p;

 cp
 cp

-  if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &name, &address, &port, &options) != 5)
+  if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &name, &address, &port, &options) != 4)

     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
              cl->name, cl->hostname);
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
              cl->name, cl->hostname);


@@ -764,10 +770,10 @@ cp
 
   /* Check if identity is a valid name */
 
 
   /* Check if identity is a valid name */
 

-  if(check_id(name) || check_id(sender))
+  if(check_id(name))

     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);

-      free(name); free(sender);
+      free(name);

       return -1;
     }
 
       return -1;
     }
 


@@ -777,33 +783,11 @@ cp
     {
       syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);
     {
       syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);

-      free(name); free(sender);
-      sighup = 1;
-      return 0;
-    }
-
-  /* We got an ADD_HOST from ourself!? */
-
-  if(!strcmp(sender, myself->name))
-    {
-      syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) from ourself, restarting"), cl->name, cl->hostname);
+      free(name);

       sighup = 1;
       sighup = 1;

-      free(name); free(sender);

       return 0;
     }
 
       return 0;
     }
 

-  /* Lookup his uplink */
-
-  if(!(hisuplink = lookup_id(sender)))
-    {
-      syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"),
-             cl->name, cl->hostname, sender);
-      free(name); free(sender);
-      return -1;
-    }
-    
-  free(sender);
-

   /* Check if the new host already exists in the connnection list */
 
   if(!(old = lookup_id(name)))
   /* Check if the new host already exists in the connnection list */
 
   if(!(old = lookup_id(name)))


@@ -816,7 +800,7 @@ cp
   
   /* Check if the rest matches */
   
   
   /* Check if the rest matches */
   

-  if(address!=old->address || port!=old->port || options!=old->options || hisuplink!=old->hisuplink || cl!=old->myuplink)
+  if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop)

     {
       syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
       return 0;
     {
       syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
       return 0;


@@ -824,10 +808,14 @@ cp
 
   /* Ok, since EVERYTHING seems to check out all right, delete it */
 
 
   /* Ok, since EVERYTHING seems to check out all right, delete it */
 

-  old->status.termreq = 1;

   old->status.active = 0;
   old->status.active = 0;

-

   terminate_connection(old);
   terminate_connection(old);

+
+  /* Tell the rest about the new host */
+
+  for(p = conn_list; p; p = p->next)
+    if(p->status.meta && p->status.active && p!=cl)
+      send_del_host(p, old);

 cp
   return 0;
 }
 cp
   return 0;
 }


@@ -893,7 +881,6 @@ cp
     }
 
   free(errorstring);
     }
 
   free(errorstring);

-  cl->status.termreq = 1;

   terminate_connection(cl);
 cp
   return 0;
   terminate_connection(cl);
 cp
   return 0;


@@ -908,7 +895,6 @@ cp
 int termreq_h(conn_list_t *cl)
 {
 cp
 int termreq_h(conn_list_t *cl)
 {
 cp

-  cl->status.termreq = 1;

   terminate_connection(cl);
 cp
   return 0;
   terminate_connection(cl);
 cp
   return 0;

diff --git a/src/subnet.c b/src/subnet.c
index 215b156..1a9a560 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -17,10 +17,11 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: subnet.c,v 1.1.2.7 2000/10/28 21:05:20 guus Exp $
+    $Id: subnet.c,v 1.1.2.8 2000/10/29 00:02:20 guus Exp $

 */
 
 #include <syslog.h>
 */
 
 #include <syslog.h>

+#include <stdio.h>

 
 #include "config.h"
 #include <utils.h>
 
 #include "config.h"
 #include <utils.h>


@@ -114,28 +115,22 @@ cp
   /* Remove it from owner's list */
 
   if(subnet->prev)
   /* Remove it from owner's list */
 
   if(subnet->prev)

-    {
-      subnet->prev->next = subnet->next;
-    }
+    subnet->prev->next = subnet->next;

   else
   else

-    {
-      subnet->owner->subnets = subnet->next;
-    }
+    subnet->owner->subnets = subnet->next;

 
 

-  subnet->next->prev = subnet->prev;
+  if(subnet->next)
+    subnet->next->prev = subnet->prev;

 
   /* Remove it from the global list */
   
   if(subnet->global_prev)
 
   /* Remove it from the global list */
   
   if(subnet->global_prev)

-    {
-      subnet->global_prev->global_next = subnet->global_next;
-    }
+    subnet->global_prev->global_next = subnet->global_next;

   else
   else

-    {
-      subnet_list[subnet->type] = subnet->global_next;
-    }
+    subnet_list[subnet->type] = subnet->global_next;

 
 

-  subnet->global_next->global_prev = subnet->global_prev;
+  if(subnet->global_next)
+    subnet->global_next->global_prev = subnet->global_prev;

   
   free_subnet(subnet);
 cp
   
   free_subnet(subnet);
 cp


@@ -288,7 +283,7 @@ cp
       for(i=0; i<8; i++)
         if((address.x[i] & subnet->net.ipv6.mask.x[i]) != subnet->net.ipv6.address.x[i])
           break;
       for(i=0; i<8; i++)
         if((address.x[i] & subnet->net.ipv6.mask.x[i]) != subnet->net.ipv6.address.x[i])
           break;

-      if(i=8)
+      if(i == 8)

         break;
     }
 cp
         break;
     }
 cp


@@ -305,7 +300,7 @@ cp
   for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
     {
       netstr = net2str(subnet);
   for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
     {
       netstr = net2str(subnet);

-      syslog(LOG_DEBUG, "%s owner %s", netstr, subnet->owner->name);
+      syslog(LOG_DEBUG, "  %s owner %s", netstr, subnet->owner->name);

       free(netstr);
     }
 
       free(netstr);
     }
 

diff --git a/src/tincd.c b/src/tincd.c
index 41361d7..ca873ef 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.
 
     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.16 2000/10/28 21:05:20 guus Exp $
+    $Id: tincd.c,v 1.10.4.17 2000/10/29 00:02:20 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -33,6 +33,7 @@
 #include <signal.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <signal.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>

+#include <string.h>

 
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>


@@ -119,8 +120,7 @@ parse_options(int argc, char **argv, char **envp)
 {
   int r;
   int option_index = 0;
 {
   int r;
   int option_index = 0;

-  config_t *p;
-
+  

   while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF)
     {
       switch(r)
   while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF)
     {
       switch(r)