X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=aca84683e5aaa5a500758803bdcaf90ba435ac8e;hp=9f61275106fc596a5990d33627f3113f252e9efb;hb=b5ccce296848aab72d574ca3de14af5fdf3efa4d;hpb=36f8e4da8b1708474505f5a1fa8cf1ba848921de

diff --git a/src/net_packet.c b/src/net_packet.c
index 9f612751..aca84683 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -71,7 +71,7 @@ void send_mtu_probe(node_t *n)
 	n->mtuevent = NULL;
 
 	if(!n->status.reachable) {
-		ifdebug(TRAFFIC) logger(LOG_INFO, _("Trying to send MTU probe to unreachable node %s (%s)"), n->name, n->hostname);
+		logger(LOG_DEBUG, _("Trying to send MTU probe to unreachable node %s (%s)"), n->name, n->hostname);
 		return;
 	}
 
@@ -87,7 +87,7 @@ void send_mtu_probe(node_t *n)
 			return;
 		}
 
-		len = n->minmtu + 1 + random() % (n->maxmtu - n->minmtu);
+		len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu);
 		if(len < 64)
 			len = 64;
 		
@@ -355,9 +355,9 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt)
 		return;
 	}
 
-	if(n->options & OPTION_PMTU_DISCOVERY && !n->minmtu && (inpkt->data[12] | inpkt->data[13])) {
+	if(n->options & OPTION_PMTU_DISCOVERY && inpkt->len > n->minmtu && (inpkt->data[12] | inpkt->data[13])) {
 		ifdebug(TRAFFIC) logger(LOG_INFO,
-				_("No minimum MTU established yet for %s (%s), forwarding via TCP"),
+				_("Packet for %s (%s) larger than minimum MTU, forwarding via TCP"),
 				n->name, n->hostname);
 
 		send_tcppacket(n->nexthop->connection, origpkt);
@@ -552,7 +552,8 @@ void handle_incoming_vpn_data(int sock)
 	pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
 	if(pkt.len < 0) {
-		logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
+		if(errno != EAGAIN && errno != EINTR)
+			logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
 		return;
 	}