X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnlist.h;h=8f933bcab27e5847046e795a44faf38817046c14;hp=8f974c97442b90f0bb9ffd64f994f2cc36fa0ccc;hb=bb2495e569fb161b42efd633eb1c471b8222b1fb;hpb=5065ea32c32e27478d93c00a1bba0c812b7a2b8c

diff --git a/src/connlist.h b/src/connlist.h
index 8f974c97..8f933bca 100644
--- a/src/connlist.h
+++ b/src/connlist.h
@@ -17,21 +17,31 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connlist.h,v 1.1.2.10 2000/11/03 22:35:10 zarq Exp $
+    $Id: connlist.h,v 1.1.2.13 2000/11/15 01:06:10 zarq Exp $
 */
 
 #ifndef __TINC_CONNLIST_H__
 #define __TINC_CONNLIST_H__
 
-#include <openssl/evp.h>
-#include <openssl/rsa.h>
+#include "config.h"
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#ifdef HAVE_OPENSSL_RSA_H
+# include <openssl/rsa.h>
+#else
+# include <rsa.h>
+#endif
 
 #include "net.h"
 #include "conf.h"
 
 typedef struct status_bits_t {
   int pinged:1;                    /* sent ping */
-  int got_pong:1;                  /* received pong */
   int meta:1;                      /* meta connection exists */
   int active:1;                    /* 1 if active.. */
   int outgoing:1;                  /* I myself asked for this conn */
@@ -56,7 +66,7 @@ typedef struct conn_list_t {
   char *hostname;                  /* the hostname of its real ip */
   short unsigned int port;         /* his portnumber */
   int protocol_version;            /* used protocol */
-  long int options;                /* options turned on for this connection */
+  long unsigned int options;       /* options turned on for this connection */
 
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
@@ -82,7 +92,6 @@ typedef struct conn_list_t {
   int allow_request;               /* defined if there's only one request possible */
 
   time_t last_ping_time;           /* last time we saw some activity from the other end */  
-  int want_ping;                   /* 0 if there's no need to check for activity. Shouldn't this go into status? (GS) */
 
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */