X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.h;h=367ef714b933d5061f68435b2918010320617a45;hb=263d9903826ffb65aec89bdf5d46f72bd183d467;hp=8cf48e7d1d8a5b99c6ae45450327779dcaa30e2e;hpb=092d620dbb3fdc8226ea0a4e1cfd5cd53d608420;p=tinc

diff --git a/src/net.h b/src/net.h
index 8cf48e7d..367ef714 100644
--- 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
 
-/* 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)
@@ -87,10 +87,18 @@ 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 */
-	uint8_t seqno[4];       /* 32 bits sequence number (network byte order of course) */
+	uint32_t seqno;	       /* 32 bits sequence number (network byte order of course) */
 	uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
+typedef struct sptps_packet_t {
+	length_t len;           /* the actual number of bytes in the `data' field */
+	int priority;           /* priority or TOS */
+	node_id_t dstid;        /* node ID of the final recipient */
+	node_id_t srcid;        /* node ID of the original sender */
+	char data[MAXSIZE];
+} sptps_packet_t;
+
 /* Packet types when using SPTPS */
 
 #define PKT_COMPRESSED 1