Have tap listeners specify whether the "packet" routine requires

	a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645

1 files changed, 8 insertions, 2 deletions

diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 59e7854c72..80cb7f5670 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -404,7 +404,10 @@ sid_name_snooping=0;
 	}
 
 
-	error_string=register_tap_listener("dcerpc", &lsa_policy_information_tap_installed, "lsa.policy_information and ( lsa.info.level or lsa.domain or nt.domain_sid )", NULL, lsa_policy_information, NULL);
+	error_string=register_tap_listener("dcerpc",
+	    &lsa_policy_information_tap_installed,
+	    "lsa.policy_information and ( lsa.info.level or lsa.domain or nt.domain_sid )",
+	    TL_REQUIRES_PROTO_TREE, NULL, lsa_policy_information, NULL);
 	if(error_string){
 		/* error, we failed to attach to the tap. clean up */
 
@@ -415,7 +418,10 @@ sid_name_snooping=0;
 	}
 	lsa_policy_information_tap_installed=TRUE;
 
-	error_string=register_tap_listener("dcerpc", &samr_query_dispinfo_tap_installed, "samr and samr.opnum==40 and ( samr.handle or samr.rid or samr.acct_name or samr.level )", NULL, samr_query_dispinfo, NULL);
+	error_string=register_tap_listener("dcerpc",
+	    &samr_query_dispinfo_tap_installed,
+	    "samr and samr.opnum==40 and ( samr.handle or samr.rid or samr.acct_name or samr.level )",
+	    TL_REQUIRES_PROTO_TREE, NULL, samr_query_dispinfo, NULL);
 	if(error_string){
 		/* error, we failed to attach to the tap. clean up */