X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=6b40f2ad8a70284b9601e6e74d1d20713eabd6e5;hb=1c475ecb575367a6b3f9328b0f643ad636155341;hp=9c913cabff55c22a114138824354d2e2b328fa83;hpb=1b777010e7255cb354e31ca28c6442ee86383bac;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 9c913cab..6b40f2ad 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -23,6 +23,7 @@
 #include "system.h"
 
 #ifdef HAVE_ZLIB
+#define ZLIB_CONST
 #include <zlib.h>
 #endif
 
@@ -101,6 +102,7 @@ static void udp_probe_timeout_handler(void *data) {
 
 	logger(DEBUG_TRAFFIC, LOG_INFO, "Too much time has elapsed since last UDP ping response from %s (%s), stopping UDP communication", n->name, n->hostname);
 	n->status.udp_confirmed = false;
+	n->udp_ping_rtt = -1;
 	n->maxrecentlen = 0;
 	n->mtuprobes = 0;
 	n->minmtu = 0;
@@ -150,21 +152,31 @@ static void udp_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 		len = ntohs(len16);
 	}
 
-	logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s)", DATA(packet)[0], len, n->name, n->hostname);
+	if(n->udp_ping_sent.tv_sec != 0) {  // a probe in flight
+		gettimeofday(&now, NULL);
+		struct timeval rtt;
+		timersub(&now, &n->udp_ping_sent, &rtt);
+		n->udp_ping_rtt = rtt.tv_sec * 1000000 + rtt.tv_usec;
+		logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s) rtt=%d.%03d", DATA(packet)[0], len, n->name, n->hostname, n->udp_ping_rtt / 1000, n->udp_ping_rtt % 1000);
+	} else {
+		logger(DEBUG_TRAFFIC, LOG_INFO, "Got type %d UDP probe reply %d from %s (%s)", DATA(packet)[0], len, n->name, n->hostname);
+	}
 
 	/* It's a valid reply: now we know bidirectional communication
 	   is possible using the address and socket that the reply
 	   packet used. */
 	if(!n->status.udp_confirmed) {
 		n->status.udp_confirmed = true;
-		fprintf(stderr, "Updating address cache...\n");
-		if (!n->address_cache)
+
+		if(!n->address_cache) {
 			n->address_cache = open_address_cache(n);
+		}
+
 		reset_address_cache(n->address_cache, &n->address);
 	}
 
-	// Reset the UDP ping timer.
-	n->udp_ping_sent = now;
+	// Reset the UDP ping timer. (no probe in flight)
+	n->udp_ping_sent.tv_sec = 0;
 
 	if(udp_discovery) {
 		timeout_del(&n->udp_ping_timeout);
@@ -204,7 +216,7 @@ static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t l
 		lzo1x_1_compress(source, len, dest, &lzolen, lzo_wrkmem);
 		return lzolen;
 #else
-		return -1;
+		return 0;
 #endif
 	} else if(level < 10) {
 #ifdef HAVE_ZLIB
@@ -214,18 +226,18 @@ static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t l
 			return destlen;
 		} else
 #endif
-			return -1;
+			return 0;
 	} else {
 #ifdef HAVE_LZO
 		lzo_uint lzolen = MAXSIZE;
 		lzo1x_999_compress(source, len, dest, &lzolen, lzo_wrkmem);
 		return lzolen;
 #else
-		return -1;
+		return 0;
 #endif
 	}
 
-	return -1;
+	return 0;
 }
 
 static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) {
@@ -240,23 +252,36 @@ static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t
 			return lzolen;
 		} else
 #endif
-			return -1;
+			return 0;
 	}
 
 #ifdef HAVE_ZLIB
 	else {
 		unsigned long destlen = MAXSIZE;
+		static z_stream stream;
 
-		if(uncompress(dest, &destlen, source, len) == Z_OK) {
-			return destlen;
+		if(stream.next_in) {
+			inflateReset(&stream);
 		} else {
-			return -1;
+			inflateInit(&stream);
+		}
+
+		stream.next_in = source;
+		stream.avail_in = len;
+		stream.next_out = dest;
+		stream.avail_out = destlen;
+		stream.total_out = 0;
+
+		if(inflate(&stream, Z_FINISH) == Z_STREAM_END) {
+			return stream.total_out;
+		} else {
+			return 0;
 		}
 	}
 
 #endif
 
-	return -1;
+	return 0;
 }
 
 /* VPN packet I/O */
