X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=e732ef8b6a38b8b413a25b4d868a38e9b07223d1;hb=eacb5a28fb4c1515633f2b8a206e7067bc7b8f0c;hp=9e5ef4654b3cc0ce007374cefe36724d67159986;hpb=d91903ef3c2a1f4481ae8757bb2b14282f2b7e68;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 9e5ef465..e732ef8b 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -85,16 +85,21 @@ void send_mtu_probe(node_t *n) {
 	}
 
 	if(n->mtuprobes > 32) {
+		if(!n->minmtu) {
+			n->mtuprobes = 31;
+			timeout = pinginterval;
+			goto end;
+		}
+
 		ifdebug(TRAFFIC) logger(LOG_INFO, "%s (%s) did not respond to UDP ping, restarting PMTU discovery", n->name, n->hostname);
 		n->mtuprobes = 1;
 		n->minmtu = 0;
 		n->maxmtu = MTU;
 	}
 
-	if(n->mtuprobes >= 10 && !n->minmtu) {
+	if(n->mtuprobes >= 10 && n->mtuprobes < 32 && !n->minmtu) {
 		ifdebug(TRAFFIC) logger(LOG_INFO, "No response to MTU probes from %s (%s)", n->name, n->hostname);
-		n->mtuprobes = 0;
-		return;
+		n->mtuprobes = 31;
 	}
 
 	if(n->mtuprobes == 30 || (n->mtuprobes < 30 && n->minmtu >= n->maxmtu)) {
@@ -148,12 +153,17 @@ void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 		packet->data[0] = 1;
 		send_udppacket(n, packet);
 	} else {
+		if(n->mtuprobes > 30) {
+			if(n->minmtu)
+				n->mtuprobes = 30;
+			else
+				n->mtuprobes = 1;
+		}
+
 		if(len > n->maxmtu)
 			len = n->maxmtu;
 		if(n->minmtu < len)
 			n->minmtu = len;
-		if(n->mtuprobes > 30)
-			n->mtuprobes = 30;
 	}
 }
 
@@ -565,20 +575,21 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 	avl_node_t *node;
 	edge_t *e;
 	node_t *n = NULL;
+	bool hard = false;
 	static time_t last_hard_try = 0;
 
 	for(node = edge_weight_tree->head; node; node = node->next) {
 		e = node->data;
 
+		if(e->to == myself)
+			continue;
+
 		if(sockaddrcmp_noport(from, &e->address)) {
 			if(last_hard_try == now)
 				continue;
-			last_hard_try = now;
+			hard = true;
 		}
 
-		if(!n)
-			n = e->to;
-
 		if(!try_mac(e->to, pkt))
 			continue;
 
@@ -586,6 +597,9 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 		break;
 	}
 
+	if(hard)
+		last_hard_try = now;
+
 	return n;
 }