From 51d2df55a56ef1b1ab20e67e56778a5bcc3445e7 Mon Sep 17 00:00:00 2001
From: Roger Wolff <r.e.wolff@bitwizard.nl>
Date: Fri, 5 Mar 1999 00:00:00 +0000
Subject: [PATCH] mtr v0.31

 - Fixed a few documentation issues. -- Matt
 - Changed the autoconf stuff to find the resolver library on
   Solaris. -- REW
 - Cleaned up the autoconf.in file a bit. -- Matt.

source: ftp://ftp.bitwizard.nl/mtr/mtr-0.31.tar.gz
---
 NEWS         |  6 +++++-
 README       |  2 +-
 TODO         | 14 ++++++++++++--
 configure.in |  8 +++-----
 mtr.8        |  6 +++---
 mtr.c        |  4 ++--
 net.c        | 10 +++++-----
 7 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/NEWS b/NEWS
index 33da46a..b17c116 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
 WHAT'S NEW?
 
+  v0.31 Fixed a few documentation issues. -- Matt
+        Changed the autoconf stuff to find the resolver library on 
+            Solaris. -- REW
+        Cleaned up the autoconf.in file a bit. -- Matt.
+
   v0.30 Fixed a typo in the changelog (NEWS) entry for 0.27. :-)
 	added use of "MTR_OPTIONS" environment variable for defaults.
 
-
   v0.29 Lots of stuff. 
         Neato overview display by David Sward. 
         FreeBSD does wrong in the kernel the same that Solaris/x86 (see 
diff --git a/README b/README
index 1f68dad..92544d4 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 WHAT IS MTR?
 
-  mtr combines the functionaly of the 'traceroute' and 'ping' programs 
+  mtr combines the functionality of the 'traceroute' and 'ping' programs 
   in a single network diagnostic tool.
 
   As mtr starts, it investigates the network connection between the host
diff --git a/TODO b/TODO
index 5ceb3cd..729cf05 100644
--- a/TODO
+++ b/TODO
@@ -46,8 +46,18 @@
   - 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!
+            it finds a problem. Tricky! Suggestions welcome. 
 
   - Read environment variable "MTR_DEFAULTS" as a commandline before
-    parsing the commandline. 
+    parsing the commandline.  -- DONE. (ok it's MTR_OPTIONS.)
+
+  - Autoconf 2.13 has a neat function that can be used to find the 
+    res_init function: 
+
+	   AC_SEARCH_LIBS(res_init, bind resolv, ,
+	      AC_MSG_ERROR(No resolver library found))
+
+    At the moment (march 1999) autoconf 2.13 is still too new to require 
+    everyone to upgrade. About a year from now we can put this in....
+
 
diff --git a/configure.in b/configure.in
index 00cad60..f0da779 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.30)
+AM_INIT_AUTOMAKE(mtr, 0.31)
 
 AC_SUBST(GTK_OBJ)
 AC_SUBST(CURSES_OBJ)
@@ -38,10 +38,8 @@ AC_CHECK_FUNC(gethostbyname, ,
   AC_CHECK_LIB(nsl, gethostbyname, , AC_MSG_ERROR(No nameservice library found)))
 
 AC_CHECK_FUNC(res_init, , 
-  AC_CHECK_LIB(bind, res_init, , AC_MSG_ERROR(No resolver library found)))
-
-AC_CHECK_FUNC(res_mkquery, , 
-  AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found)))
+  AC_CHECK_LIB(bind, res_init, , 
+   AC_CHECK_LIB(resolv, res_init, , AC_MSG_ERROR(No resolver library found))))
 
 AC_CHECK_FUNC(herror, , AC_DEFINE(NO_HERROR))
 AC_CHECK_FUNC(strerror, , AC_DEFINE(NO_STRERROR))
diff --git a/mtr.8 b/mtr.8
index 4f01de6..626298d 100644
--- a/mtr.8
+++ b/mtr.8
@@ -1,4 +1,4 @@
-.TH MTR 8 "December 28, 1997" "mtr" "mtr"
+.TH MTR 8 "March 4, 1999" "mtr" "mtr"
 
 
 .SH NAME
@@ -8,7 +8,7 @@ mtr \- a network diagnostic tool
 .SH SYNOPSIS
 .B mtr 
 [\c
-.B \-hvrctgi\c
+.B \-hvrctglsni\c
 ]
 [\c
 .B \-\-help\c
@@ -46,7 +46,7 @@ mtr \- a network diagnostic tool
 .SH DESCRIPTION
 
 .B mtr 
-combines the functionaly of the 
+combines the functionality of the 
 .B traceroute
 and 
 .B ping
diff --git a/mtr.c b/mtr.c
index 81fd74b..b03021f 100644
--- a/mtr.c
+++ b/mtr.c
@@ -167,9 +167,9 @@ int main(int argc, char **argv) {
   }
 
   if(PrintHelp) {
-    printf("usage: %s [-hvrctlis] [--help] [--version] [--report]\n"
+    printf("usage: %s [-hvrctglsni] [--help] [--version] [--report]\n"
 	   "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n"
-           "\t\t[--raw] [--split]\n"      /* BL */
+           "\t\t[--raw] [--split] [--no-dns]\n"      /* BL */
 	   "\t\t[--interval=SECONDS] HOSTNAME\n", argv[0]);
     exit(0);
   }
diff --git a/net.c b/net.c
index 994fa48..998236e 100644
--- a/net.c
+++ b/net.c
@@ -45,11 +45,11 @@ int timestamp;
     the fields have different names between, for instance, Linux and 
     Solaris  */
 struct ICMPHeader {
-  unsigned char type;
-  unsigned char code;
-  unsigned short checksum;
-  unsigned short id;
-  unsigned short sequence;
+  uint8 type;
+  uint8 code;
+  uint16 checksum;
+  uint16 id;
+  uint16 sequence;
 };
 
 /*  Structure of an IP header.  */
-- 
2.47.2