X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=54c38835a2316eecae88b98d118a6521891d87ad;hb=5d9f6c8f2b855cd03a491988c1d4487ffbbc9dd4;hp=fced36b82721f2e6d52dd007341dc069ae88908f;hpb=ae1d95cee66f3e5c6475f03b441d455e436e9ee8;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index fced36b8..54c38835 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -40,8 +40,6 @@ int keylifetime = 0;
 
 static void send_udppacket(meshlink_handle_t *mesh, node_t *, vpn_packet_t *);
 
-unsigned replaywin = 16;
-
 #define MAX_SEQNO 1073741824
 
 /* mtuprobes == 1..30: initial discovery, send bursts with 1 second interval
@@ -132,26 +130,12 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 		packet.len = len;
 		n->status.broadcast = i >= 4 && n->mtuprobes <= 10 && n->prevedge;
 
-		logger(mesh, MESHLINK_INFO, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname);
+		logger(mesh, MESHLINK_DEBUG, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname);
 
 		send_udppacket(mesh, n, &packet);
 	}
 
 	n->status.broadcast = false;
-	n->probe_counter = 0;
-	gettimeofday(&n->probe_time, NULL);
-
-	/* Calculate the packet loss of incoming traffic by comparing the rate of
-	   packets received to the rate with which the sequence number has increased.
-	 */
-
-	if(n->received > n->prev_received)
-		n->packetloss = 1.0 - (n->received - n->prev_received) / (float)(n->received_seqno - n->prev_received_seqno);
-	else
-		n->packetloss = n->received_seqno <= n->prev_received_seqno;
-
-	n->prev_received_seqno = n->received_seqno;
-	n->prev_received = n->received;
 
 end:
 	timeout_set(&mesh->loop, &n->mtutimeout, &(struct timeval){timeout, rand() % 100000});
@@ -163,7 +147,7 @@ void send_mtu_probe(meshlink_handle_t *mesh, node_t *n) {
 }
 
 static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet, uint16_t len) {
-	logger(mesh, MESHLINK_INFO, "Got MTU probe length %d from %s (%s)", packet->len, n->name, n->hostname);
+	logger(mesh, MESHLINK_DEBUG, "Got MTU probe length %d from %s (%s)", packet->len, n->name, n->hostname);
 
 	if(!packet->data[0]) {
 		/* It's a probe request, send back a reply */
@@ -206,26 +190,6 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 			len = n->maxmtu;
 		if(n->minmtu < len)
 			n->minmtu = len;
-
-		/* Calculate RTT and bandwidth.
-		   The RTT is the time between the MTU probe burst was sent and the first
-		   reply is received. The bandwidth is measured using the time between the
-		   arrival of the first and third probe reply.
-		 */
-
-		struct timeval now, diff;
-		gettimeofday(&now, NULL);
-		timersub(&now, &n->probe_time, &diff);
-		
-		n->probe_counter++;
-
-		if(n->probe_counter == 1) {
-			n->rtt = diff.tv_sec + diff.tv_usec * 1e-6;
-			n->probe_time = now;
-		} else if(n->probe_counter == 3) {
-			n->bandwidth = 2.0 * len / (diff.tv_sec + diff.tv_usec * 1e-6);
-			logger(mesh, MESHLINK_DEBUG, "%s (%s) RTT %.2f ms, burst bandwidth %.3f Mbit/s, rx packet loss %.2f %%", n->name, n->hostname, n->rtt * 1e3, n->bandwidth * 8e-6, n->packetloss * 1e2);
-		}
 	}
 }
 
@@ -560,11 +524,11 @@ void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
 		return;
 	}
 
-	logger(mesh, MESHLINK_ERROR, "Sending packet of %d bytes to %s (%s)",
+	logger(mesh, MESHLINK_DEBUG, "Sending packet of %d bytes to %s (%s)",
 			   packet->len, n->name, n->hostname);
 
 	if(!n->status.reachable) {
-		logger(mesh, MESHLINK_INFO, "Node %s (%s) is not reachable",
+		logger(mesh, MESHLINK_WARNING, "Node %s (%s) is not reachable",
 				   n->name, n->hostname);
 		return;
 	}