- Moved connlist stuff to the proper header file.

This commit is contained in:
Guus Sliepen 2000-10-29 01:27:23 +00:00
parent 2689690dc3
commit e8391bd499
2 changed files with 23 additions and 23 deletions

View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connlist.h,v 1.1.2.6 2000/10/29 00:02:18 guus Exp $ $Id: connlist.h,v 1.1.2.7 2000/10/29 01:27:23 guus Exp $
*/ */
#ifndef __TINC_CONNLIST_H__ #ifndef __TINC_CONNLIST_H__
@ -29,6 +29,27 @@
#include "net.h" #include "net.h"
#include "conf.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 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;
typedef struct option_bits_t {
int unused:32;
} option_bits_t;
typedef struct conn_list_t { typedef struct conn_list_t {
char *name; /* name of this connection */ char *name; /* name of this connection */
ipv4_t address; /* his real (internet) ip */ ipv4_t address; /* his real (internet) ip */

View file

@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.18 2000/10/28 21:25:21 guus Exp $ $Id: net.h,v 1.9.4.19 2000/10/29 01:27:23 guus Exp $
*/ */
#ifndef __TINC_NET_H__ #ifndef __TINC_NET_H__
@ -83,27 +83,6 @@ typedef struct passphrase_t {
unsigned char *phrase; unsigned char *phrase;
} passphrase_t; } passphrase_t;
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 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;
typedef struct option_bits_t {
int unused:32;
} option_bits_t;
typedef struct queue_element_t { typedef struct queue_element_t {
void *packet; void *packet;
struct queue_element_t *prev; struct queue_element_t *prev;