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 /wiretap/snoop.c | |
| parent | 17965f57f178aa7e4027f2d363658098e2f1abb3 (diff) | |
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 'wiretap/snoop.c')
| -rw-r--r-- | wiretap/snoop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 1831e422c6..4468028d77 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -484,24 +484,24 @@ snoop_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, rec_size = g_ntohl(hdr.rec_len); orig_size = g_ntohl(hdr.orig_len); packet_size = g_ntohl(hdr.incl_len); - if (orig_size > WTAP_MAX_PACKET_SIZE) { + if (orig_size > WTAP_MAX_PACKET_SIZE_STANDARD) { /* * Probably a corrupt capture file; don't blow up trying * to allocate space for an immensely-large packet. */ *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("snoop: File has %u-byte original length, bigger than maximum of %u", - orig_size, WTAP_MAX_PACKET_SIZE); + orig_size, WTAP_MAX_PACKET_SIZE_STANDARD); return -1; } - if (packet_size > WTAP_MAX_PACKET_SIZE) { + if (packet_size > WTAP_MAX_PACKET_SIZE_STANDARD) { /* * Probably a corrupt capture file; don't blow up trying * to allocate space for an immensely-large packet. */ *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("snoop: File has %u-byte packet, bigger than maximum of %u", - packet_size, WTAP_MAX_PACKET_SIZE); + packet_size, WTAP_MAX_PACKET_SIZE_STANDARD); return -1; } if (packet_size > rec_size) { @@ -844,7 +844,7 @@ static gboolean snoop_dump(wtap_dumper *wdh, reclen += padlen; /* Don't write anything we're not willing to read. */ - if (phdr->caplen + atm_hdrsize > WTAP_MAX_PACKET_SIZE) { + if (phdr->caplen + atm_hdrsize > WTAP_MAX_PACKET_SIZE_STANDARD) { *err = WTAP_ERR_PACKET_TOO_LARGE; return FALSE; } |