X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=dfb6ad97135c7c3d5b83a323b4cb80cca7d168c3;hp=879e06f1d54232ccd80e6829bcd5c54ed47902a9;hb=9024e01ce649b89d304a4aa5b1d6ef0b56b5a12c;hpb=698191fd2f512f3618e2d60592fcd57cd750b965

diff --git a/src/protocol.c b/src/protocol.c
index 879e06f1..dfb6ad97 100644
--- 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.
 
-    $Id: protocol.c,v 1.28.4.58 2000/11/04 22:57:32 guus Exp $
+    $Id: protocol.c,v 1.28.4.61 2000/11/15 13:33:27 guus Exp $
 */
 
 #include "config.h"
@@ -30,15 +30,31 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 #include <utils.h>
 #include <xalloc.h>
 
 #include <netinet/in.h>
 
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
+#ifdef HAVE_OPENSSL_SHA_H
+# include <openssl/sha.h>
+#else
+# include <sha.h>
+#endif
+
+#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 "conf.h"
 #include "net.h"
@@ -877,6 +893,11 @@ cp
   new->cipher_pkttype = EVP_bf_cfb();
   new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
 
+  /* Okay this is a bit ugly... it would be better to setup UDP sockets dynamically, or
+   * perhaps just one UDP socket... but then again, this has benefits too...
+   */
+   
+  setup_vpn_connection(new);
 cp
   return 0;
 }