aboutsummaryrefslogtreecommitdiffstats
path: root/packet-tns.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-02-05 08:06:40 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-02-05 08:06:40 +0000
commit64de81d72fb4b035fe96690b6f939cd42deb453f (patch)
treee085184313922c432492320e1c511a7af867b7bc /packet-tns.c
parentff413d684a08f230cae8b3edaca8fc900c23bfbc (diff)
Sometimes the trace stuff doesn't appear in connect messages.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7079 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-tns.c')
-rw-r--r--packet-tns.c41
1 files changed, 24 insertions, 17 deletions
diff --git a/packet-tns.c b/packet-tns.c
index e132bc9f94..0a55bf9471 100644
--- a/packet-tns.c
+++ b/packet-tns.c
@@ -1,7 +1,7 @@
/* packet-tns.c
* Routines for Oracle TNS packet dissection
*
- * $Id: packet-tns.c,v 1.38 2003/01/31 03:17:46 guy Exp $
+ * $Id: packet-tns.c,v 1.39 2003/02/05 08:06:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -471,26 +471,33 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
offset += 1;
- if ( connect_tree )
+ /*
+ * XXX - sometimes it appears that this stuff isn't present
+ * in the packet.
+ */
+ if (offset + 16 <= tns_offset+cd_offset)
{
- proto_tree_add_item(connect_tree, hf_tns_trace_cf1, tvb,
- offset, 4, FALSE);
- }
- offset += 4;
+ if ( connect_tree )
+ {
+ proto_tree_add_item(connect_tree, hf_tns_trace_cf1, tvb,
+ offset, 4, FALSE);
+ }
+ offset += 4;
- if ( connect_tree )
- {
- proto_tree_add_item(connect_tree, hf_tns_trace_cf2, tvb,
- offset, 4, FALSE);
- }
- offset += 4;
+ if ( connect_tree )
+ {
+ proto_tree_add_item(connect_tree, hf_tns_trace_cf2, tvb,
+ offset, 4, FALSE);
+ }
+ offset += 4;
- if ( connect_tree )
- {
- proto_tree_add_item(connect_tree, hf_tns_trace_cid, tvb,
- offset, 8, FALSE);
+ if ( connect_tree )
+ {
+ proto_tree_add_item(connect_tree, hf_tns_trace_cid, tvb,
+ offset, 8, FALSE);
+ }
+ offset += 8;
}
- offset += 8;
if ( connect_tree && cd_len > 0)
{