diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-04-15 09:05:17 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-04-15 09:05:17 +0000 |
| commit | cd6de486882ed1bbb427e888e5732ea09f45b300 (patch) | |
| tree | 6071fb02a695a5bd92a811574595235ab8e05fc2 | |
| parent | 658af9bc20ede68125f0608e3b3347416937ee64 (diff) | |
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3306 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | packet-quake.c | 11 | ||||
| -rw-r--r-- | packet-snmp.c | 11 |
2 files changed, 20 insertions, 2 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)) diff --git a/packet-snmp.c b/packet-snmp.c index 70e2415114..e5f17167be 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -8,7 +8,7 @@ * * See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u. * - * $Id: packet-snmp.c,v 1.65 2001/04/15 07:51:11 guy Exp $ + * $Id: packet-snmp.c,v 1.66 2001/04/15 09:05:17 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -2098,6 +2098,15 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_t *conversation; /* + * 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_snmp, tvb, pinfo, tree); + + pinfo->current_proto = "SNMP"; + + /* * The first SNMP packet goes to the SNMP port; the second one * may come from some *other* port, but goes back to the same * IP address and port as the ones from which the first packet |