X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=426fa49179411f58eca7df0ddf8488eb31f39600;hp=1730023d17c6f54c673896bbf4c25faf70b309f7;hb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;hpb=3308d13e7e3bf20cfeaf6f2ab17228a9820cea66

diff --git a/src/net_packet.c b/src/net_packet.c
index 1730023d..426fa491 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    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$
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -54,7 +52,6 @@
 
 int keylifetime = 0;
 int keyexpires = 0;
-EVP_CIPHER_CTX packet_ctx;
 static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
 
 static void send_udppacket(node_t *, vpn_packet_t *);
@@ -71,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;
@@ -83,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;
 		
@@ -104,15 +106,15 @@ void send_mtu_probe(node_t *n)
 	event_add(n->mtuevent);
 }
 
-void mtu_probe_h(node_t *n, vpn_packet_t *packet) {
+void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 	ifdebug(TRAFFIC) logger(LOG_INFO, _("Got MTU probe length %d from %s (%s)"), packet->len, n->name, n->hostname);
 
 	if(!packet->data[0]) {
 		packet->data[0] = 1;
 		send_packet(n, packet);
 	} else {
-		if(n->minmtu < packet->len)
-			n->minmtu = packet->len;
+		if(n->minmtu < len)
+			n->minmtu = len;
 	}
 }
 
@@ -271,6 +273,8 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 
 	/* Decompress the packet */
 
+	length_t origlen = inpkt->len;
+
 	if(n->incompression) {
 		outpkt = pkt[nextpkt++];
 
@@ -281,6 +285,8 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 		}
 
 		inpkt = outpkt;
+
+		origlen -= MTU/64 + 20;
 	}
 
 	inpkt->priority = 0;
@@ -289,7 +295,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 		n->connection->last_ping_time = now;
 
 	if(!inpkt->data[12] && !inpkt->data[13])
-		mtu_probe_h(n, inpkt);
+		mtu_probe_h(n, inpkt, origlen);
 	else
 		receive_packet(n, inpkt);
 }
@@ -325,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) {
@@ -342,9 +353,9 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt)
 		return;
 	}
 
-	if(!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);
@@ -485,9 +496,15 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet)
 	ifdebug(TRAFFIC) logger(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
 			   packet->len, from->name, from->hostname);
 
-	if(from != myself)
+	if(from != myself) {
 		send_packet(myself, packet);
 
+		// In TunnelServer mode, do not forward broadcast packets.
+                // The MST might not be valid and create loops.
+		if(tunnelserver)
+			return;
+	}
+
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
 
@@ -533,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;
 	}
 
@@ -545,12 +563,14 @@ void handle_incoming_vpn_data(int sock)
 		n = try_harder(&from, &pkt);
 		if(n)
 			update_node_udp(n, &from);
-		else {
+		else ifdebug(PROTOCOL) {
 			hostname = sockaddr2hostname(&from);
 			logger(LOG_WARNING, _("Received UDP packet from unknown source %s"), hostname);
 			free(hostname);
 			return;
 		}
+		else
+			return;
 	}
 
 	receive_udppacket(n, &pkt);