projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some structures and types that are needed for the overhaul.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
3d0dbff
..
3b194cd
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-16,7
+16,7
@@
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: net.h,v 1.9.4.
4 2000/06/25 16:01:12 guus
Exp $
+ $Id: net.h,v 1.9.4.
10 2000/09/14 14:32:34 zarq
Exp $
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-50,10
+50,21
@@
/* flags */
#define INDIRECTDATA 0x0001 /* Used to indicate that this host has to be reached indirect */
#define EXPORTINDIRECTDATA 0x0002 /* Used to indicate uplink that it has to tell others to do INDIRECTDATA */
/* flags */
#define INDIRECTDATA 0x0001 /* Used to indicate that this host has to be reached indirect */
#define EXPORTINDIRECTDATA 0x0002 /* Used to indicate uplink that it has to tell others to do INDIRECTDATA */
+#define TCPONLY 0x0004 /* Tells sender to send packets over TCP instead of UDP (for firewalls) */
typedef unsigned long ip_t;
typedef short length_t;
typedef unsigned long ip_t;
typedef short length_t;
+struct conn_list_t;
+
+typedef struct subnet_t {
+ ip_t netaddr;
+ ip_t netmask;
+ struct conn_list_t *owner;
+ struct subnet_t *next;
+ struct subnet_t *prev;
+} subnet_t;
+
typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */
unsigned char data[MAXSIZE];
typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */
unsigned char data[MAXSIZE];
@@
-82,7
+93,9
@@
typedef struct status_bits_t {
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 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 unused:22;
+ int encryptout:1; /* 1 if we can encrypt outgoing traffic */
+ int encryptin:1; /* 1 if we have to decrypt incoming traffic */
+ int unused:19;
} status_bits_t;
typedef struct queue_element_t {
} status_bits_t;
typedef struct queue_element_t {
@@
-103,10
+116,11
@@
typedef struct enc_key_t {
} enc_key_t;
typedef struct conn_list_t {
} enc_key_t;
typedef struct conn_list_t {
+ char *name; /* name of this connection */
ip_t vpn_ip; /* his vpn ip */
ip_t vpn_mask; /* his vpn network address */
ip_t real_ip; /* his real (internet) ip */
ip_t vpn_ip; /* his vpn ip */
ip_t vpn_mask; /* his vpn network address */
ip_t real_ip; /* his real (internet) ip */
- char *hostname;
/* the hostname of its real ip */
+ char *hostname; /* the hostname of its real ip */
short unsigned int port; /* his portnumber */
int flags; /* his flags */
int socket; /* our udp vpn socket */
short unsigned int port; /* his portnumber */
int flags; /* his flags */
int socket; /* our udp vpn socket */
@@
-119,11
+133,15
@@
typedef struct conn_list_t {
valid key to be decrypted with) */
enc_key_t *public_key; /* the other party's public key */
enc_key_t *key; /* encrypt with this key */
valid key to be decrypted with) */
enc_key_t *public_key; /* the other party's public key */
enc_key_t *key; /* encrypt with this key */
- char
buffer[MAXBUFSIZE+1]
; /* metadata input buffer */
+ char
*buffer
; /* metadata input buffer */
int buflen; /* bytes read into buffer */
int reqlen; /* length of first request in buffer */
int buflen; /* bytes read into buffer */
int reqlen; /* length of first request in buffer */
+ int tcppacket; /* length of incoming TCP tunnelled packet */
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 */
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 */
+ int allow_request; /* defined if there's only one request possible */
+ char *chal_answer; /* answer to the given challenge */
+ enc_key_t *metakey;
struct conn_list_t *nexthop; /* nearest meta-hop in this direction */
struct conn_list_t *next; /* after all, it's a list of connections */
} conn_list_t;
struct conn_list_t *nexthop; /* nearest meta-hop in this direction */
struct conn_list_t *next; /* after all, it's a list of connections */
} conn_list_t;
@@
-138,6
+156,8
@@
extern int total_socket_out;
extern conn_list_t *conn_list;
extern conn_list_t *myself;
extern conn_list_t *conn_list;
extern conn_list_t *myself;
+extern char *request_name[256];
+
extern int send_packet(ip_t, vpn_packet_t *);
extern int setup_network_connections(void);
extern void close_network_connections(void);
extern int send_packet(ip_t, vpn_packet_t *);
extern int setup_network_connections(void);
extern void close_network_connections(void);
@@
-145,5
+165,7
@@
extern void main_loop(void);
extern int setup_vpn_connection(conn_list_t *);
extern void terminate_connection(conn_list_t *);
extern void flush_queues(conn_list_t*);
extern int setup_vpn_connection(conn_list_t *);
extern void terminate_connection(conn_list_t *);
extern void flush_queues(conn_list_t*);
+extern int xrecv(conn_list_t *, void *);
+extern void add_queue(packet_queue_t **, void *, size_t);
#endif /* __TINC_NET_H__ */
#endif /* __TINC_NET_H__ */