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

mtr v0.27

 - Fixed bug that showed up on Solaris/x86.
 - GTK mainloop now runs as it's supposed to.

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

diff --git a/Makefile.am b/Makefile.am
index f7ee2b4..00b60c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,6 @@ mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
 mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
 
 EXTRA_DIST = SECURITY mtr.8
+
+DISTCLEANFILES = *~
+
diff --git a/NEWS b/NEWS
index f28612b..60aa2ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 WHAT'S NEW?
 
+  v0.27
+	Fixed bug that showed up on Solaris/x86.
+	Gimp mainloop now runs as it's supposed to.
+
   v0.26
         Added "-n" flag for numeric output. 
         fixed IP numbers displaying backwards.
diff --git a/configure.in b/configure.in
index 1fcb9b3..a0d27ab 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.26)
+AM_INIT_AUTOMAKE(mtr, 0.27)
 
 AC_SUBST(GTK_OBJ)
 AC_SUBST(CURSES_OBJ)
diff --git a/gtk.c b/gtk.c
index ea26672..8f0d88d 100644
--- a/gtk.c
+++ b/gtk.c
@@ -36,6 +36,8 @@ extern char *Hostname;
 extern float WaitTime;
 extern float DeltaTime;
 
+static int tag;
+
 void gtk_do_init(int *argc, char ***argv) {
   static int done = 0;
 
@@ -305,6 +307,8 @@ int gtk_keyaction() {
 gint gtk_ping(gpointer data) {
   gtk_redraw();
   net_send_batch();
+  gtk_timeout_remove (tag);
+  tag = gtk_timeout_add(DeltaTime*1000, gtk_ping, NULL);
   return TRUE;
 }
 
@@ -321,7 +325,7 @@ void gtk_dns_data(gpointer data, gint fd, GdkInputCondition cond) {
 
 void gtk_loop() {
   DeltaTime = WaitTime/10;
-  gtk_timeout_add(DeltaTime*1000, gtk_ping, NULL);
+  tag = gtk_timeout_add(DeltaTime*1000, gtk_ping, NULL);
   gdk_input_add(net_waitfd(), GDK_INPUT_READ, gtk_net_data, NULL);
   gdk_input_add(dns_waitfd(), GDK_INPUT_READ, gtk_dns_data, NULL);
 
diff --git a/net.c b/net.c
index fb4d80d..e1797f6 100644
--- a/net.c
+++ b/net.c
@@ -136,7 +136,7 @@ void net_send_ping(int index) {
 
   ip->version = 0x45;
   ip->tos = 0;
-  ip->len = packetsize;
+  ip->len = htons (packetsize);
   ip->id = 0;
   ip->frag = 0;
   ip->ttl = 127;
@@ -178,7 +178,7 @@ void net_send_query(int hops) {
 
   ip->version = 0x45;
   ip->tos = 0;
-  ip->len = packetsize;
+  ip->len = htons (packetsize);
   ip->id = 0;
   ip->frag = 0;
   ip->ttl = hops;