diff -ur mtr-0.30/NEWS mtr-0.31/NEWS --- mtr-0.30/NEWS Thu Mar 4 17:30:17 1999 +++ mtr-0.31/NEWS Fri Mar 5 00:55:58 1999 @@ -1,8 +1,12 @@ 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. diff -ur mtr-0.30/README mtr-0.31/README --- mtr-0.30/README Wed Mar 3 01:21:24 1999 +++ mtr-0.31/README Fri Mar 5 00:19:38 1999 @@ -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 -ur mtr-0.30/TODO mtr-0.31/TODO --- mtr-0.30/TODO Wed Mar 3 01:21:24 1999 +++ mtr-0.31/TODO Fri Mar 5 00:42:03 1999 @@ -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 -ur mtr-0.30/config.h.in mtr-0.31/config.h.in --- mtr-0.30/config.h.in Wed Mar 3 01:21:24 1999 +++ mtr-0.31/config.h.in Fri Mar 5 00:44:33 1999 @@ -55,9 +55,6 @@ /* Define if you have the nsl library (-lnsl). */ #undef HAVE_LIBNSL -/* Define if you have the resolv library (-lresolv). */ -#undef HAVE_LIBRESOLV - /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET diff -ur mtr-0.30/configure mtr-0.31/configure --- mtr-0.30/configure Thu Mar 4 19:09:43 1999 +++ mtr-0.31/configure Fri Mar 5 00:45:44 1999 @@ -700,7 +700,7 @@ PACKAGE=mtr -VERSION=0.30 +VERSION=0.31 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -2066,79 +2066,27 @@ else echo "$ac_t""no" 1>&6 -{ echo "configure: error: No resolver library found" 1>&2; exit 1; } -fi - -fi - - -echo $ac_n "checking for res_mkquery""... $ac_c" 1>&6 -echo "configure:2077: checking for res_mkquery" >&5 -if eval "test \"`echo '$''{'ac_cv_func_res_mkquery'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char res_mkquery(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_res_mkquery) || defined (__stub___res_mkquery) -choke me -#else -res_mkquery(); -#endif - -; return 0; } -EOF -if { (eval echo configure:2105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_res_mkquery=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_res_mkquery=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'res_mkquery`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for res_mkquery in -lresolv""... $ac_c" 1>&6 -echo "configure:2123: checking for res_mkquery in -lresolv" >&5 -ac_lib_var=`echo resolv'_'res_mkquery | sed 'y%./+-%__p_%'` +echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6 +echo "configure:2071: checking for res_init in -lresolv" >&5 +ac_lib_var=`echo resolv'_'res_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2168,14 +2116,16 @@ fi +fi + echo $ac_n "checking for herror""... $ac_c" 1>&6 -echo "configure:2174: checking for herror" >&5 +echo "configure:2124: checking for herror" >&5 if eval "test \"`echo '$''{'ac_cv_func_herror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_herror=yes" else @@ -2222,12 +2172,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:2226: checking for strerror" >&5 +echo "configure:2176: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else diff -ur mtr-0.30/configure.in mtr-0.31/configure.in --- mtr-0.30/configure.in Thu Mar 4 19:03:57 1999 +++ mtr-0.31/configure.in Fri Mar 5 00:45:24 1999 @@ -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_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 -ur mtr-0.30/mtr.8 mtr-0.31/mtr.8 --- mtr-0.30/mtr.8 Wed Mar 3 01:21:24 1999 +++ mtr-0.31/mtr.8 Fri Mar 5 00:19:39 1999 @@ -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 @@ .SH SYNOPSIS .B mtr [\c -.B \-hvrctgi\c +.B \-hvrctglsni\c ] [\c .B \-\-help\c @@ -46,7 +46,7 @@ .SH DESCRIPTION .B mtr -combines the functionaly of the +combines the functionality of the .B traceroute and .B ping diff -ur mtr-0.30/mtr.c mtr-0.31/mtr.c --- mtr-0.30/mtr.c Thu Mar 4 17:34:54 1999 +++ mtr-0.31/mtr.c Fri Mar 5 00:19:39 1999 @@ -167,9 +167,9 @@ } 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 -ur mtr-0.30/net.c mtr-0.31/net.c --- mtr-0.30/net.c Wed Mar 3 01:21:24 1999 +++ mtr-0.31/net.c Fri Mar 5 00:19:39 1999 @@ -45,11 +45,11 @@ 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. */