From: Roger Wolff <r.e.wolff@bitwizard.nl>
Date: Wed, 25 Aug 2004 00:00:00 +0000 (+0000)
Subject: mtr v0.65
X-Git-Tag: v0.65^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca6e8879138b14f3bd5e28604d6617fc415da0c;p=thirdparty%2Fmtr.git

mtr v0.65

 - Dancer Vesperman noted that mtr no longer traces past a section of
   non-responding hosts. Apparently I added a line in net.c that
   didn't make sense in mtr-0.56. I can't find the reason for adding
   that line, so someone who thinks (s)he needs it, should holler.

source: ftp://ftp.bitwizard.nl/mtr/mtr-0.65.tar.gz
---

diff --git a/NEWS b/NEWS
index 2f87116..862ab15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
 WHAT'S NEW?
+  v0.65 Dancer Vesperman noted that mtr no longer traces past
+        a section of non-responding hosts. Apparently I added
+        a line in net.c that didn't make sense in mtr-0.56. I 
+        can't find the reason for adding that line, so someone 
+        who thinks (s)he needs it, should holler. 
+
   v0.64 Philippe suggests to do the time_t thingy before socket.h. 
         Apparently, MAC OS X doesn't compile socket.h otherwise.
 
diff --git a/configure.in b/configure.in
index c934b0a..1eec99a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.64)
+AM_INIT_AUTOMAKE(mtr, 0.65)
 
 
 AC_SUBST(GTK_OBJ)
diff --git a/net.c b/net.c
index 6abbde1..0ed228e 100644
--- a/net.c
+++ b/net.c
@@ -551,7 +551,6 @@ void net_end_transit()
   }
 }
 
-
 int net_send_batch() 
 {
   int n_unknown=0, i;
@@ -568,16 +567,23 @@ int net_send_batch()
       bitpattern = - (int)(256 + 255*(rand()/(RAND_MAX+0.1)));
     }
   }
+
   net_send_query(batch_at);
 
   for (i=fstTTL-1;i<batch_at;i++) {
     if (host[i].addr == 0)
       n_unknown++;
 
-    if ((host[i].addr == remoteaddress.sin_addr.s_addr) ||
-        (host[i].addr == host[batch_at].addr))
+    /* The second condition in the next "if" statement was added in mtr-0.56, 
+	but I don't remember why. It makes mtr stop skipping sections of unknown
+	hosts. Removed in 0.65. 
+	If the line proves neccesary, it should at least NOT trigger that line 
+	when host[i].addr == 0 -- REW */
+    if ((host[i].addr == remoteaddress.sin_addr.s_addr) 
+	/* || (host[i].addr == host[batch_at].addr)  */)
       n_unknown = MaxHost; /* Make sure we drop into "we should restart" */
   }
+
   if (	// success in reaching target
       (host[batch_at].addr == remoteaddress.sin_addr.s_addr) ||
       // fail in consecuitive MAX_UNKNOWN_HOSTS (firewall?)