Merge lp:~cyphermox/ubuntu/maverick/gnome-nettool/ping-fix into lp:ubuntu/maverick/gnome-nettool

[Mathieu Trudel-Lapierre]

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-17 16:44:37 +0000
+++ debian/changelog	2011-05-18 20:24:30 +0000
@@ -1,3 +1,10 @@
+gnome-nettool (2.31.6-0ubuntu1.1) maverick-proposed; urgency=low
+
+  * debian/patches/0001-ping-Handle-output-with-icmp_req.patch: fix ping format
+    parsing so we get back the results in the UI. (LP: #663014)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 18 May 2011 16:09:45 -0400
+
 gnome-nettool (2.31.6-0ubuntu1) maverick; urgency=low
 
   * New upstream release

=== added file 'debian/patches/0001-ping-Handle-output-with-icmp_req.patch'
--- debian/patches/0001-ping-Handle-output-with-icmp_req.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-ping-Handle-output-with-icmp_req.patch	2011-05-18 20:24:30 +0000
@@ -0,0 +1,71 @@
+From 9af2e18755725dc47ae8eb2867e3f038c298bc09 Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <[e-mail]>
+Date: Sat, 13 Nov 2010 13:53:12 +0100
+Subject: [PATCH] [ping] Handle output with icmp_req
+
+iputils-ping displays icmp_req= instead of icmp_seq=. Handle the two
+outputs correctly.
+---
+ src/ping.c |    7 ++++---
+ src/ping.h |    8 ++++----
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/ping.c b/src/ping.c
+index 2c973c3..74f3c19 100644
+--- a/src/ping.c
++++ b/src/ping.c
+@@ -405,7 +405,7 @@ ping_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len,
+ 
+ 	if (len > 0) {		/* there are data to show */
+ 		count = strip_line (line, &data, netinfo);
+-		if ((count == 5) || (count == 6)) {
++		if ((count == 5) || (count == 7)) {
+ 
+ 			/* Creation of GtkTreeView */
+ 			gtk_tree_view_set_rules_hint (GTK_TREE_VIEW
+@@ -519,6 +519,7 @@ static gint
+ strip_line (gchar * line, ping_data * data, Netinfo * netinfo)
+ {
+ 	gint count;
++	gchar dummy_buf[3];
+ 
+ 	if (netinfo_get_ip_version (netinfo) == IPV4)
+ 		line = g_strdelimit (line, ":", ' ');
+@@ -530,9 +531,9 @@ strip_line (gchar * line, ping_data * data, Netinfo * netinfo)
+ 			&(data)->bytes, data->ip, &(data)->icmp_seq,
+ 			data->srtt, data->unit);
+ #endif
+-#ifdef PING_PARAMS_6
++#ifdef PING_PARAMS_7
+ 	count = sscanf (line, PING_FORMAT,
+-			&(data)->bytes, data->ip, &(data)->icmp_seq,
++			&(data)->bytes, data->ip, dummy_buf, &(data)->icmp_seq,
+ 			&(data)->ttl, data->srtt, data->unit);
+ #endif
+ 	if (count != 5 && count != 6) {
+diff --git a/src/ping.h b/src/ping.h
+index 0d2e068..53dd5de 100644
+--- a/src/ping.h
++++ b/src/ping.h
+@@ -28,14 +28,14 @@
+     /*  <path to program> ping -b [-c <count>] -n <host> */
+ #   define PING_PROGRAM_FORMAT "%s ping -b%s-n %s"
+ #   define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
+-#   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
+-#   define PING_PARAMS_6
++#   define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s"
++#   define PING_PARAMS_7
+ #elif defined(__OSF__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+     /*  <path to program> ping [-c <count>] -n <host> */
+ #   define PING_PROGRAM_FORMAT "%s ping%s-n %s"
+ #   define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
+-#   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
+-#   define PING_PARAMS_6
++#   define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s"
++#   define PING_PARAMS_7
+ #elif defined(__sun__) 
+     /*  <path to program> ping -s -n <host> [<count>] */
+ #   define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s"
+-- 
+1.7.2.3
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-06-07 14:24:05 +0000
+++ debian/patches/series	2011-05-18 20:24:30 +0000
@@ -2,3 +2,4 @@
 02_lpi.patch
 03_use_tracepath.patch
 04_menu_change.patch
+0001-ping-Handle-output-with-icmp_req.patch