Reversed the latest changes for protocol enable/disable in RPC sub-dissectors.

The RPC layer itself handles all this stuff.


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

1 files changed, 1 insertions, 34 deletions

diff --git a/packet-portmap.c b/packet-portmap.c
index d256bd9124..125f43a1b9 100644
--- a/packet-portmap.c
+++ b/packet-portmap.c
@@ -1,7 +1,7 @@
 /* packet-portmap.c
  * Routines for portmap dissection
  *
- * $Id: packet-portmap.c,v 1.18 2000/08/13 14:07:55 deniel Exp $
+ * $Id: packet-portmap.c,v 1.19 2000/08/14 11:36:04 girlich Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -65,10 +65,6 @@ int dissect_getport_call(const u_char *pd, int offset, frame_data *fd,
 {
 	guint32 proto;
 	guint32 prog;
-
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	if ( !BYTES_ARE_IN_FRAME(offset, 16)) return offset;
 
 	if ( tree )
@@ -94,9 +90,6 @@ int dissect_getport_call(const u_char *pd, int offset, frame_data *fd,
 int dissect_getport_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	if ( !BYTES_ARE_IN_FRAME(offset, 4)) return offset;
 	if ( tree )
 	{
@@ -112,10 +105,6 @@ int dissect_set_call(const u_char *pd, int offset, frame_data *fd,
 {
 	guint32 proto;
 	guint32 prog;
-
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	if ( !BYTES_ARE_IN_FRAME(offset, 16)) return offset;
 
 	if ( tree )
@@ -144,10 +133,6 @@ int dissect_unset_call(const u_char *pd, int offset, frame_data *fd,
 {
 	guint32 proto;
 	guint32 prog;
-
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	if ( !BYTES_ARE_IN_FRAME(offset, 16)) return offset;
 
 	if ( tree )
@@ -173,9 +158,6 @@ int dissect_unset_call(const u_char *pd, int offset, frame_data *fd,
 int dissect_set_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	if ( tree )
 	{
 		if ( !BYTES_ARE_IN_FRAME(offset, 4)) return offset;
@@ -193,9 +175,6 @@ dissect_dump_entry(const u_char* pd, int offset, frame_data* fd, proto_tree* tre
 	int prog, version, proto, port;
 	proto_item *ti, *subtree;
 
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	if ( ! BYTES_ARE_IN_FRAME(offset, 16) )
 	{
 		if ( tree )
@@ -232,9 +211,6 @@ dissect_dump_entry(const u_char* pd, int offset, frame_data* fd, proto_tree* tre
 int dissect_dump_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	offset = dissect_rpc_list(pd, offset, fd, tree, dissect_dump_entry);
 	return offset;
 }
@@ -320,9 +296,6 @@ dissect_rpcb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 int dissect_rpcb3_getaddr_call(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	offset = dissect_rpcb(pd, offset, fd, tree);
 
 	return offset;
@@ -333,9 +306,6 @@ int dissect_rpcb3_getaddr_call(const u_char *pd, int offset, frame_data *fd,
 int dissect_rpcb3_getaddr_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	offset = dissect_rpc_string(pd, offset, fd, tree, hf_portmap_uaddr,NULL);
 
 	return offset;
@@ -346,9 +316,6 @@ int dissect_rpcb3_getaddr_reply(const u_char *pd, int offset, frame_data *fd,
 int dissect_rpcb3_dump_reply(const u_char *pd, int offset, frame_data *fd,
 	proto_tree *tree)
 {
-	if (!proto_is_protocol_enabled(proto_portmap))
-	  return offset;
-
 	offset = dissect_rpc_list(pd, offset, fd, tree, dissect_rpcb);
 	return offset;
 }