From: Etienne Dechamps <etienne@edechamps.fr>
Date: Thu, 1 Jan 2015 16:04:08 +0000 (+0000)
Subject: Use -1 to identify the post-initial MTU discovery state.
X-Git-Tag: release-1.1pre12~238
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=5bdc1f2b82869d379812879334dbf2b549ff48db;p=tinc

Use -1 to identify the post-initial MTU discovery state.

This is a minor cosmetic nit to emphasise the distinction between the
initial MTU discovery phase, and the post-initial phase (i.e. maxmtu
checking).

Furthermore, this is an improvement with regard to the DRY (Don't
Repeat Yourself) principle, as the maximum mtuprobes value is only
written once.
---

diff --git a/src/net_packet.c b/src/net_packet.c
index f51aec37..3078e54a 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -66,7 +66,7 @@ int udp_discovery_timeout = 30;
 #define MAX_SEQNO 1073741824
 
 static void try_fix_mtu(node_t *n) {
-	if(n->mtuprobes > 30)
+	if(n->mtuprobes < 0)
 		return;
 
 	if(n->mtuprobes == 30 || n->minmtu >= n->maxmtu) {
@@ -76,7 +76,7 @@ static void try_fix_mtu(node_t *n) {
 			n->maxmtu = n->minmtu;
 		n->mtu = n->minmtu;
 		logger(DEBUG_TRAFFIC, LOG_INFO, "Fixing MTU of %s (%s) to %d after %d probes", n->name, n->hostname, n->mtu, n->mtuprobes);
-		n->mtuprobes = 31;
+		n->mtuprobes = -1;
 	}
 }
 
@@ -904,14 +904,14 @@ static void try_mtu(node_t *n) {
 	}
 
 	/* mtuprobes == 0..29: initial discovery, send bursts with 1 second interval, mtuprobes++
-	   mtuprobes ==    30: fix MTU, and go to 31
-	   mtuprobes ==    31: send one >maxmtu probe every pingtimeout */
+	   mtuprobes ==    30: fix MTU, and go to -1
+	   mtuprobes ==    -1: send one >maxmtu probe every pingtimeout */
 
 	struct timeval now;
 	gettimeofday(&now, NULL);
 	struct timeval elapsed;
 	timersub(&now, &n->probe_sent_time, &elapsed);
-	if(n->mtuprobes < 31) {
+	if(n->mtuprobes >= 0) {
 		if(n->mtuprobes != 0 && elapsed.tv_sec < 1)
 			return;
 	} else {
@@ -922,7 +922,7 @@ static void try_mtu(node_t *n) {
 	try_fix_mtu(n);
 
 	int timeout;
-	if(n->mtuprobes == 31) {
+	if(n->mtuprobes < 0) {
 		/* After the initial discovery, we only send one >maxmtu probe
 		   to detect PMTU increases. */
 		if(n->maxmtu + 8 < MTU)