diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-04-15 09:05:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-04-15 09:05:17 +0000 |
| commit | 5f89c1d71531aaf70749107baa6f88a48d42e112 (patch) | |
| tree | 6071fb02a695a5bd92a811574595235ab8e05fc2 /packet-quake.c | |
| parent | 560c3102372041320825719807ec36a38449fb11 (diff) | |
| download | wireshark-5f89c1d71531aaf70749107baa6f88a48d42e112.tar.gz wireshark-5f89c1d71531aaf70749107baa6f88a48d42e112.tar.bz2 wireshark-5f89c1d71531aaf70749107baa6f88a48d42e112.zip | |
Conversation dissectors are called through a mechanism that doesn't
check for disabled protocols or set "pinfo->current_proto", so they have
to do that for themselves.
svn path=/trunk/; revision=3306
Diffstat (limited to 'packet-quake.c')
| -rw-r--r-- | packet-quake.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/packet-quake.c b/packet-quake.c index 0e7ec25b18..75c839cf26 100644 --- a/packet-quake.c +++ b/packet-quake.c @@ -4,7 +4,7 @@ * Uwe Girlich <uwe@planetquake.com> * http://www.idsoftware.com/q1source/q1source.zip * - * $Id: packet-quake.c,v 1.13 2001/01/22 08:03:45 guy Exp $ + * $Id: packet-quake.c,v 1.14 2001/04/15 09:05:17 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -516,6 +516,15 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint rest_length; tvbuff_t *next_tvb; + /* + * XXX - this is a conversation dissector, and the code to + * call a conversation dissector doesn't check for disabled + * protocols or set "pinfo->current_proto". + */ + CHECK_DISPLAY_AS_DATA(proto_quake, tvb, pinfo, tree); + + pinfo->current_proto = "QUAKE"; + if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "QUAKE"); if (check_col(pinfo->fd, COL_INFO)) |