X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=9048d507f54fe1ec92925b2c54e0c9cc46303868;hp=9c1dd3b89f2541c513990c3370087852fe7dcc96;hb=5e2ded68bfc7b3a1bfa600c1ce46144eb50e57a2;hpb=04ec0b82ab9c6a2662300a9257a5aff1c4dd56e7

diff --git a/src/net.c b/src/net.c
index 9c1dd3b8..9048d507 100644
--- 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.115 2001/06/21 16:16:31 guus Exp $
+    $Id: net.c,v 1.35.4.121 2001/07/19 12:29:40 guus Exp $
 */
 
 #include "config.h"
@@ -45,36 +45,25 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef HAVE_OPENSSL_RAND_H
-# include <openssl/rand.h>
-#else
-# include <rand.h>
-#endif
-
-#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
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
 
-#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
 
-#warning oi1
 #ifdef HAVE_TUNTAP
-#warning oi2
-#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
-#warning oi3
 
 #include <utils.h>
 #include <xalloc.h>
@@ -137,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));
@@ -347,12 +336,12 @@ cp
   /* Set default MAC address for ethertap devices */
 
   mymac.type = SUBNET_MAC;
-  mymac.net.mac.address.x[0] = 0xff;
-  mymac.net.mac.address.x[1] = 0xff;
-  mymac.net.mac.address.x[2] = 0xff;
-  mymac.net.mac.address.x[3] = 0xff;
-  mymac.net.mac.address.x[4] = 0xff;
-  mymac.net.mac.address.x[5] = 0xff;
+  mymac.net.mac.address.x[0] = 0xfe;
+  mymac.net.mac.address.x[1] = 0xfd;
+  mymac.net.mac.address.x[2] = 0x00;
+  mymac.net.mac.address.x[3] = 0x00;
+  mymac.net.mac.address.x[4] = 0x00;
+  mymac.net.mac.address.x[5] = 0x00;
 
 #ifdef HAVE_LINUX
  #ifdef HAVE_TUNTAP
@@ -369,8 +358,7 @@ cp
     taptype = TAP_TYPE_TUNTAP;
   }
  #endif
-#endif
-#ifdef HAVE_FREEBSD
+#else
  taptype = TAP_TYPE_TUNTAP;
 #endif
 cp
@@ -580,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
@@ -590,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);
 
@@ -1022,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;
@@ -1126,7 +1123,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)
     {
@@ -1431,7 +1428,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;
             }