projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported gnutls based branch.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
d295fed
..
0cd4b8d
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-17,13
+17,13
@@
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.7
0 2003/08/22 11:18:4
2 guus Exp $
+ $Id: net.h,v 1.9.4.7
3 2003/12/20 19:47:5
2 guus Exp $
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
-#include <
openssl/evp
.h>
+#include <
gcrypt
.h>
#include "ipv6.h"
#include "ipv6.h"
@@
-33,7
+33,7
@@
#define MTU 1514 /* 1500 bytes payload + 14 bytes ethernet header */
#endif
#define MTU 1514 /* 1500 bytes payload + 14 bytes ethernet header */
#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 +
64 + 64 + 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 MAXSOCKETS 128 /* Overkill... */
#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... */
@@
-54,7
+54,7
@@
typedef struct ipv6_t {
typedef short length_t;
typedef short length_t;
-#define AF_UNKNOWN
0xFFFF
+#define AF_UNKNOWN
255
struct sockaddr_unknown {
uint16_t family;
struct sockaddr_unknown {
uint16_t family;
@@
-126,7
+126,8
@@
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;
+extern gcry_cipher_hd_t packet_ctx;
+extern gcry_md_hd_t digest_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"
@@
-150,6
+151,7
@@
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)
#ifndef HAVE_MINGW
#define closesocket(s) close(s)