X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=4c5956e8b9fc324a302c59d7fe850cf400f1d2f2;hp=62dce9bd1c6f3359c0ef704707ec0f059e3e353d;hb=b3074590b184c141419cf4926820dc0d78380535;hpb=9e96840da810437c45af1c4b139578f7d74d65db

diff --git a/src/net.c b/src/net.c
index 62dce9bd..4c5956e8 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.116 2001/06/21 16:37:47 guus Exp $
+    $Id: net.c,v 1.35.4.119 2001/07/15 14:21:12 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
-
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
-#endif
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
 
-#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));
@@ -344,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
@@ -366,8 +358,7 @@ cp
     taptype = TAP_TYPE_TUNTAP;
   }
  #endif
-#endif
-#ifdef HAVE_FREEBSD
+#else
  taptype = TAP_TYPE_TUNTAP;
 #endif
 cp
@@ -1019,11 +1010,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;
@@ -1428,7 +1418,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;
             }