X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet_packet.c;h=ee3026a64eeee5f3b3a51cb717067848d87be8da;hb=c217d214f4f071c235bc7c463a1da6124e2570a6;hp=40d945181d72c2a8b728e27e77c1fb8b7cff1fa6;hpb=4e9e3ca89dba68cbacaaa15ddfb298b181a969da;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 40d94518..ee3026a6 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include "system.h"
@@ -70,6 +68,11 @@ void send_mtu_probe(node_t *n)
 	n->mtuprobes++;
 	n->mtuevent = NULL;
 
+	if(!n->status.reachable) {
+		logger(LOG_DEBUG, _("Trying to send MTU probe to unreachable node %s (%s)"), n->name, n->hostname);
+		return;
+	}
+
 	if(n->mtuprobes >= 10 && !n->minmtu) {
 		ifdebug(TRAFFIC) logger(LOG_INFO, _("No response to MTU probes from %s (%s)"), n->name, n->hostname);
 		return;
@@ -82,7 +85,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;
 		
@@ -328,6 +331,11 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt)
 
 	cp();
 
+	if(!n->status.reachable) {
+		ifdebug(TRAFFIC) logger(LOG_INFO, _("Trying to send UDP packet to unreachable node %s (%s)"), n->name, n->hostname);
+		return;
+	}
+
 	/* Make sure we have a valid key */
 
 	if(!n->status.validkey) {
@@ -345,9 +353,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);
@@ -542,7 +550,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;
 	}