From d0865fd619454a9ac06b1c7d287dc438aff50bb0 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 4 Jun 2017 18:58:40 -0700 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- caputils/capture-pcap-util.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'caputils') diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 0f95f7827c..4da5579e3d 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -1213,13 +1213,13 @@ open_capture_device_pcap_open_live(interface_options *interface_opts, snaplen = interface_opts->snaplen; else { /* - * Default - use the old maximum snapshot length, which - * should be big enough (libpcap didn't get D-Bus support - * until after it goet pcap_create()/pcap_activate(), so - * we don't have D-Bus support and don't have to worry - * about really huge packets). + * Default - use the non-D-Bus maximum snapshot length of + * 256KB, which should be big enough (libpcap didn't get + * D-Bus support until after it goet pcap_create() and + * pcap_activate(), so we don't have D-Bus support and + * don't have to worry about really huge packets). */ - snaplen = 262144; + snaplen = 256*1024; } g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "pcap_open_live() calling using name %s, snaplen %d, promisc_mode %d.", @@ -1344,10 +1344,10 @@ open_capture_device(capture_options *capture_opts, snaplen = interface_opts->snaplen; else { /* - * Default - use the old maximum snapshot length, + * Default - use the non-D-Bus maximum snapshot length, * which should be big enough, except for D-Bus. */ - snaplen = 262144; + snaplen = 256*1024; } g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Calling pcap_open() using name %s, snaplen %d, promisc_mode %d, datatx_udp %d, nocap_rpcap %d.", -- cgit v1.2.1