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 05:28:26 +0000 |
| commit | d0865fd619454a9ac06b1c7d287dc438aff50bb0 (patch) | |
| tree | 91efc24ec72d274b1529342041641b36939236f2 /text2pcap.c | |
| parent | 17965f57f178aa7e4027f2d363658098e2f1abb3 (diff) | |
| download | wireshark-d0865fd619454a9ac06b1c7d287dc438aff50bb0.tar.gz wireshark-d0865fd619454a9ac06b1c7d287dc438aff50bb0.tar.bz2 wireshark-d0865fd619454a9ac06b1c7d287dc438aff50bb0.zip | |
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>
Diffstat (limited to 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/text2pcap.c b/text2pcap.c index 87a3e90680..3bdd33748f 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -209,11 +209,11 @@ static guint32 direction = 0; /*--- Local date -----------------------------------------------------------------*/ /* This is where we store the packet currently being built */ -static guint8 packet_buf[WTAP_MAX_PACKET_SIZE]; +static guint8 packet_buf[WTAP_MAX_PACKET_SIZE_STANDARD]; static guint32 header_length; static guint32 ip_offset; static guint32 curr_offset; -static guint32 max_offset = WTAP_MAX_PACKET_SIZE; +static guint32 max_offset = WTAP_MAX_PACKET_SIZE_STANDARD; static guint32 packet_start = 0; static int start_new_packet(gboolean); @@ -460,7 +460,7 @@ write_bytes (const char bytes[], guint32 nbytes) { guint32 i; - if (curr_offset + nbytes < WTAP_MAX_PACKET_SIZE) { + if (curr_offset + nbytes < WTAP_MAX_PACKET_SIZE_STANDARD) { for (i = 0; i < nbytes; i++) { packet_buf[curr_offset] = bytes[i]; curr_offset++; @@ -1451,7 +1451,7 @@ print_usage (FILE *output) " -q generate no output at all (automatically disables -d).\n" " -n use PCAP-NG instead of PCAP as output format.\n" "", - WTAP_MAX_PACKET_SIZE); + WTAP_MAX_PACKET_SIZE_STANDARD); } /*---------------------------------------------------------------------- |