mtr v0.32

 - Fixed the FreeBSD bug detection stuff.

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

diff --git a/Makefile.am b/Makefile.am
index 00b60c53e7c0dcc345b185116dc61a098a170355..b6b3032cb132dc548b509708082ab5e7ed4c065d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,9 @@ EXTRA_mtr_SOURCES = curses.c \
 mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
 mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
 
-EXTRA_DIST = SECURITY mtr.8
+EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
+distclean-local:
+       cp Makefile.dist Makefile
 
 DISTCLEANFILES = *~
 

diff --git a/Makefile.dist b/Makefile.dist
new file mode 100644 (file)
index 0000000..99680ad
--- /dev/null
+++ b/Makefile.dist
@@ -0,0 +1,16 @@
+
+#
+# This is an attempt on simplifying the compilation of mtr to a simple "make". 
+#
+
+firstrule: 
+       ./configure
+       $(MAKE)
+
+clean: 
+       rm -f *.o *~ core
+
+distclean: clean
+       rm -f mtr config.cache config.status config.log \
+                 stamp-h stamp-h[0-9]* TAGS ID
+

diff --git a/NEWS b/NEWS
index b17c116351ac27b2f1696ec5100a3823670ae0f1..e48abd164378d5a8afbcea5ad6d07d770fad9351 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 WHAT'S NEW?
 
+  v0.32 Fixed the FreeBSD bug detection stuff. 
+
   v0.31 Fixed a few documentation issues. -- Matt
         Changed the autoconf stuff to find the resolver library on 
             Solaris. -- REW

diff --git a/TODO b/TODO
index 729cf05b51b1a2955381c1a8bd2c96f71103b025..e95455ee38297b2b4951edd6dfbaa55097c8359d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,12 +27,21 @@
     not be reset at the start of the "round". This way if you probe
     slowly (relative to the RTT time to the end host), it can probe
     all hosts in the first "round". 
+       -- DONE.
+
+  - allow "keyboard navigation" in the GTK version. 
+
 
 
 - Bugs to fix?
 
   - Do something useful if host couldn't be resolved. 
 
+  - Revert to curses mode even if DISPLAY is set, but a problem
+    prevents us from running in X11 mode.
+       -->  The problem is that gtk_init simply calls exit for us if
+            it finds a problem. Tricky! Suggestions welcome. 
+
 - Nice to have:
 
   - stop sending packets when a new host is getting entered. 
@@ -43,11 +52,6 @@
   - Check why it still tries to go for X11 display if DISPLAY is unset.
     (I saw code to handle this)
 
-  - Revert to curses mode even if DISPLAY is set, but a problem
-    prevents us from running in X11 mode.
-       -->  The problem is that gtk_init simply calls exit for us if
-            it finds a problem. Tricky! Suggestions welcome. 
-
   - Read environment variable "MTR_DEFAULTS" as a commandline before
     parsing the commandline.  -- DONE. (ok it's MTR_OPTIONS.)
 

diff --git a/configure.in b/configure.in
index f0da779f18d5464a1f73be45c4d6ddbc5319b374..3f9422433a509e5addf93b5bdc58ed35088cb5a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.31)
+AM_INIT_AUTOMAKE(mtr, 0.32)
 
 AC_SUBST(GTK_OBJ)
 AC_SUBST(CURSES_OBJ)

diff --git a/gtk.c b/gtk.c
index 20c55207d6d6ea0c297c725ea3395df3f8b08451..3835395e0f4162cb1cdb92224eb613d091d89dd4 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -50,7 +50,10 @@ void gtk_do_init(int *argc, char ***argv) {
 
 int gtk_detect(int *argc, char ***argv) {
   if(getenv("DISPLAY") != NULL) {
-    gtk_do_init(argc, argv);
+    /* If we do this here, gtk_init exits on an error. This happens
+       BEFORE the user has had a chance to tell us not to use the 
+       display... */
+    /*    gtk_do_init(argc, argv); */
     return TRUE;
   } else {
     return FALSE;

diff --git a/net.c b/net.c
index 998236e5fb45846fe6c4053f17abb566bfebfa98..52358dc656fe82291b4ea0d0c7e5098d530085d7 100644 (file)
--- a/net.c
+++ b/net.c
@@ -214,7 +214,7 @@ void net_send_query(int hops) {
   
   rv = sendto(sendsock, packet, packetsize, 0, 
         (struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
-  if (first && (rv == EINVAL)) {
+  if (first && (rv < 0) && (errno == EINVAL)) {
     first = 0;
     ip->len = packetsize;
     rv = sendto(sendsock, packet, packetsize, 0,