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-nlm.c b/packet-nlm.c
index a52a3112bd..6eb3c43e69 100644
--- a/packet-nlm.c
+++ b/packet-nlm.c
@@ -1,7 +1,7 @@
 /* packet-nlm.c
  * Routines for nlm dissection
  *
- * $Id: packet-nlm.c,v 1.7 2000/08/08 06:22:08 girlich Exp $
+ * $Id: packet-nlm.c,v 1.8 2000/08/13 14:08:33 deniel Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -105,6 +105,9 @@ dissect_nlm_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int versio
 
 	tvb_compat(tvb, &pd, &compat_offset);
 
+	if (!proto_is_protocol_enabled(proto_nlm))
+	  return offset;
+
 	if (tree) {
 		lock_item = proto_tree_add_item(tree, hf_nlm_lock, tvb,
 				offset, tvb_length_remaining(tvb, offset), FALSE);
@@ -148,6 +151,9 @@ dissect_nlm1_lock_call(const u_char* pd, int offset, frame_data* fd, proto_tree*
 #endif
 	int noffset;
 
+	if (!proto_is_protocol_enabled(proto_nlm))
+	  return tvb_raw_offset(tvb);
+
 	noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
 	noffset = dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_block, noffset);
 	noffset = dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_exclusive, noffset);
@@ -171,6 +177,9 @@ dissect_nlm1_unlock_call(const u_char* pd, int offset, frame_data* fd, proto_tre
 #endif
 	int noffset;
 
+	if (!proto_is_protocol_enabled(proto_nlm))
+	  return tvb_raw_offset(tvb);
+
 	noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
 	noffset = dissect_nlm_lock(tvb, pinfo, tree, 1, noffset);
 	return tvb_raw_offset(tvb) + noffset;
@@ -190,6 +199,9 @@ dissect_nlm1_gen_reply(const u_char* pd, int offset, frame_data* fd, proto_tree*
 #endif
 	int noffset;
 
+	if (!proto_is_protocol_enabled(proto_nlm))
+	  return tvb_raw_offset(tvb);
+
 	noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
 	noffset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, hf_nlm_state, noffset);
 	return tvb_raw_offset(tvb) + noffset;
@@ -298,6 +310,9 @@ dissect_nlm4_test_call(const u_char* pd, int offset, frame_data* fd, proto_tree*
 #endif
 	int noffset;
 
+	if (!proto_is_protocol_enabled(proto_nlm))
+	  return tvb_raw_offset(tvb);
+
 	noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
 	dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_exclusive, noffset);
 	noffset += 4;