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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2267 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 16 insertions, 1 deletions

diff --git a/packet-bootparams.c b/packet-bootparams.c
index 7ae6c8f33b..93b687a94d 100644
--- a/packet-bootparams.c
+++ b/packet-bootparams.c
@@ -1,7 +1,7 @@
 /* packet-bootparams.c
  * Routines for bootparams dissection
  *
- * $Id: packet-bootparams.c,v 1.11 2000/05/31 05:06:55 guy Exp $
+ * $Id: packet-bootparams.c,v 1.12 2000/08/13 14:08:04 deniel Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -58,6 +58,9 @@ int dissect_bp_address(const u_char *pd, int offset, frame_data *fd,
 	guint32 type;
 	guint32 ipaddr;
 
+	if (!proto_is_protocol_enabled(proto_bootparams))
+	  return offset;
+
 	/* get the address type */
 	if ( !BYTES_ARE_IN_FRAME(offset, 1)) return offset;
 	type = pntohl(&pd[offset]); /* type of address */
@@ -89,6 +92,9 @@ ZZZZZZZZZZZZZZZZZZZ Check type:
 int dissect_getfile_call(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
+	if (!proto_is_protocol_enabled(proto_bootparams))
+	  return offset;
+
 	if ( tree )
 	{
 		offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_host,NULL);
@@ -102,6 +108,9 @@ int dissect_getfile_call(const u_char *pd, int offset, frame_data *fd,
 int dissect_getfile_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
+	if (!proto_is_protocol_enabled(proto_bootparams))
+	  return offset;
+
 	if ( tree )
 	{
 		offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_host,NULL);
@@ -116,6 +125,9 @@ int dissect_getfile_reply(const u_char *pd, int offset, frame_data *fd,
 int dissect_whoami_call(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
+	if (!proto_is_protocol_enabled(proto_bootparams))
+	  return offset;
+
 	if ( tree )
 	{
 		offset = dissect_bp_address(pd,offset,fd,tree,hf_bootparams_hostaddr);
@@ -128,6 +140,9 @@ int dissect_whoami_call(const u_char *pd, int offset, frame_data *fd,
 int dissect_whoami_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
+	if (!proto_is_protocol_enabled(proto_bootparams))
+	  return offset;
+
 	if ( tree )
 	{
 		offset = dissect_rpc_string(pd,offset,fd,tree,hf_bootparams_host,NULL);