projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure to discover MTU with relays.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
3b2cdf0
..
b570d5e
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-32,8
+32,8
@@
#define MTU 1518 /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
#endif
#define MTU 1518 /* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
#endif
-/* 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)
+/* MAXSIZE is the maximum size of an encapsulated packet: MTU + seqno +
srcid + dstid +
padding + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 +
sizeof(node_id_t) + sizeof(node_id_t) +
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)
/* 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)
@@
-52,6
+52,10
@@
typedef struct ipv6_t {
uint16_t x[8];
} ipv6_t;
uint16_t x[8];
} ipv6_t;
+typedef struct node_id_t {
+ uint8_t x[6];
+} node_id_t;
+
typedef short length_t;
#define AF_UNKNOWN 255
typedef short length_t;
#define AF_UNKNOWN 255
@@
-83,7
+87,9
@@
typedef union sockaddr_t {
typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */
int priority; /* priority or TOS */
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) */
+ node_id_t dstid; /* node ID of the final recipient */
+ node_id_t srcid; /* node ID of the original sender */
+ uint8_t seqno[4]; /* 32 bits sequence number (network byte order of course) */
uint8_t data[MAXSIZE];
} vpn_packet_t;
uint8_t data[MAXSIZE];
} vpn_packet_t;
@@
-126,7
+132,6
@@
extern int seconds_till_retry;
extern int addressfamily;
extern unsigned replaywin;
extern bool localdiscovery;
extern int addressfamily;
extern unsigned replaywin;
extern bool localdiscovery;
-extern sockaddr_t localdiscovery_address;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;