diff options
| -rw-r--r-- | packet-clnp.c | 11 | ||||
| -rw-r--r-- | packet-gtp.c | 12 | ||||
| -rw-r--r-- | packet-ip.c | 16 | ||||
| -rw-r--r-- | packet-ipv6.c | 10 | ||||
| -rw-r--r-- | packet-tcp.c | 17 | ||||
| -rw-r--r-- | packet-wcp.c | 13 |
6 files changed, 6 insertions, 73 deletions
diff --git a/packet-clnp.c b/packet-clnp.c index 69f01da6e9..4902571d88 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.38 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-clnp.c,v 1.39 2001/11/21 21:37:25 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -22,7 +22,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ #ifdef HAVE_CONFIG_H @@ -1595,8 +1594,6 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean save_in_error_pkt; fragment_data *fd_head; tvbuff_t *volatile next_tvb; - packet_info save_pi; - gboolean must_restore_pi = FALSE; gboolean update_col_info = TRUE; if (check_col(pinfo->fd, COL_PROTOCOL)) @@ -1924,12 +1921,6 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* It's not fragmented. */ pinfo->fragmented = FALSE; - - /* 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; - must_restore_pi = TRUE; } else { /* We don't have the complete reassembled payload. */ next_tvb = NULL; 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"); diff --git a/packet-ip.c b/packet-ip.c index 21eec9b5cc..69806e488b 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.146 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-ip.c,v 1.147 2001/11/21 21:37:25 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -821,8 +821,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 ipsum; fragment_data *ipfd_head; tvbuff_t *next_tvb; - packet_info save_pi; - gboolean must_restore_pi = FALSE; gboolean update_col_info = TRUE; if (check_col(pinfo->fd, COL_PROTOCOL)) @@ -1070,12 +1068,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* It's not fragmented. */ pinfo->fragmented = FALSE; - - /* 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; - must_restore_pi = TRUE; } else { /* We don't have the complete reassembled payload. */ next_tvb = NULL; @@ -1112,9 +1104,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->fd, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%u)", ipprotostr(iph.ip_p), iph.ip_p, (iph.ip_off & IP_OFFSET) * 8); dissect_data(tvb, offset, pinfo, tree); - - /* As we haven't reassembled anything, we haven't changed "pi", so - we don't have to restore it. */ return; } @@ -1133,9 +1122,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } dissect_data(next_tvb, 0, pinfo, tree); } - - if (must_restore_pi) - pi = save_pi; } #define ICMP_MIP_EXTENSION_PAD 0 diff --git a/packet-ipv6.c b/packet-ipv6.c index 959ca45180..e7d67dab65 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c,v 1.66 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-ipv6.c,v 1.67 2001/11/21 21:37:25 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -653,8 +653,6 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset; fragment_data *ipfd_head; tvbuff_t *next_tvb; - packet_info save_pi; - gboolean must_restore_pi = FALSE; gboolean update_col_info = TRUE; struct ip6_hdr ipv6; @@ -908,12 +906,6 @@ again: /* It's not fragmented. */ pinfo->fragmented = FALSE; - - /* 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; - must_restore_pi = TRUE; } else { /* We don't have the complete reassembled payload. */ next_tvb = NULL; diff --git a/packet-tcp.c b/packet-tcp.c index 85cf2d3356..64cdd9897f 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.115 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-tcp.c,v 1.116 2001/11/21 21:37:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -375,7 +375,6 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, */ if(nxtseq >= (tsk->start_seq + tsk->tot_len)){ /* ok, lest call subdissector with desegmented data */ - packet_info save_pi; tvbuff_t *next_tvb; /* create a new TVB structure for desegmented data */ @@ -392,25 +391,11 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, /* indicate that this is reassembled data */ tcpinfo->is_reassembled = TRUE; - /* XXX - is this still necessary? Do we have to - worry about subdissectors changing "*pinfo", or, - given that we're no longer doing so, is that no - longer an issue? */ - save_pi = *pinfo; - /* call subdissector */ decode_tcp_ports(next_tvb, 0, pinfo, tree, sport, dport); called_dissector = TRUE; - /* - * Don't trash the new values of "desegment_offset" - * and "desegment_len". - */ - save_pi.desegment_offset = pinfo->desegment_offset; - save_pi.desegment_len = pinfo->desegment_len; - *pinfo = save_pi; - /* Did the subdissector ask us to desegment some more data? This means that the data at the beginning of this segment completed a higher-level PDU, diff --git a/packet-wcp.c b/packet-wcp.c index a06b898b78..ab47a90385 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.13 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-wcp.c,v 1.14 2001/11/21 21:37:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -308,8 +308,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int wcp_header_len; guint16 temp, cmd, ext_cmd, seq; tvbuff_t *next_tvb; - packet_info save_pi; - gboolean must_restore_pi = FALSE; pinfo->current_proto = "WCP"; @@ -395,12 +393,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "[Malformed Frame: Bad WCP compressed data]" ); return; } - - /* 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; - must_restore_pi = TRUE; } if ( tree) /* add the check byte */ @@ -410,9 +402,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_fr_uncompressed(next_tvb, pinfo, tree); - if (must_restore_pi) - pi = save_pi; - return; } |