diff options
| author | Uwe Girlich <Uwe.Girlich@philosys.de> | 2000-08-14 11:36:04 +0000 |
|---|---|---|
| committer | Uwe Girlich <Uwe.Girlich@philosys.de> | 2000-08-14 11:36:04 +0000 |
| commit | c6097bf6844db5a033cef96e64406eedd6a0b997 (patch) | |
| tree | abffe6d9456bffa54afba6f671b4e8bf07ab343d /packet-nlm.c | |
| parent | 364ec7fa0535398c16f9a14ba3cb392b08461123 (diff) | |
| download | wireshark-c6097bf6844db5a033cef96e64406eedd6a0b997.tar.gz | |
Reversed the latest changes for protocol enable/disable in RPC sub-dissectors.
The RPC layer itself handles all this stuff.
svn path=/trunk/; revision=2271
Diffstat (limited to 'packet-nlm.c')
| -rw-r--r-- | packet-nlm.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/packet-nlm.c b/packet-nlm.c index 6eb3c43e69..b9d204d2a9 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.8 2000/08/13 14:08:33 deniel Exp $ + * $Id: packet-nlm.c,v 1.9 2000/08/14 11:36:02 girlich Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -105,9 +105,6 @@ 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); @@ -151,9 +148,6 @@ 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); @@ -177,9 +171,6 @@ 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; @@ -199,9 +190,6 @@ 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; @@ -310,9 +298,6 @@ 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; |