Add a "failed" return for tap packet routines.

This allows taps that can fail to report an error and fail; a failed
tap's packet routine won't be called again, so they don't have to keep
track of whether they've failed themselves.

We make the return value from the packet routine an enum.

Don't have a separate type for the per-packet routine for "follow" taps;
they're expected to act like tap packet routines, so just use the type
for tap packet routines.

One tap packet routine returned -1; that's not a valid return value, and
wasn't one before this change (the return value was a boolean), so
presume the intent was "don't redraw".

Another tap routine's early return, without doing any work, returned
TRUE; this is presumably an error (no work done, no need to redraw), so
presumably it should be "don't redraw".

Clean up some white space while we're at it.

Change-Id: Ia7d2b717b2cace4b13c2b886e699aa4d79cc82c8
Reviewed-on: https://code.wireshark.org/review/31283
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 5 insertions, 5 deletions

diff --git a/epan/follow.c b/epan/follow.c
index cf3d12cb6d..7617e01bf4 100644
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -27,14 +27,14 @@ struct register_follow {
     follow_index_filter_func index_filter; /* generate stream/index filter to follow */
     follow_address_filter_func address_filter; /* generate address filter to follow */
     follow_port_to_display_func port_to_display; /* port to name resolution for follow type */
-    follow_tap_func tap_handler; /* tap listener handler */
+    tap_packet_cb tap_handler; /* tap listener handler */
 };
 
 static wmem_tree_t *registered_followers = NULL;
 
 void register_follow_stream(const int proto_id, const char* tap_listener,
                             follow_conv_filter_func conv_filter, follow_index_filter_func index_filter, follow_address_filter_func address_filter,
-                            follow_port_to_display_func port_to_display, follow_tap_func tap_handler)
+                            follow_port_to_display_func port_to_display, tap_packet_cb tap_handler)
 {
   register_follow_t *follower;
   DISSECTOR_ASSERT(tap_listener);
@@ -96,7 +96,7 @@ follow_port_to_display_func get_follow_port_to_display(register_follow_t* follow
   return follower->port_to_display;
 }
 
-follow_tap_func get_follow_tap_handler(register_follow_t* follower)
+tap_packet_cb get_follow_tap_handler(register_follow_t* follower)
 {
   return follower->tap_handler;
 }
@@ -175,7 +175,7 @@ follow_info_free(follow_info_t* follow_info)
     g_free(follow_info);
 }
 
-gboolean
+tap_packet_status
 follow_tvb_tap_listener(void *tapdata, packet_info *pinfo,
                       epan_dissect_t *edt _U_, const void *data)
 {
@@ -207,7 +207,7 @@ follow_tvb_tap_listener(void *tapdata, packet_info *pinfo,
     follow_info->bytes_written[follow_record->is_server] += follow_record->data->len;
 
     follow_info->payload = g_list_prepend(follow_info->payload, follow_record);
-    return FALSE;
+    return TAP_PACKET_DONT_REDRAW;
 }
 
 /*