X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.h;h=436f192a91636bdc24727bd6b0de1a273aa65f2f;hp=8ab81288a42b18a7d83120939018a30c8eec7b8a;hb=8c91fac31570594b6249d632cefe768f33c54b19;hpb=2165931c62f0433fd97bd3ac6aefea3627218946

diff --git a/src/connection.h b/src/connection.h
index 8ab81288..436f192a 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,7 +1,7 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
 
     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.21 2001/10/30 16:34:32 guus Exp $
+    $Id: connection.h,v 1.1.2.25 2002/02/18 16:25:16 guus Exp $
 */
 
 #ifndef __TINC_CONNECTION_H__
@@ -52,21 +52,20 @@
 typedef struct connection_status_t {
   int pinged:1;                    /* sent ping */
   int active:1;                    /* 1 if active.. */
-  int outgoing:1;                  /* I myself asked for this conn */
+  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 */
   int encryptout:1;		   /* 1 if we can encrypt outgoing traffic */
   int decryptin:1;                 /* 1 if we have to decrypt incoming traffic */
   int mst:1;			   /* 1 if this connection is part of a minimum spanning tree */
-  int unused:17;
+  int unused:18;
 } connection_status_t;
 
 typedef struct connection_t {
   char *name;                      /* name he claims to have */
 
-  ipv4_t address;                  /* his real (internet) ip */
-  short unsigned int 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 */
 
@@ -75,9 +74,10 @@ typedef struct connection_t {
   struct connection_status_t status; /* status info */
   int estimated_weight;            /* estimation for the weight of the edge for this connection */
   struct timeval start;            /* time this connection was started, used for above estimation */
+  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 */
@@ -109,7 +109,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 *);