aboutsummaryrefslogtreecommitdiffstats
path: root/packet-gtp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-11-21 21:37:26 +0000
committerGuy Harris <guy@alum.mit.edu>2001-11-21 21:37:26 +0000
commitbd90493d46399161487bb21997af3e6450c5425d (patch)
tree7de4277446513b58f5731ee8e63d1733368f117f /packet-gtp.c
parent99e2d7e62691d4c21089b01e6f499c0b1cddd646 (diff)
If we have to worry about subdissectors changing the "packet_info"
structure, we may have to worry about it in more places than the places that *used* to set "pi.len" and "pi.captured_len", so there's no point in just saving and restoring it there. We'll remove those saves/restores, and worry about saves and restores when we find a problem. svn path=/trunk/; revision=4245
Diffstat (limited to 'packet-gtp.c')
-rw-r--r--packet-gtp.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/packet-gtp.c b/packet-gtp.c
index 5991f7b400..626b26f327 100644
--- a/packet-gtp.c
+++ b/packet-gtp.c
@@ -4,7 +4,7 @@
* Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
* Nicolas Balkota <balkota@mac.com>
*
- * $Id: packet-gtp.c,v 1.16 2001/11/21 02:01:05 guy Exp $
+ * $Id: packet-gtp.c,v 1.17 2001/11/21 21:37:25 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -3650,7 +3650,6 @@ decode_gtp_proto_conf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
tvbuff_t *next_tvb;
proto_tree *ext_tree_proto;
proto_item *te;
- packet_info save_pi;
length = tvb_get_ntohs(tvb, offset + 1);
@@ -3682,16 +3681,7 @@ decode_gtp_proto_conf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
ptr[0] = tmp;
next_tvb = tvb_new_subset(tvb, offset + 5, proto_len + 2, proto_len + 2);
-
- /* XXX - is this still necessary? Do we have to
- worry about subdissectors changing "pi", or,
- given that we're no longer doing so, is that
- no longer an issue? */
- save_pi = pi;
-
call_dissector(ppp_handle, next_tvb, pinfo, ext_tree_proto);
-
- pi = save_pi;
if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "GTP");