projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Porting to FreeBSD:
[tinc]
/
src
/
connlist.h
diff --git
a/src/connlist.h
b/src/connlist.h
index
d3b2ce3
..
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.
7 2000/10/29 01:27:23 guus
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__
*/
#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 */
@@
-69,10
+79,12
@@
typedef struct conn_list_t {
EVP_CIPHER_CTX *cipher_inctx; /* Context of encrypted meta data that will come from him to us */
EVP_CIPHER_CTX *cipher_outctx; /* Context of encrypted meta data that will be sent from us to him */
EVP_CIPHER_CTX *cipher_inctx; /* Context of encrypted meta data that will come from him to us */
EVP_CIPHER_CTX *cipher_outctx; /* Context of encrypted meta data that will be sent from us to him */
+ char *cipher_inkey; /* His symmetric meta key */
+ char *cipher_outkey; /* Our symmetric meta key */
- EVP_CIPHER_CTX *cipher_pktctx; /* Context of encrypted vpn packets that will be sent to him */
EVP_CIPHER *cipher_pkttype; /* Cipher type for encrypted vpn packets */
EVP_CIPHER *cipher_pkttype; /* Cipher type for encrypted vpn packets */
- char *cipher_pktkey; /* Cipher key */
+ char *cipher_pktkey; /* Cipher key and iv */
+ int cipher_pktkeylength; /* Cipher key and iv length*/
char *buffer; /* metadata input buffer */
int buflen; /* bytes read into buffer */
char *buffer; /* metadata input buffer */
int buflen; /* bytes read into buffer */
@@
-80,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 */
@@
-107,5
+118,7
@@
extern void conn_list_del(conn_list_t *);
extern conn_list_t *lookup_id(char *);
extern void dump_conn_list(void);
extern int read_host_config(conn_list_t *);
extern conn_list_t *lookup_id(char *);
extern void dump_conn_list(void);
extern int read_host_config(conn_list_t *);
+extern void destroy_conn_list(void);
+extern void prune_conn_list(void);
#endif /* __TINC_CONNLIST_H__ */
#endif /* __TINC_CONNLIST_H__ */