aboutsummaryrefslogtreecommitdiffstats
path: root/packet-quakeworld.c
diff options
context:
space:
mode:
Diffstat (limited to 'packet-quakeworld.c')
-rw-r--r--packet-quakeworld.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/packet-quakeworld.c b/packet-quakeworld.c
index 268275814f..68fa541c34 100644
--- a/packet-quakeworld.c
+++ b/packet-quakeworld.c
@@ -4,10 +4,10 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quakeworld.c,v 1.6 2001/11/26 05:13:12 hagbard Exp $
+ * $Id: packet-quakeworld.c,v 1.7 2001/11/27 07:13:26 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from packet-quake.c
@@ -720,18 +720,9 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *quakeworld_item = NULL;
int direction;
- /*
- * 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_X(data_handle,proto_quakeworld, tvb, pinfo, tree);
-
direction = (pinfo->destport == gbl_quakeworldServerPort) ?
DIR_C2S : DIR_S2C;
- pinfo->current_proto = "QUAKEWORLD";
-
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, "QUAKEWORLD");
if (check_col(pinfo->fd, COL_INFO))