@@ -280,7 +305,7 @@ static bool try_mac(node_t *n, const vpn_packet_t *inpkt) {
 	return false;
 #else
 
-	if(!n->status.validkey_in || !digest_active(n->indigest) || inpkt->len < sizeof(seqno_t) + digest_length(n->indigest)) {
+	if(!n->status.validkey_in || !digest_active(n->indigest) || (size_t)inpkt->len < sizeof(seqno_t) + digest_length(n->indigest)) {
 		return false;
 	}
 
@@ -339,7 +364,7 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 
 	/* Check packet length */
 
-	if(inpkt->len < sizeof(seqno_t) + digest_length(n->indigest)) {
+	if((size_t)inpkt->len < sizeof(seqno_t) + digest_length(n->indigest)) {
 		logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got too short packet from %s (%s)",
 		       n->name, n->hostname);
 		return false;
@@ -401,7 +426,7 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 					return false;
 				}
 			} else {
-				for(int i = n->received_seqno + 1; i < seqno; i++) {
+				for(seqno_t i = n->received_seqno + 1; i < seqno; i++) {
 					n->late[(i / 8) % replaywin] |= 1 << i % 8;
 				}
 			}
@@ -428,7 +453,7 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 	if(n->incompression) {
 		vpn_packet_t *outpkt = pkt[nextpkt++];
 
-		if((outpkt->len = uncompress_packet(DATA(outpkt), DATA(inpkt), inpkt->len, n->incompression)) < 0) {
+		if(!(outpkt->len = uncompress_packet(DATA(outpkt), DATA(inpkt), inpkt->len, n->incompression))) {
 			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while uncompressing packet from %s (%s)",
 			       n->name, n->hostname);
 			return false;
@@ -436,7 +461,11 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 
 		inpkt = outpkt;
 
-		origlen -= MTU / 64 + 20;
+		if(origlen > MTU / 64 + 20) {
+			origlen -= MTU / 64 + 20;
+		} else {
+			origlen = 0;
+		}
 	}
 
 	if(inpkt->len > n->maxrecentlen) {
@@ -455,7 +484,7 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 #endif
 }
 
-void receive_tcppacket(connection_t *c, const char *buffer, int len) {
+void receive_tcppacket(connection_t *c, const char *buffer, size_t len) {
 	vpn_packet_t outpkt;
 	outpkt.offset = DEFAULT_PACKET_OFFSET;
 
@@ -476,7 +505,7 @@ void receive_tcppacket(connection_t *c, const char *buffer, int len) {
 	receive_packet(c->node, &outpkt);
 }
 
-bool receive_tcppacket_sptps(connection_t *c, const char *data, int len) {
+bool receive_tcppacket_sptps(connection_t *c, const char *data, size_t len) {
 	if(len < sizeof(node_id_t) + sizeof(node_id_t)) {
 		logger(DEBUG_PROTOCOL, LOG_ERR, "Got too short TCP SPTPS packet from %s (%s)", c->name, c->hostname);
 		return false;
@@ -567,9 +596,9 @@ static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
 
 	if(n->outcompression) {
 		outpkt.offset = 0;
-		int len = compress_packet(DATA(&outpkt) + offset, DATA(origpkt) + offset, origpkt->len - offset, n->outcompression);
+		length_t len = compress_packet(DATA(&outpkt) + offset, DATA(origpkt) + offset, origpkt->len - offset, n->outcompression);
 
-		if(len < 0) {
+		if(!len) {
 			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
 		} else if(len < origpkt->len - offset) {
 			outpkt.len = len + offset;
@@ -724,7 +753,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 	if(n->outcompression) {
 		outpkt = pkt[nextpkt++];
 
-		if((outpkt->len = compress_packet(DATA(outpkt), DATA(inpkt), inpkt->len, n->outcompression)) < 0) {
+		if(!(outpkt->len = compress_packet(DATA(outpkt), DATA(inpkt), inpkt->len, n->outcompression))) {
 			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)",
 			       n->name, n->hostname);
 			return;
@@ -878,7 +907,7 @@ bool send_sptps_data(node_t *to, node_t *from, int type, const void *data, size_
 	if(relay_supported) {
 		if(direct) {
 			/* Inform the recipient that this packet was sent directly. */
-			node_id_t nullid = {};
+			node_id_t nullid = {0};
 			memcpy(buf_ptr, &nullid, sizeof(nullid));
 			buf_ptr += sizeof(nullid);
 		} else {
@@ -988,7 +1017,7 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t
 	if(type & PKT_COMPRESSED) {
 		length_t ulen = uncompress_packet(DATA(&inpkt) + offset, (const uint8_t *)data, len, from->incompression);
 
-		if(ulen < 0) {
+		if(!ulen) {
 			return false;
 		} else {
 			inpkt.len = ulen + offset;
@@ -1102,8 +1131,9 @@ static void try_udp(node_t *n) {
 	int interval = n->status.udp_confirmed ? udp_discovery_keepalive_interval : udp_discovery_interval;
 
 	if(ping_tx_elapsed.tv_sec >= interval) {
+		gettimeofday(&now, NULL);
+		n->udp_ping_sent = now; // a probe in flight
 		send_udp_probe_packet(n, MIN_PROBE_SIZE);
-		n->udp_ping_sent = now;
 
 		if(localdiscovery && !n->status.udp_confirmed && n->prevedge) {
 			n->status.send_locally = true;
@@ -1579,7 +1609,7 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 
 static void handle_incoming_vpn_packet(listen_socket_t *ls, vpn_packet_t *pkt, sockaddr_t *addr) {
 	char *hostname;
-	node_id_t nullid = {};
+	node_id_t nullid = {0};
 	node_t *from, *to;
 	bool direct = false;
 
@@ -1696,6 +1726,8 @@ skip_harder:
 }
 
 void handle_incoming_vpn_data(void *data, int flags) {
+	(void)data;
+	(void)flags;
 	listen_socket_t *ls = data;
 
 #ifdef HAVE_RECVMMSG
@@ -1711,14 +1743,14 @@ void handle_incoming_vpn_data(void *data, int flags) {
 
 		iov[i] = (struct iovec) {
 			.iov_base = DATA(&pkt[i]),
-			 .iov_len = MAXSIZE,
+			.iov_len = MAXSIZE,
 		};
 
 		msg[i].msg_hdr = (struct msghdr) {
 			.msg_name = &addr[i].sa,
-			 .msg_namelen = sizeof(addr)[i],
-			  .msg_iov = &iov[i],
-			   .msg_iovlen = 1,
+			.msg_namelen = sizeof(addr)[i],
+			.msg_iov = &iov[i],
+			.msg_iovlen = 1,
 		};
 	}
 
@@ -1765,6 +1797,8 @@ void handle_incoming_vpn_data(void *data, int flags) {
 }
 
 void handle_device_data(void *data, int flags) {
+	(void)data;
+	(void)flags;
 	vpn_packet_t packet;
 	packet.offset = DEFAULT_PACKET_OFFSET;
 	packet.priority = 0;