along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: connection.h,v 1.1.2.10 2001/07/15 18:07:31 guus Exp $
+ $Id: connection.h,v 1.1.2.18 2001/10/28 08:41:19 guus Exp $
*/
#ifndef __TINC_CONNECTION_H__
#include <avl_tree.h>
#include <list.h>
-#include "config.h"
-
#ifdef HAVE_OPENSSL_EVP_H
# include <openssl/evp.h>
#else
#include "net.h"
#include "conf.h"
-typedef struct status_bits_t {
+#include "node.h"
+#include "edge.h"
+
+#define OPTION_INDIRECT 0x0001
+#define OPTION_TCPONLY 0x0002
+
+typedef struct connection_status_t {
int pinged:1; /* sent ping */
- int meta:1; /* meta connection exists */
int active:1; /* 1 if active.. */
int outgoing:1; /* I myself asked for this conn */
int termreq:1; /* the termination of this connection was requested */
int remove:1; /* Set to 1 if you want this connection removed */
int timeout:1; /* 1 if gotten timeout */
- int validkey:1; /* 1 if we currently have a valid key for him */
- int waitingforkey:1; /* 1 if we already sent out a request */
- int dataopen:1; /* 1 if we have a valid UDP connection open */
int encryptout:1; /* 1 if we can encrypt outgoing traffic */
int decryptin:1; /* 1 if we have to decrypt incoming traffic */
int unused:18;
-} status_bits_t;
-
-#define OPTION_INDIRECT 0x0001
-#define OPTION_TCPONLY 0x0002
+} connection_status_t;
typedef struct connection_t {
- char *name; /* name of this connection */
+ char *name; /* name he claims to have */
+
ipv4_t address; /* his real (internet) ip */
- short unsigned int meta_port; /* port number of meta connection */
+ short unsigned int port; /* port number of meta connection */
char *hostname; /* the hostname of its real ip */
int protocol_version; /* used protocol */
- short unsigned int port; /* port number for UDP traffic */
- long int options; /* options turned on for this connection */
-
- int socket; /* our udp vpn socket */
- int meta_socket; /* our tcp meta socket */
- status_bits_t status; /* status info */
-
- RSA *rsa_key; /* the public/private key */
- 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 *cipher_pkttype; /* Cipher type for encrypted vpn packets */
- 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 */
- int tcplen; /* length of incoming TCPpacket */
- 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 */
-
- list_t *queue; /* Queue for packets awaiting to be encrypted */
+ int socket; /* socket used for this connection */
+ long int options; /* options for this connection */
+ struct connection_status_t status; /* status info */
+
+ struct node_t *node; /* node associated with the other end */
+ struct edge_t *edge; /* edge associated with this connection */
+
+ RSA *rsa_key; /* his public/private key */
+ EVP_CIPHER *incipher; /* Cipher he will use to send data to us */
+ EVP_CIPHER *outcipher; /* Cipher we will use to send data to him */
+ EVP_CIPHER_CTX *inctx; /* Context of encrypted meta data that will come from him to us */
+ EVP_CIPHER_CTX *outctx; /* Context of encrypted meta data that will be sent from us to him */
+ char *inkey; /* His symmetric meta key + iv */
+ char *outkey; /* Our symmetric meta key + iv */
+ int inkeylength; /* Length of his key + iv */
+ int outkeylength; /* Length of our key + iv */
char *mychallenge; /* challenge we received from him */
char *hischallenge; /* challenge we sent to him */
- struct connection_t *nexthop; /* nearest meta-hop in this direction */
-
- avl_tree_t *subnet_tree; /* Pointer to a tree of subnets belonging to this connection */
+ char buffer[MAXBUFSIZE]; /* metadata input buffer */
+ int buflen; /* bytes read into buffer */
+ int tcplen; /* length of incoming TCPpacket */
+ 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 */
- struct config_t *config; /* Pointer to configuration tree belonging to this host */
+ avl_tree_t *config_tree; /* Pointer to configuration tree belonging to him */
} connection_t;
extern avl_tree_t *connection_tree;
-extern avl_tree_t *active_tree;
-extern connection_t *myself;
extern void init_connections(void);
+extern void exit_connection(void);
extern connection_t *new_connection(void);
extern void free_connection(connection_t *);
-extern void id_add(connection_t *);
-extern void active_add(connection_t *);
extern void connection_add(connection_t *);
extern void connection_del(connection_t *);
-extern connection_t *lookup_id(char *);
-extern connection_t *lookup_active(ipv4_t, short unsigned int);
-extern void dump_connection_list(void);
-extern int read_host_config(connection_t *);
-extern void destroy_connection_tree(void);
-extern void prune_connection_tree(void);
+extern connection_t *lookup_connection(ipv4_t, short unsigned int);
+extern void dump_connections(void);
+extern int read_connection_config(connection_t *);
#endif /* __TINC_CONNECTION_H__ */
projects / tinc / blobdiff