Remove all unnecessary status.meta and status.active checks.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 4f39990..dc2d65d 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.114 2001/06/08 18:02:10 guus Exp $
+    $Id: net.c,v 1.35.4.122 2001/07/20 13:54:19 guus Exp $
 */
 
 #include "config.h"
@@ -45,32 +45,24 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef HAVE_OPENSSL_RAND_H
-# include <openssl/rand.h>
-#else
-# include <rand.h>
-#endif
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
 
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
-#endif
-
-#ifdef HAVE_OPENSSL_ERR_H
-# include <openssl/err.h>
-#else
-# include <err.h>
-#endif
-
-#ifdef HAVE_OPENSSL_PEM_H
-# include <openssl/pem.h>
-#else
-# include <pem.h>
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
 #endif
 
 #ifdef HAVE_TUNTAP
-#include LINUX_IF_TUN_H
+ #ifdef HAVE_LINUX
+  #ifdef LINUX_IF_TUN_H
+   #include LINUX_IF_TUN_H
+  #else
+   #include <linux/if_tun.h>
+  #endif
+ #else
+  #include <net/if_tun.h>
+ #endif
 #endif
 
 #include <utils.h>
@@ -134,7 +126,7 @@ cp
 
   /* Encrypt the packet. */
 
-  RAND_bytes(inpkt->salt, sizeof(inpkt->salt));
+  RAND_pseudo_bytes(inpkt->salt, sizeof(inpkt->salt));
 
   EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
   EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt));
@@ -261,7 +253,7 @@ cp
     send_udppacket(cl, packet);
 }
 
-/* Broadcast a packet to all active connections */
+/* Broadcast a packet to all active direct connections */
 
 void broadcast_packet(connection_t *from, vpn_packet_t *packet)
 {
@@ -275,7 +267,7 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       cl = (connection_t *)node->data;
-      if(cl->status.meta && cl != from)
+      if(cl->status.active && cl != from)
         send_packet(cl, packet);
     }
 cp
@@ -366,8 +358,7 @@ cp
     taptype = TAP_TYPE_TUNTAP;
   }
  #endif
-#endif
-#ifdef HAVE_FREEBSD
+#else
  taptype = TAP_TYPE_TUNTAP;
 #endif
 cp
@@ -577,7 +568,7 @@ cp
 */
 int setup_outgoing_connection(char *name)
 {
-  connection_t *ncn;
+  connection_t *ncn, *old;
   struct hostent *h;
   config_t const *cfg;
 cp
@@ -587,6 +578,16 @@ cp
       return -1;
     }
 
+  /* Make sure we don't make an outgoing connection to a host that is already in our connection list */
+
+  if((old = lookup_id(name)))
+    {
+      if(debug_lvl >= DEBUG_CONNECTIONS)
+        syslog(LOG_NOTICE, _("We are already connected to %s."), name);
+      old->status.outgoing = 1;
+      return 0;
+    }
+    
   ncn = new_connection();
   asprintf(&ncn->name, "%s", name);
 
@@ -1019,11 +1020,10 @@ cp
         myself = NULL;
       }
 
-  close(tap_fd);
-
-  /* Execute tinc-down script right after shutting down the interface */
   execute_script("tinc-down");
 
+  close(tap_fd);
+
   destroy_connection_tree();
 cp
   return;
@@ -1083,8 +1083,7 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       p = (connection_t *)node->data;
-      if(p->status.meta)
-        FD_SET(p->meta_socket, fs);
+      FD_SET(p->meta_socket, fs);
     }
 
   FD_SET(myself->meta_socket, fs);
@@ -1123,7 +1122,7 @@ cp
       return;
     }
 
-  cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+  cl = lookup_active(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
 
   if(!cl)
     {
@@ -1163,11 +1162,10 @@ cp
 
   if(cl->status.meta)
     {
-
       /* Find all connections that were lost because they were behind cl
          (the connection that was dropped). */
 
-        for(node = connection_tree->head; node; node = node->next)
+        for(node = active_tree->head; node; node = node->next)
           {
             p = (connection_t *)node->data;
             if(p->nexthop == cl && p != cl)
@@ -1180,7 +1178,7 @@ cp
         for(node = connection_tree->head; node; node = node->next)
           {
             p = (connection_t *)node->data;
-            if(p->status.meta && p->status.active && p != cl)
+            if(p->status.active && p != cl)
               send_del_host(p, cl);    /* Sounds like recursion, but p does not have a meta connection :) */
           }
     }
@@ -1229,7 +1227,7 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       cl = (connection_t *)node->data;
-      if(cl->status.active && cl->status.meta)
+      if(cl->status.active)
         {
           if(cl->last_ping_time + timeout < now)
             {
@@ -1301,13 +1299,12 @@ cp
       if(p->status.remove)
        return;
 
-      if(p->status.meta)
-       if(FD_ISSET(p->meta_socket, f))
-         if(receive_meta(p) < 0)
-           {
-             terminate_connection(p);
-             return;
-           }
+      if(FD_ISSET(p->meta_socket, f))
+       if(receive_meta(p) < 0)
+         {
+           terminate_connection(p);
+           return;
+         }
     }
 
   if(FD_ISSET(myself->meta_socket, f))
@@ -1428,7 +1425,7 @@ cp
               if(debug_lvl >= DEBUG_STATUS)
                 syslog(LOG_INFO, _("Regenerating symmetric key"));
 
-              RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+              RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
               send_key_changed(myself, NULL);
               keyexpires = time(NULL) + keylifetime;
             }