X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=7833fd87b65ec2047e0dd4c3bf350cf3c5c46cda;hb=88026f27715774a7647c109ba5594068f0ba56af;hp=131f52ec3b4b1680193bcb8d08462ab50cd26e1a;hpb=7939ee12836bf2ef772f2a6a1e805ee0d64a8e70;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 131f52ec..7833fd87 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -146,14 +146,6 @@ static void send_mtu_probe_handler(void *data) {
 		send_udp_probe_packet(n, MAX(len, 64));
 	}
 
-	/* In case local discovery is enabled, another packet is added to each batch,
-	   which will be broadcast to the local network. */
-	if(localdiscovery && n->mtuprobes <= 10 && n->prevedge) {
-		n->status.send_locally = true;
-		send_udp_probe_packet(n, 16);
-		n->status.send_locally = false;
-	}
-
 	n->probe_counter = 0;
 	gettimeofday(&n->probe_time, NULL);
 
@@ -969,6 +961,12 @@ static void try_udp(node_t* n) {
 	if(ping_tx_elapsed.tv_sec >= udp_discovery_interval) {
 		send_udp_probe_packet(n, MAX(n->minmtu, 16));
 		n->udp_ping_sent = now;
+
+		if(localdiscovery && !n->status.udp_confirmed && n->prevedge) {
+			n->status.send_locally = true;
+			send_udp_probe_packet(n, 16);
+			n->status.send_locally = false;
+		}
 	}
 }