projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log more messages using logger().
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
b831cdd
..
23b8cae
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-1,7
+1,7
@@
/*
net.h -- header for net.c
Copyright (C) 1998-2005 Ivo Timmermans
/*
net.h -- header for net.c
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
12
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
@@
-21,20
+21,23
@@
#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 9018
/* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
+#define MTU 9018 /* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
#else
#else
-#define MTU 1518
/* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
+#define MTU 1518 /* 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 MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128) /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
+/* MAXSIZE is the maximum size of an encapsulated packet: MTU + seqno + padding + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 + CIPHER_MAX_BLOCK_SIZE + DIGEST_MAX_SIZE + MTU/64 + 20)
+
+/* MAXBUFSIZE is the maximum size of a request: enough for a MAXSIZEd packet or a 8192 bits RSA key */
+#define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)
-#define MAXSOCKETS
128 /* O
verkill... */
+#define MAXSOCKETS
8 /* Probably o
verkill... */
typedef struct mac_t {
uint8_t x[6];
typedef struct mac_t {
uint8_t x[6];
@@
-77,13
+80,27
@@
typedef union sockaddr_t {
#endif
typedef struct vpn_packet_t {
#endif
typedef struct vpn_packet_t {
- length_t len;
/* the actual number of bytes in the `data' field */
- int priority;
/* priority or TOS */
- uint32_t seqno;
/* 32 bits sequence number (network byte order of course) */
+ length_t len; /* the actual number of bytes in the `data' field */
+ int priority; /* priority or TOS */
+ uint32_t seqno; /* 32 bits sequence number (network byte order of course) */
uint8_t data[MAXSIZE];
} vpn_packet_t;
uint8_t data[MAXSIZE];
} vpn_packet_t;
+/* Packet types when using SPTPS */
+
+#define PKT_COMPRESSED 1
+#define PKT_MAC 2
+#define PKT_PROBE 4
+
+typedef enum packet_type_t {
+ PACKET_NORMAL,
+ PACKET_COMPRESSED,
+ PACKET_PROBE
+} packet_type_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;
int tcp;
int udp;
sockaddr_t sa;
@@
-95,10
+112,11
@@
typedef struct listen_socket_t {
typedef struct outgoing_t {
char *name;
int timeout;
typedef struct outgoing_t {
char *name;
int timeout;
+ splay_tree_t *config_tree;
struct config_t *cfg;
struct addrinfo *ai;
struct addrinfo *aip;
struct config_t *cfg;
struct addrinfo *ai;
struct addrinfo *aip;
- struct event
*event
;
+ struct event
ev
;
} outgoing_t;
extern list_t *outgoing_list;
} outgoing_t;
extern list_t *outgoing_list;
@@
-107,45
+125,70
@@
extern int maxoutbufsize;
extern int seconds_till_retry;
extern int addressfamily;
extern unsigned replaywin;
extern int seconds_till_retry;
extern int addressfamily;
extern unsigned replaywin;
+extern bool localdiscovery;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
-extern int keyexpires;
extern int keylifetime;
extern int udp_rcvbuf;
extern int udp_sndbuf;
extern bool do_prune;
extern int keylifetime;
extern int udp_rcvbuf;
extern int udp_sndbuf;
extern bool do_prune;
-extern bool do_purge;
extern char *myport;
extern char *myport;
-extern time_t now;
extern int contradicting_add_edge;
extern int contradicting_del_edge;
extern int contradicting_add_edge;
extern int contradicting_del_edge;
-
-extern volatile bool running;
+extern time_t last_config_check;
+
+extern char *proxyhost;
+extern char *proxyport;
+extern char *proxyuser;
+extern char *proxypass;
+typedef enum proxytype_t {
+ PROXY_NONE = 0,
+ PROXY_SOCKS4,
+ PROXY_SOCKS4A,
+ PROXY_SOCKS5,
+ PROXY_HTTP,
+ PROXY_EXEC,
+} proxytype_t;
+extern proxytype_t proxytype;
+
+extern char *scriptinterpreter;
+extern char *scriptextension;
/* 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 finish_connecting(struct connection_t *);
-extern
void do_outgoing_connection(struct connection
_t *);
-extern
bool handle_new_meta_connection(int
);
+extern
bool do_outgoing_connection(struct outgoing
_t *);
+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 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 bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len);
+extern bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len);
+extern void send_packet(struct node_t *, vpn_packet_t *);
extern void receive_tcppacket(struct connection_t *, const char *, int);
extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
extern void receive_tcppacket(struct connection_t *, const char *, int);
extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
+extern char *get_name(void);
+extern bool setup_myself_reloadable(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 int main_loop(void);
extern void terminate_connection(struct connection_t *, bool);
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 int main_loop(void);
extern void terminate_connection(struct connection_t *, bool);
-extern void flush_queue(struct node_t *);
+extern bool node_read_ecdsa_public_key(struct node_t *);
+extern bool read_ecdsa_public_key(struct connection_t *);
extern bool read_rsa_public_key(struct connection_t *);
extern void send_mtu_probe(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(void);
+extern void purge(void);
+extern void retry(void);
+extern int reload_configuration(void);
extern void load_all_subnets(void);
#ifndef HAVE_MINGW
extern void load_all_subnets(void);
#ifndef HAVE_MINGW
@@
-154,4
+197,4
@@
extern void load_all_subnets(void);
extern CRITICAL_SECTION mutex;
#endif
extern CRITICAL_SECTION mutex;
#endif
-#endif
/* __TINC_NET_H__ */
+#endif /* __TINC_NET_H__ */