Fix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5445#c15 :

Add a new tap flag to indicate that a tap listener is just a "dissector helper",
that is, a tap which is used by a dissector to help it do its dissection but
does not, itself, require dissection.

Use this new flag in the dissectors which register taps.

Remove the (now-unused) have_tap_listeners() function.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/tshark.c b/tshark.c
index 8a79128f2e..38964e75d8 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1605,7 +1605,7 @@ main(int argc, char *argv[])
      if we're writing to a pipe. */
   if (global_capture_opts.saving_to_file &&
       global_capture_opts.output_to_pipe) {
-    if (have_tap_listeners()) {
+    if (tap_listeners_require_dissection()) {
       cmdarg_err("Taps aren't supported when saving to a pipe.");
       return 1;
     }
@@ -1680,8 +1680,8 @@ main(int argc, char *argv[])
 
         we're using a read filter on the packets;
 
-        we're using any taps. */
-  do_dissection = print_packet_info || rfcode || have_tap_listeners();
+        we're using any taps that need dissection. */
+  do_dissection = print_packet_info || rfcode || tap_listeners_require_dissection();
 
   if (cf_name) {
     /*