Add the "Edit:Protocols..." feature which currently only implements

the following:

It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.

Disabling a protocol could be interesting:

- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)

Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)

I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).

Two functions are added in proto.c :

gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);

and two MACROs which can be used in dissectors:

OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)

See also the XXX in proto_dlg.c and proto.c around the new functions.

svn path=/trunk/; revision=2267

1 files changed, 10 insertions, 1 deletions

diff --git a/packet-ipx.c b/packet-ipx.c
index f28ce4aeb8..e644b83b2e 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
  * Routines for NetWare's IPX
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-ipx.c,v 1.63 2000/08/07 03:20:42 guy Exp $
+ * $Id: packet-ipx.c,v 1.64 2000/08/13 14:08:18 deniel Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -290,6 +290,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	guint16		ipx_dsocket, ipx_ssocket;
 
+	CHECK_DISPLAY_AS_DATA(proto_ipx, tvb, pinfo, tree);
 
 	pinfo->current_proto = "IPX";
 
@@ -440,6 +441,8 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	guint8		conn_ctrl;
 	guint8		datastream_type;
 
+	CHECK_DISPLAY_AS_DATA(proto_spx, tvb, pinfo, tree);
+
 	pinfo->current_proto = "SPX";
 	if (check_col(pinfo->fd, COL_PROTOCOL))
 		col_add_str(pinfo->fd, COL_PROTOCOL, "SPX");
@@ -483,6 +486,8 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_item	*ti;
 	guint8		conn_number, sig_char;
 
+	CHECK_DISPLAY_AS_DATA(proto_ipxmsg, tvb, pinfo, tree);
+
 	pinfo->current_proto = "IPX MSG";
 
 	if (check_col(pinfo->fd, COL_PROTOCOL))
@@ -522,6 +527,8 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	char		*rip_type[3] = { "Request", "Response", "Unknown" };
 
+	CHECK_DISPLAY_AS_DATA(proto_ipxrip, tvb, pinfo, tree);
+
 	pinfo->current_proto = "IPX RIP";
 	if (check_col(pinfo->fd, COL_PROTOCOL))
 	 col_add_str(pinfo->fd, COL_PROTOCOL, "IPX RIP");
@@ -668,6 +675,8 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	char		*sap_type[4] = { "General Query", "General Response",
 		"Nearest Query", "Nearest Response" };
 
+	CHECK_DISPLAY_AS_DATA(proto_sap, tvb, pinfo, tree);
+
 	pinfo->current_proto = "IPX SAP";
 	if (check_col(pinfo->fd, COL_PROTOCOL))
 		col_add_str(pinfo->fd, COL_PROTOCOL, "IPX SAP");