aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/pcap-common.c
AgeCommit message (Collapse)AuthorFilesLines
2013-06-28Use newly assigned DLT for PDU export functionalityPascal Quantin1-0/+4
svn path=/trunk/; revision=50212
2013-05-30From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8644 :Pascal Quantin1-3/+5
SEL RTAC (Real Time Automation Controller) EIA-232 Serial-Line Dissection svn path=/trunk/; revision=49635
2013-05-18In the pcapng seek-read routine, *don't* fill in wth->phdr; seek-readGuy Harris1-23/+23
routines are passed a separate struct wtap_pkthdr to be filled in. Get rid of the pseudo_header member of the wblock structure - the pseudo-header is part of the struct wtap_pkthdr. Get rid of the union wtap_pseudo_header * argument to pcap_process_pseudo_header() - it's passed a pointer to a struct pcap_pkthdr, and that structure contains the union in question. Have libpcap_read_header() take a FILE_T argument, rather than using only the "sequential" handle of the wtap it's handed. Have the libpcap read routine return the offset of the beginning of the pcap record, and have the seek-read routine read the header and fill in the struct wtap_pkthdr handed to it. svn path=/trunk/; revision=49401
2013-04-14From Tomasz Mon via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8503 :Pascal Quantin1-0/+2
Add USBPcap support svn path=/trunk/; revision=48847
2013-03-23From Prafulla Harpanhalli via ↵Evan Huus1-1/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8513 Add support for encapsulation 136, Juniper service PIC cookie. svn path=/trunk/; revision=48494
2013-02-28Revert "Fix MSVC build errors related to symbol visibility"Balint Reczey1-3/+0
This reverts commit r47952. The problem was different from what I originally thought, thus the commit was obsolete. svn path=/trunk/; revision=47954
2013-02-28Fix MSVC build errors related to symbol visibilityBalint Reczey1-0/+3
svn path=/trunk/; revision=47952
2013-02-26its ==> it'sBill Meier1-1/+1
svn path=/trunk/; revision=47895
2012-12-22Whitespace changes.Michael Tüxen1-9/+9
svn path=/trunk/; revision=46694
2012-11-28Add native SCTP encapsulation.Michael Tüxen1-0/+2
svn path=/trunk/; revision=46244
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45015
2012-09-14Create a common libui using CMake similar to what we do with Autotools.Gerald Combs1-0/+19
Move the GTK+ text import code to the common UI directory. Create wtap_encap_requires_phdr() from code in file_import_dlg.c. svn path=/trunk/; revision=44904
2012-08-02From Richard Stearn: support for AX.25, including support forGuy Harris1-0/+1
LINKTYPE_AX25. svn path=/trunk/; revision=44211
2012-08-02From Richard Stearn: AX.25 KISS protocol support.Guy Harris1-0/+2
Part 1 of the fix for bug 7529. svn path=/trunk/; revision=44202
2012-07-19Addresses https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3895. Note ↵Michael Mann1-0/+47
that this doesn't write a Nokia file type properly, it just doesn't corrupt an existing one (read in by Wireshark) if resaved. svn path=/trunk/; revision=43815
2012-07-18Set the 802.11 "already decrypted" flag to FALSE for file formats otherGuy Harris1-0/+1
than Network Instruments Observer files, as we don't know whether they are already decrypted. svn path=/trunk/; revision=43796
2012-06-29Initial support for D-Bus dissection (bug #5502)Jakub Zawadzki1-0/+2
svn path=/trunk/; revision=43542
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-05-02Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header"Guy Harris1-6/+6
encapsulations. For pre-V9 AiroPeek captures, leave the radio information in the packet data, just as we do with the Prism, AVS, radiotap, and NetMon headers. Add a dissector for it. svn path=/trunk/; revision=42379
2012-03-31Add initial support for dissecting packets encapsulated in Netfilter LOG ↵Jakub Zawadzki1-0/+2
(DLT_NFLOG=239). svn path=/trunk/; revision=41872
2012-03-06From Mike Wakerly: Add wiretap suport for LINKTYPE_NFC_LLCPAnders Broman1-0/+40
svn path=/trunk/; revision=41368
2012-03-01From Reinhard Speyerer: Adding support for LINKTYPE_PPP_ETHER/DLT_PPP_ETHERAnders Broman1-0/+5
svn path=/trunk/; revision=41256
2012-02-13Fix the crash reported in ↵Jeff Morriss1-0/+12
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6804 For WTAP_ENCAP_ERF files if we find an Extension and/or Multi-Channel header, ensure that the size of the full pseudoheader is smaller than the packet size to avoid an underflow and subsequent attempt to allocate a rather large amount of memory. svn path=/trunk/; revision=41008
2012-02-06From Guy Martin:Anders Broman1-0/+2
Add new linktype 243 for MPEG2-TS. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6796 svn path=/trunk/; revision=40884
2011-12-28Prepend the sita_phdr fields with "sita_" to make them lessGerald Combs1-10/+10
collision-prone. svn path=/trunk/; revision=40320
2011-12-13Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyGuy Harris1-12/+12
form of corruption/bogosity in a file, including in a file header as well as in records in the file. Change the error message wtap_strerror() returns for it to reflect that. Use it for some file header problems for which it wasn't already being used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only be used for files that we have no reason to believe are invalid but that have a version number we don't know about or some other non-link-layer-encapsulation-type value we don't know about. svn path=/trunk/; revision=40175
2011-12-02from Petr Sumbera:Jaap Keuter1-1/+2
Solaris 11 snoop files with IP over Infiniband data are not recognized. Attached patch allows to view such data. svn path=/trunk/; revision=40072
2011-11-17Rename pletonll() to reflect what it actually does, namely convert aGuy Harris1-1/+1
host-byte-order 64-bit integral quantity to little-endian byte order. svn path=/trunk/; revision=39900
2011-11-13Clean up white space.Guy Harris1-8/+11
Note that we don't need to set the FCS length, but might as well do so anyway. svn path=/trunk/; revision=39816
2011-11-12From Holger Pfrommer:Anders Broman1-0/+11
Enhancement of Hilscher Analyzer Dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6082 svn path=/trunk/; revision=39804
2011-09-01Merge pcap_fill_in_pseudo_header() into pcap_read_post_process().Guy Harris1-15/+6
svn path=/trunk/; revision=38844
2011-09-01Use guint8 rather than guchar for raw octets and pointers to arrays ofGuy Harris1-1/+39
same. Add to wiretap/pcap-common.c a routine to fill in the pseudo-header for ATM (by looking at the VPI, VCI, and packet data, and guessing) and Ethernet (setting the FCS length appropriately). Use it for both pcap and pcap-ng files. svn path=/trunk/; revision=38840
2011-08-30Handle multiple extension headers when calculating the pseudo-headerGuy Harris1-3/+35
length, and actually write out the extension headers when writing out the pseudo-header. Fixes bug 6265. svn path=/trunk/; revision=38792
2011-04-28From Hans-Christoph Schemmel:Anders Broman1-0/+2
A variant of 3GPP TS 27.010 multiplexing protocol dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5829 svn path=/trunk/; revision=36927
2011-04-22*Properly* get rid of bogus cast.Guy Harris1-1/+1
svn path=/trunk/; revision=36791
2011-04-22Cast away alignment warnings about pointers where we never actuallyGuy Harris1-4/+12
directly dereference pointers to the field members. Get rid of an unnecessary cast that provokes warnings. svn path=/trunk/; revision=36789
2011-04-21Add a new WTAP_ERR_DECOMPRESS error, and use that for errors discoveredGuy Harris1-27/+27
by the gunzipping code. Have it also supply a err_info string, and report it. Have file_error() supply an err_info string. Put "the file" - or, for WTAP_ERR_DECOMPRESS, "the compressed file", to suggest a decompression error - into the rawshark and tshark errors, along the lines of what other programs print. Fix a case in the Netscaler code where we weren't fetching the error code on a read failure. svn path=/trunk/; revision=36748
2011-04-06From Jakub Zawadzki:Guy Harris1-13/+13
file_read(buf, bsize, count, file) macro is compilant with fread function and takes elements count+ size of each element, however to make it compilant with gzread() it always returns number of bytes. In wiretap file_read() this is not really used, file_read is called either with bsize set to 1 or count to 1. Attached patch remove bsize argument from macro. svn path=/trunk/; revision=36491
2011-03-07From Martin Kaiser: dissector for DVB-CI (Common Interface)Bill Meier1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5654 From me: - Entry for DVBCI added to wtap.c encap_table_base[]; - Some code simplification with respect to the use of col_...() for COL_INFO; - Certain tests for "enough bytes available" not really needed; - (Other minor tweaks); - #include<stdio.h> not req'd; - Minor reformatting and whitespace cleanup; svn path=/trunk/; revision=36149
2011-02-02From njohnkev:Jaap Keuter1-0/+3
Add support for LAPD data link type. svn path=/trunk/; revision=35771
2011-01-20Fix the dead initialization warnings found by clang's static analysisStephen Fisher1-1/+1
("Value stored to 'xxx' during its initialization is never read") svn path=/trunk/; revision=35598
2010-12-19Prepare for handling DLT_IPV4 and DLT_IPV6.Jaap Keuter1-0/+4
svn path=/trunk/; revision=35223
2010-11-29Fix typos.Chris Maynard1-2/+2
svn path=/trunk/; revision=35063
2010-11-24Add support for USB isochronous. From Marton Nemeth via bug #5370.Chris Maynard1-11/+73
svn path=/trunk/; revision=35025
2010-08-07From Jon Smirl:Stig Bjørlykke1-1/+2
Added "IEEE 802.15.4 Wireless PAN no fcs". svn path=/trunk/; revision=33728
2010-06-06Don't use fwrite directly when writing a dump file; call it throughGuy Harris1-22/+3
wtap_dump_file_write(). Replace various wrappers around fwrite() with wtap_dump_file_write(), or at least make the wrappers call wtap_dump_file_write(). svn path=/trunk/; revision=33116
2010-06-06Rename wtap_dump_file_write_all() to wtap_dump_file_write(), and haveGuy Harris1-42/+6
everybody use it; the places using the old wtap_dump_file_write() were using it in the same way the old wtap_dump_file_write_all() did. That also lets us get rid of wtap_dump_file_ferror(). Also, have the new wtap_dump_file_write() check for errors from gzwrite() and fwrite() differently - the former returns 0 on error, the latter can return a short write on error. svn path=/trunk/; revision=33113
2010-05-16Attempt to handle isochronous descriptors between the 64-byte header andGuy Harris1-2/+142
the payload. Should fix bug 4401. svn path=/trunk/; revision=32828
2010-04-27Whitespace changes.Anders Broman1-23/+23
svn path=/trunk/; revision=32575
2010-04-21From Chris Maynard:Guy Harris1-70/+53
Support PPP-over-USB. Don't remove the USB pseudo-header from the packet data for Linux USB packets, just byte-swap it if necessary and have the USB dissector fetch the pseudo-header from the raw packet data. Update USB language ID values. svn path=/trunk/; revision=32534