X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=5f8b970a93b48e7faa262be898f1a3ac1ee4dbb2;hp=1689aee35d551ab1cba2f5eb4bd281f8d137e69d;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36

diff --git a/src/connection.h b/src/connection.h
index 1689aee3..5f8b970a 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,7 +1,7 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
+                  2000-2002 Ivo Timmermans <ivo@o2w.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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: connection.h,v 1.1.2.24 2002/02/10 21:57:53 guus Exp $
+    $Id: connection.h,v 1.1.2.27 2002/06/21 10:11:12 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -52,6 +52,7 @@
 typedef struct connection_status_t {
   int pinged:1;                    /* sent ping */
   int active:1;                    /* 1 if active.. */
+  int connecting:1;                /* 1 if we are waiting for a non-blocking connect() to finish */
   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 */
@@ -64,8 +65,7 @@ typedef struct connection_status_t {
 typedef struct connection_t {
   char *name;                      /* name he claims to have */
 
-  ipv4_t address;                  /* his real (internet) ip */
-  port_t port;                     /* port number of meta connection */
+  sockaddr_t address;              /* his real (internet) ip */
   char *hostname;                  /* the hostname of its real ip */
   int protocol_version;            /* used protocol */
 
@@ -77,17 +77,23 @@ typedef struct connection_t {
   struct outgoing_t *outgoing;     /* used to keep track of outgoing connections */
 
   struct node_t *node;             /* node associated with the other end */
-  struct edge_t *edge;         /* edge associated with this connection */
+  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 */
+  const EVP_CIPHER *incipher;      /* Cipher he will use to send data to us */
+  const 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 */
+  const EVP_MD *indigest;
+  const EVP_MD *outdigest;
+  int inmaclength;
+  int outmaclength;
+  int incompression;
+  int outcompression;
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */
 
@@ -109,7 +115,6 @@ extern connection_t *new_connection(void);
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern connection_t *lookup_connection(ipv4_t, short unsigned int);
 extern void dump_connections(void);
 extern int read_connection_config(connection_t *);