mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

pcapparse: endianness fix

Browse source 
Also swap the linktype after we detected that we need to do
byteswapping. Fixes a problem with reading pcap files generated
on a machine with different endianness.
This commit is contained in:
Wim Taymans 2017-06-01 16:00:50 +02:00
parent 694da006e0
commit f28ab7ce60
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/pcapparse/gstpcapparse.c
View file

@ -550,14 +550,15 @@ gst_pcap_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
magic = *((guint32 *) data); magic = *((guint32 *) data);
major_version = *((guint16 *) (data + 4)); major_version = *((guint16 *) (data + 4));
linktype = gst_pcap_parse_read_uint32 (self, data + 20); linktype = *((guint32 *) (data + 20));
gst_adapter_unmap (self->adapter); gst_adapter_unmap (self->adapter);
if (magic == 0xa1b2c3d4) { if (magic == 0xa1b2c3d4) {
self->swap_endian = FALSE; self->swap_endian = FALSE;
} else if (magic == 0xd4c3b2a1) { } else if (magic == 0xd4c3b2a1) {
self->swap_endian = TRUE; self->swap_endian = TRUE;
major_version = major_version << 8 | major_version >> 8; major_version = GUINT16_SWAP_LE_BE (major_version);
linktype = GUINT32_SWAP_LE_BE (linktype);
} else { } else {
GST_ELEMENT_ERROR (self, STREAM, WRONG_TYPE, (NULL), GST_ELEMENT_ERROR (self, STREAM, WRONG_TYPE, (NULL),
("File is not a libpcap file, magic is %X", magic)); ("File is not a libpcap file, magic is %X", magic));