X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=fbb0abf31f435cb60cfb12141345f6882e1fd536;hp=8d03cc0b4a92cd552ce4208b0989385fde4b86c7;hb=bb2495e569fb161b42efd633eb1c471b8222b1fb;hpb=ac47586552710425417ed80878f8f853c313b421

diff --git a/src/protocol.c b/src/protocol.c
index 8d03cc0b..fbb0abf3 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.56 2000/11/04 16:54:21 guus Exp $
+    $Id: protocol.c,v 1.28.4.60 2000/11/15 01:06:11 zarq Exp $
 */
 
 #include "config.h"
@@ -36,9 +36,24 @@
 
 #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"
@@ -225,7 +240,7 @@ cp
         }
     }
 cp    
-  if((cfg = get_config_val(cl->config, publickey)))
+  if((cfg = get_config_val(cl->config, config_publickey)))
     {
       cl->rsa_key = RSA_new();
       BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
@@ -561,6 +576,8 @@ cp
   if(cl->status.outgoing)
     cl->allow_request = ACK;
 
+  setup_vpn_connection(cl);
+
   x = send_request(cl, "%d", ACK);
   cl->status.encryptout = 1;
 cp
@@ -875,6 +892,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;
 }
@@ -1037,7 +1059,9 @@ cp
 
 int send_ping(conn_list_t *cl)
 {
+cp
   cl->status.pinged = 1;
+  cl->last_ping_time = time(NULL);
 cp
   return send_request(cl, "%d", PING);
 }
@@ -1057,7 +1081,7 @@ cp
 int pong_h(conn_list_t *cl)
 {
 cp
-  cl->status.got_pong = 1;
+  cl->status.pinged = 0;
 cp
   return 0;
 }