projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the HAVE_OPENSSL_xxx_H defined from m4/openssl.m4 during
[tinc]
/
src
/
connlist.h
diff --git
a/src/connlist.h
b/src/connlist.h
index
8f974c9
..
8f933bc
100644
(file)
--- 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.
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.1
0 2000/11/03 22:35
:10 zarq Exp $
+ $Id: connlist.h,v 1.1.2.1
3 2000/11/15 01:06
:10 zarq Exp $
*/
#ifndef __TINC_CONNLIST_H__
#define __TINC_CONNLIST_H__
*/
#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 */
#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 */
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 */
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 */
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 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 */
char *mychallenge; /* challenge we received from him */
char *hischallenge; /* challenge we sent to him */