aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ipx.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-04-12 05:36:10 +0000
committerGuy Harris <guy@alum.mit.edu>2003-04-12 05:36:10 +0000
commit6f8439dc1be6861c1db9b6f6c68b4229893fe56a (patch)
tree9cf89137c4fe3b1f1de2ca9f9e5f96eed8b44a38 /packet-ipx.c
parent30859b1802a77ec185c9d3fee9092df95a6ba684 (diff)
downloadwireshark-6f8439dc1be6861c1db9b6f6c68b4229893fe56a.tar.gz
wireshark-6f8439dc1be6861c1db9b6f6c68b4229893fe56a.tar.bz2
wireshark-6f8439dc1be6861c1db9b6f6c68b4229893fe56a.zip
You can't put an FT_FRAMENUM into the tree with a length of -1, so, for
a retransmitted SPX frame, just put the number of the original frame in as an item not referring to any data (offset and length of 0), and, if there is any remaining data, put it into the tree as a separate item. svn path=/trunk/; revision=7440
Diffstat (limited to 'packet-ipx.c')
-rw-r--r--packet-ipx.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/packet-ipx.c b/packet-ipx.c
index 367ffc5a67..23fece10d2 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 2000-2002 by Gilbert Ramirez.
* Portions Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ipx.c,v 1.126 2003/04/09 22:33:19 guy Exp $
+ * $Id: packet-ipx.c,v 1.127 2003/04/12 05:36:10 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -690,9 +690,14 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (tree) {
proto_tree_add_uint_format(spx_tree, hf_spx_rexmt_frame,
- tvb, SPX_HEADER_LEN, -1, spx_rexmit_info->num,
+ tvb, 0, 0, spx_rexmit_info->num,
"This is a retransmission of frame %u",
spx_rexmit_info->num);
+ if (tvb_length_remaining(tvb, SPX_HEADER_LEN) > 0) {
+ proto_tree_add_text(spx_tree, tvb,
+ SPX_HEADER_LEN, -1,
+ "Retransmitted data");
+ }
}
return;
}