diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-22 08:54:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-22 08:54:08 +0000 |
| commit | a4e137f630823d36bcfb8ab402556ca9e6d0d734 (patch) | |
| tree | 8617f6910eca8b6064b548f3d9cd6357d07843f1 /packet-srvloc.c | |
| parent | c57c848dfa1f7061ada20fa88ad6eac33ad1ea7c (diff) | |
| download | wireshark-a4e137f630823d36bcfb8ab402556ca9e6d0d734.tar.gz wireshark-a4e137f630823d36bcfb8ab402556ca9e6d0d734.tar.bz2 wireshark-a4e137f630823d36bcfb8ab402556ca9e6d0d734.zip | |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
svn path=/trunk/; revision=2932
Diffstat (limited to 'packet-srvloc.c')
| -rw-r--r-- | packet-srvloc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-srvloc.c b/packet-srvloc.c index 02ec577b77..685f75caea 100644 --- a/packet-srvloc.c +++ b/packet-srvloc.c @@ -6,7 +6,7 @@ * In particular I have not had an opportunity to see how it * responds to SRVLOC over TCP. * - * $Id: packet-srvloc.c,v 1.20 2001/01/13 08:57:46 guy Exp $ + * $Id: packet-srvloc.c,v 1.21 2001/01/22 08:54:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -227,10 +227,6 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 flags; guint32 count; - CHECK_DISPLAY_AS_DATA(proto_srvloc, tvb, pinfo, tree); - - pinfo->current_proto = "SRVLOC"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "SRVLOC"); |