diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-04 18:58:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-05 08:40:56 +0000 |
| commit | 43369543fb8d9119a095d2722ff977597e0ad581 (patch) | |
| tree | 037883a0eac51cff92892b1a59e72a00109b0428 /summary.h | |
| parent | 2a776cd7f7f8fb427a109be4a77a7784961e393b (diff) | |
| download | wireshark-43369543fb8d9119a095d2722ff977597e0ad581.tar.gz | |
Allow bigger snapshot lengths for D-Bus captures.
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except
for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for
them, because that's the largest possible D-Bus message size. See
https://bugs.freedesktop.org/show_bug.cgi?id=100220
for an example of the problems caused by limiting the snapshot length to
256KB for D-Bus.
Have a snapshot length of 0 in a capture_file structure mean "there is
no snapshot length for the file"; we don't need the has_snap field in
that case, a value of 0 mean "no, we don't have a snapshot length".
In dumpcap, start out with a pipe buffer size of 2KB, and grow it as
necessary. When checking for a too-big packet from a pipe, check
against the appropriate maximum - 128MB for DLT_DBUS, 256KB for
everything else.
Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20
Reviewed-on: https://code.wireshark.org/review/21952
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit d0865fd619454a9ac06b1c7d287dc438aff50bb0)
Reviewed-on: https://code.wireshark.org/review/21955
Diffstat (limited to 'summary.h')
| -rw-r--r-- | summary.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -38,8 +38,7 @@ typedef struct iface_options_tag { char *isb_comment; guint64 drops; /**< number of packet drops */ gboolean drops_known; /**< TRUE if number of packet drops is known */ - gboolean has_snap; /**< TRUE if maximum capture packet length is known */ - int snap; /**< Maximum captured packet length */ + int snap; /**< Maximum captured packet length; 0 if not known */ int encap_type; /**< wiretap encapsulation type */ } iface_options; @@ -69,8 +68,7 @@ typedef struct _summary_tally { int iscompressed; /**< TRUE if file is compressed */ int file_encap_type; /**< wiretap encapsulation type for file */ GArray *packet_encap_types; /**< wiretap encapsulation types for packets */ - gboolean has_snap; /**< TRUE if maximum capture packet length is known */ - int snap; /**< Maximum captured packet length */ + int snap; /**< Maximum captured packet length; 0 if not known */ gboolean drops_known; /**< TRUE if number of packet drops is known */ guint64 drops; /**< number of packet drops */ const char *dfilter; /**< display filter */ |