summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-06-09 20:44:16 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-06-09 20:44:16 +0000
commit067de606f220b10b0c92169ce1bdeb29659a7699 (patch)
treed465ba84d75579bc499a5653cc7eac7007f77234
parentfea1419b6ffe9026d1e91b31b5e7de90852afefd (diff)
downloadwireshark-067de606f220b10b0c92169ce1bdeb29659a7699.tar.gz
from Stephen Fisher
make icmp timestamps more readable svn path=/trunk/; revision=18406
-rw-r--r--AUTHORS1
-rw-r--r--epan/dissectors/packet-ip.c13
2 files changed, 8 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index d9b82d435f..d5a0410ddf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2608,6 +2608,7 @@ Kirby Files <kfiles [AT] masergy.com>
Ravi Valmikam <rvalmikam [AT] airvananet.com>
Diego Pettenò <flameeyes [AT] gentoo.org>
Daniel Black <dragonheart [AT] gentoo.org>
+Stephen Fisher <stephentfisher [AT] yahoo.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 5d30977fc1..459eb35821 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -54,6 +54,7 @@
#include <epan/nlpid.h>
#include <epan/tap.h>
#include <epan/emem.h>
+#include <epan/nstime.h>
static int ip_tap = -1;
@@ -1931,12 +1932,12 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case ICMP_TSTAMP:
case ICMP_TSTAMPREPLY:
- proto_tree_add_text(icmp_tree, tvb, 8, 4, "Originate timestamp: %u",
- tvb_get_ntohl(tvb, 8));
- proto_tree_add_text(icmp_tree, tvb, 12, 4, "Receive timestamp: %u",
- tvb_get_ntohl(tvb, 12));
- proto_tree_add_text(icmp_tree, tvb, 16, 4, "Transmit timestamp: %u",
- tvb_get_ntohl(tvb, 16));
+ proto_tree_add_text(icmp_tree, tvb, 8, 4, "Originate timestamp: %s after midnight UTC",
+ time_msecs_to_str(tvb_get_ntohl(tvb, 8)));
+ proto_tree_add_text(icmp_tree, tvb, 12, 4, "Receive timestamp: %s after midnight UTC",
+ time_msecs_to_str(tvb_get_ntohl(tvb, 12)));
+ proto_tree_add_text(icmp_tree, tvb, 16, 4, "Transmit timestamp: %s after midnight UTC",
+ time_msecs_to_str(tvb_get_ntohl(tvb, 16)));
break;
case ICMP_MASKREQ: