![Guy Harris](/assets/img/avatar_default.png)
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>
133 lines
3.6 KiB
C
133 lines
3.6 KiB
C
/* tnef.c
|
|
*
|
|
* Transport-Neutral Encapsulation Format (TNEF) file reading
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <errno.h>
|
|
|
|
#include "wtap-int.h"
|
|
#include "file_wrappers.h"
|
|
#include <wsutil/buffer.h>
|
|
#include "tnef.h"
|
|
|
|
static gboolean tnef_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
|
|
Buffer *buf, int *err, gchar **err_info)
|
|
{
|
|
gint64 file_size;
|
|
int packet_size;
|
|
|
|
if ((file_size = wtap_file_size(wth, err)) == -1)
|
|
return FALSE;
|
|
|
|
if (file_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("tnef: File has %" G_GINT64_MODIFIER "d-byte packet, bigger than maximum of %u",
|
|
file_size, WTAP_MAX_PACKET_SIZE_STANDARD);
|
|
return FALSE;
|
|
}
|
|
packet_size = (int)file_size;
|
|
|
|
phdr->rec_type = REC_TYPE_PACKET;
|
|
phdr->presence_flags = 0; /* yes, we have no bananas^Wtime stamp */
|
|
|
|
phdr->caplen = packet_size;
|
|
phdr->len = packet_size;
|
|
|
|
phdr->ts.secs = 0;
|
|
phdr->ts.nsecs = 0;
|
|
|
|
return wtap_read_packet_bytes(fh, buf, packet_size, err, err_info);
|
|
}
|
|
|
|
static gboolean tnef_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
|
|
{
|
|
gint64 offset;
|
|
|
|
*err = 0;
|
|
|
|
offset = file_tell(wth->fh);
|
|
|
|
/* there is only ever one packet */
|
|
if (offset)
|
|
return FALSE;
|
|
|
|
*data_offset = offset;
|
|
|
|
return tnef_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info);
|
|
}
|
|
|
|
static gboolean tnef_seek_read(wtap *wth, gint64 seek_off,
|
|
struct wtap_pkthdr *phdr,
|
|
Buffer *buf, int *err, gchar **err_info)
|
|
{
|
|
/* there is only one packet */
|
|
if(seek_off > 0) {
|
|
*err = 0;
|
|
return FALSE;
|
|
}
|
|
|
|
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
|
return FALSE;
|
|
|
|
return tnef_read_file(wth, wth->random_fh, phdr, buf, err, err_info);
|
|
}
|
|
|
|
wtap_open_return_val tnef_open(wtap *wth, int *err, gchar **err_info)
|
|
{
|
|
guint32 magic;
|
|
|
|
if (!wtap_read_bytes(wth->fh, &magic, sizeof magic, err, err_info))
|
|
return (*err != WTAP_ERR_SHORT_READ) ? WTAP_OPEN_ERROR : WTAP_OPEN_NOT_MINE;
|
|
|
|
if (GUINT32_TO_LE(magic) != TNEF_SIGNATURE)
|
|
/* Not a tnef file */
|
|
return WTAP_OPEN_NOT_MINE;
|
|
|
|
/* seek back to the start of the file */
|
|
if (file_seek(wth->fh, 0, SEEK_SET, err) == -1)
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_TNEF;
|
|
wth->file_encap = WTAP_ENCAP_TNEF;
|
|
wth->snapshot_length = 0;
|
|
|
|
wth->subtype_read = tnef_read;
|
|
wth->subtype_seek_read = tnef_seek_read;
|
|
wth->file_tsprec = WTAP_TSPREC_SEC;
|
|
|
|
return WTAP_OPEN_MINE;
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local Variables:
|
|
* c-basic-offset: 2
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* vi: set shiftwidth=2 tabstop=8 expandtab:
|
|
* :indentSize=2:tabSize=8:noTabs=true:
|
|
*/
|