diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-12-31 19:36:12 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-01-01 05:03:42 +0000 |
| commit | 2d41b15495e245d9292ba42dd3954bdebc9f3290 (patch) | |
| tree | 40282b7aab9f1347489126dd98974a681dca888f /ui/tap-tcp-stream.c | |
| parent | ba589a4e445a8ad8054073eff846087fc61c9ef8 (diff) | |
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>
Diffstat (limited to 'ui/tap-tcp-stream.c')
| -rw-r--r-- | ui/tap-tcp-stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 036f775525..f0ce7144cd 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -36,7 +36,7 @@ typedef struct _tcp_scan_t { } tcp_scan_t; -static gboolean +static tap_packet_status tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { tcp_scan_t *ts = (tcp_scan_t *)pct; @@ -96,7 +96,7 @@ tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, cons ts->last = segment; } - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* here we collect all the external data we will ever need */ @@ -227,7 +227,7 @@ typedef struct _th_t { struct tcpheader *tcphdrs[MAX_SUPPORTED_TCP_HEADERS]; } th_t; -static gboolean +static tap_packet_status tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) { int n; @@ -261,7 +261,7 @@ tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, con th->num_hdrs++; } - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* XXX should be enhanced so that if we have multiple TCP layers in the trace |