projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle truncated message authentication codes.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
90463eb
..
a28f478
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,28
+17,26
@@
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.73 2003/12/20 19:47:52 guus Exp
$
+ $Id$
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
-#include <openssl/evp.h>
-
#include "ipv6.h"
#include "ipv6.h"
+#include "cipher.h"
+#include "digest.h"
#ifdef ENABLE_JUMBOGRAMS
#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
#endif
-#define MAXSIZE (MTU + 4 +
EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)
/* MTU + seqno + padding + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 +
CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20)
/* MTU + seqno + padding + HMAC + compressor overhead */
#define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128) /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
#define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128) /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
-#define MAXSOCKETS 128 /* Overkill... */
-
-#define MAXQUEUELENGTH 8 /* Maximum number of packats in a single queue */
+#define MAXSOCKETS 8 /* Probably overkill... */
typedef struct mac_t {
uint8_t x[6];
typedef struct mac_t {
uint8_t x[6];
@@
-87,24
+85,16
@@
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 {
typedef struct listen_socket_t {
+ struct event ev_tcp;
+ struct event ev_udp;
int tcp;
int udp;
sockaddr_t sa;
} listen_socket_t;
#include "conf.h"
int tcp;
int udp;
sockaddr_t sa;
} listen_socket_t;
#include "conf.h"
+#include "list.h"
typedef struct outgoing_t {
char *name;
typedef struct outgoing_t {
char *name;
@@
-112,38
+102,36
@@
typedef struct outgoing_t {
struct config_t *cfg;
struct addrinfo *ai;
struct addrinfo *aip;
struct config_t *cfg;
struct addrinfo *ai;
struct addrinfo *aip;
+ struct event ev;
} outgoing_t;
} outgoing_t;
-extern int maxtimeout;
+extern list_t *outgoing_list;
+
+extern int maxoutbufsize;
extern int seconds_till_retry;
extern int addressfamily;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern int seconds_till_retry;
extern int addressfamily;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
-extern int keyexpires;
extern int keylifetime;
extern int keylifetime;
-extern bool strictsource;
extern bool do_prune;
extern bool do_prune;
-extern bool do_purge;
extern char *myport;
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"
#include "node.h"
extern void retry_outgoing(outgoing_t *);
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
#include "connection.h"
#include "node.h"
extern void retry_outgoing(outgoing_t *);
-extern void handle_incoming_vpn_data(int);
+extern void handle_incoming_vpn_data(int
, short, void *
);
extern void finish_connecting(struct connection_t *);
extern void do_outgoing_connection(struct connection_t *);
extern void finish_connecting(struct connection_t *);
extern void do_outgoing_connection(struct connection_t *);
-extern
bool handle_new_meta_connection(int
);
+extern
void handle_new_meta_connection(int, short, void *
);
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 broadcast_packet(const 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 broadcast_packet(const struct node_t *, vpn_packet_t *);
-extern bool setup_network
_connections
(void);
+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);
@@
-152,6
+140,12
@@
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 *);
extern void flush_queue(struct node_t *);
extern bool read_rsa_public_key(struct connection_t *);
extern void send_mtu_probe(struct node_t *);
+extern void handle_device_data(int, short, void *);
+extern void handle_meta_connection_data(int, short, void *);
+extern void regenerate_key();
+extern void purge(void);
+extern void retry(void);
+extern int reload_configuration(void);
#ifndef HAVE_MINGW
#define closesocket(s) close(s)
#ifndef HAVE_MINGW
#define closesocket(s) close(s)