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 /rawshark.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 'rawshark.c')
| -rw-r--r-- | rawshark.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rawshark.c b/rawshark.c index 6454ab1a78..7612207bc4 100644 --- a/rawshark.c +++ b/rawshark.c @@ -940,7 +940,7 @@ raw_pipe_read(struct wtap_pkthdr *phdr, guchar * pd, int *err, gchar **err_info, printf("caplen: %d (%04x)\n", phdr->caplen, phdr->caplen); printf("len: %d (%04x)\n", phdr->len, phdr->len); #endif - if (bytes_needed > WTAP_MAX_PACKET_SIZE) { + if (bytes_needed > WTAP_MAX_PACKET_SIZE_STANDARD) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("Bad packet length: %lu\n", (unsigned long) bytes_needed); @@ -981,7 +981,7 @@ load_cap_file(capture_file *cf) epan_dissect_init(&edt, cf->epan, TRUE, FALSE); - pd = (guchar*)g_malloc(WTAP_MAX_PACKET_SIZE); + pd = (guchar*)g_malloc(WTAP_MAX_PACKET_SIZE_STANDARD); while (raw_pipe_read(&phdr, pd, &err, &err_info, &data_offset)) { process_packet(cf, &edt, data_offset, &phdr, pd); } @@ -1537,8 +1537,7 @@ raw_cf_open(capture_file *cf, const char *fname) cf->count = 0; cf->drops_known = FALSE; cf->drops = 0; - cf->has_snap = FALSE; - cf->snap = WTAP_MAX_PACKET_SIZE; + cf->snap = 0; nstime_set_zero(&cf->elapsed_time); ref = NULL; prev_dis = NULL; |