projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another safe bitfield conversion.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
22d78b2
..
0f70a4b
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-1,7
+1,7
@@
/*
net.h -- header for net.c
/*
net.h -- header for net.c
- Copyright (C) 1998-200
3
Ivo Timmermans <zarq@iname.com>
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
5
Ivo Timmermans <zarq@iname.com>
+ 2000-200
9 Guus Sliepen <guus@tinc-vpn
.org>
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
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.
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.66 2003/07/22 20:55:20 guus Exp
$
+ $Id$
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-28,9
+28,9
@@
#include "ipv6.h"
#ifdef ENABLE_JUMBOGRAMS
#include "ipv6.h"
#ifdef ENABLE_JUMBOGRAMS
-#define MTU 901
4 /* 9000 bytes payload + 14 bytes ethernet header
*/
+#define MTU 901
8 /* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag
*/
#else
#else
-#define MTU 151
4 /* 1500 bytes payload + 14 bytes ethernet header
*/
+#define MTU 151
8 /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag
*/
#endif
#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20) /* MTU + seqno + padding + HMAC + compressor overhead */
#endif
#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20) /* MTU + seqno + padding + HMAC + compressor overhead */
@@
-38,8
+38,6
@@
#define MAXSOCKETS 128 /* Overkill... */
#define MAXSOCKETS 128 /* Overkill... */
-#define MAXQUEUELENGTH 8 /* Maximum number of packats in a single queue */
-
typedef struct mac_t {
uint8_t x[6];
} mac_t;
typedef struct mac_t {
uint8_t x[6];
} mac_t;
@@
-54,10
+52,21
@@
typedef struct ipv6_t {
typedef short length_t;
typedef short length_t;
+#define AF_UNKNOWN 255
+
+struct sockaddr_unknown {
+ uint16_t family;
+ uint16_t pad1;
+ uint32_t pad2;
+ char *address;
+ char *port;
+};
+
typedef union sockaddr_t {
struct sockaddr sa;
struct sockaddr_in in;
struct sockaddr_in6 in6;
typedef union sockaddr_t {
struct sockaddr sa;
struct sockaddr_in in;
struct sockaddr_in6 in6;
+ struct sockaddr_unknown unknown;
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage storage;
#endif
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage storage;
#endif
@@
-76,17
+85,6
@@
typedef struct vpn_packet_t {
uint8_t data[MAXSIZE];
} vpn_packet_t;
uint8_t data[MAXSIZE];
} vpn_packet_t;
-typedef struct queue_element_t {
- void *packet;
- struct queue_element_t *prev;
- struct queue_element_t *next;
-} queue_element_t;
-
-typedef struct packet_queue_t {
- queue_element_t *head;
- queue_element_t *tail;
-} packet_queue_t;
-
typedef struct listen_socket_t {
int tcp;
int udp;
typedef struct listen_socket_t {
int tcp;
int udp;
@@
-94,6
+92,7
@@
typedef struct listen_socket_t {
} listen_socket_t;
#include "conf.h"
} listen_socket_t;
#include "conf.h"
+#include "list.h"
typedef struct outgoing_t {
char *name;
typedef struct outgoing_t {
char *name;
@@
-103,7
+102,9
@@
typedef struct outgoing_t {
struct addrinfo *aip;
} outgoing_t;
struct addrinfo *aip;
} outgoing_t;
-extern int maxtimeout;
+extern list_t *outgoing_list;
+
+extern int maxoutbufsize;
extern int seconds_till_retry;
extern int addressfamily;
extern int seconds_till_retry;
extern int addressfamily;
@@
-115,7
+116,6
@@
extern bool do_prune;
extern bool do_purge;
extern char *myport;
extern time_t now;
extern bool do_purge;
extern char *myport;
extern time_t now;
-extern EVP_CIPHER_CTX packet_ctx;
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
#include "connection.h"
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
#include "connection.h"
@@
-126,18
+126,23
@@
extern void handle_incoming_vpn_data(int);
extern void finish_connecting(struct connection_t *);
extern void do_outgoing_connection(struct connection_t *);
extern bool handle_new_meta_connection(int);
extern void finish_connecting(struct connection_t *);
extern void do_outgoing_connection(struct connection_t *);
extern bool handle_new_meta_connection(int);
-extern int setup_listen_socket(sockaddr_t *);
-extern int setup_vpn_in_socket(sockaddr_t *);
-extern void send_packet(struct node_t *, vpn_packet_t *);
+extern int setup_listen_socket(
const
sockaddr_t *);
+extern int setup_vpn_in_socket(
const
sockaddr_t *);
+extern void send_packet(
const
struct node_t *, vpn_packet_t *);
extern void receive_tcppacket(struct connection_t *, char *, int);
extern void receive_tcppacket(struct connection_t *, char *, int);
-extern void broadcast_packet(struct node_t *, vpn_packet_t *);
-extern bool setup_network
_connections
(void);
+extern void broadcast_packet(
const
struct node_t *, vpn_packet_t *);
+extern bool setup_network(void);
extern void setup_outgoing_connection(struct outgoing_t *);
extern void try_outgoing_connections(void);
extern void close_network_connections(void);
extern void setup_outgoing_connection(struct outgoing_t *);
extern void try_outgoing_connections(void);
extern void close_network_connections(void);
-extern
void
main_loop(void);
+extern
int
main_loop(void);
extern void terminate_connection(struct connection_t *, bool);
extern void flush_queue(struct node_t *);
extern bool read_rsa_public_key(struct connection_t *);
extern void terminate_connection(struct connection_t *, bool);
extern void flush_queue(struct node_t *);
extern bool read_rsa_public_key(struct connection_t *);
+extern void send_mtu_probe(struct node_t *);
+
+#ifndef HAVE_MINGW
+#define closesocket(s) close(s)
+#endif
#endif /* __TINC_NET_H__ */
#endif /* __TINC_NET_H__ */