aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
2012-05-04Fix indentation.Guy Harris1-3/+3
svn path=/trunk/; revision=42408
2012-05-02Add a file_skip() routine to skip N bytes forward in the file - it'sGuy Harris2-7/+19
currently just a wrapper around file_seek(), but could be implemented by reading forward if, for example, we add support for reading (sequentially only!) from a pipe. Sort the declarations of file-reading routines into one block. svn path=/trunk/; revision=42391
2012-05-02Put all the comments about the "don't check the CRC" flag together, andGuy Harris1-11/+10
expand the resulting comment a bit. svn path=/trunk/; revision=42390
2012-05-02Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header"Guy Harris5-95/+30
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-05-01Remove unnecessary null-pointer check.Guy Harris1-4/+2
svn path=/trunk/; revision=42376
2012-05-01Fix 2 redundant redeclaration warnings and a bug where logical AND (&&) was ↵Chris Maynard1-4/+1
incorrectly used where bit-wise AND (&) was meant. svn path=/trunk/; revision=42373
2012-04-29Add ".dmp" as a suffix for pcap files of various flavors. Add ".ntar"Guy Harris1-8/+8
as a suffix for pcap-ng files. svn path=/trunk/; revision=42330
2012-04-28Remove _U_ from arguments that are actually used.Guy Harris1-5/+5
Fix a comment. svn path=/trunk/; revision=42311
2012-04-28If xml_get_int() fails, bail immediately; don't use the variable itGuy Harris1-14/+18
would have filled in had it not failed. (Thanks and a tip of the Hatlo hat to the Clang static analyzer for complaining about this.) svn path=/trunk/; revision=42306
2012-04-28Get rid of some unnecessary assignments, to remove warnings from theGuy Harris1-5/+1
Clang static analyzer. svn path=/trunk/; revision=42304
2012-04-26Remove duplicate comment.Guy Harris1-2/+0
svn path=/trunk/; revision=42270
2012-04-26Add a pcoreytohll() macro to extract "Corey-endian" 64-bit quantities,Guy Harris1-27/+24
and use it. Fix some comments. svn path=/trunk/; revision=42269
2012-04-26Use the pletohXX macros when fetching little-endian values.Guy Harris1-8/+5
svn path=/trunk/; revision=42256
2012-04-26Put the pseudo-header information for Veriwave packets into the bufferGuy Harris2-37/+196
in little-endian byte order, as that's what the dissector expects. Add a pletohl() macro for that purpose. Fix comments (the Veriwave code is *not* writing data to a file!) and clean up indentation. svn path=/trunk/; revision=42255
2012-04-26Use pntohs(), pntoh24(), and pntohl() to fetch big-endian data from theGuy Harris1-40/+32
headers. Fix some indentation. svn path=/trunk/; revision=42252
2012-04-26Global variables considered harmful. Move all the per-capture-fileGuy Harris1-407/+421
global variables into a structure that's attached to the wtap_t as private data, and make all the per-*packet* global variables local variables. svn path=/trunk/; revision=42251
2012-04-26Put pcapng_open() right after libpcap_open(); pcap and pcap-ng are ourGuy Harris1-2/+2
native file formats, so try them first. Move eyesdn_open() to the section for open routines for file formats that have a magic number - EyeSDN traces all start with "EyeSDN". svn path=/trunk/; revision=42250
2012-04-26If you get an I/O error when looking for the FPGA version, return -1, soGuy Harris1-16/+23
we know we had a real problem with the file. If we just get a short read, return 0, as it means the file is probably not a VWR file. If we get an invalid message length when reading packets (rather than when looking for the FPGA version), return WTAP_ERR_BAD_FILE and an "Invalid message record length" indication, not a generic fallback "can't read the file" error. For file_tell() errors, fetch the error code with file_error(). For file_seek() errors, use the error file_seek returned. svn path=/trunk/; revision=42249
2012-04-25Return 0 if doesn't match signature of vwr files.Martin Mathieson1-2/+4
Pointed out by Martin Kaiser in bug 7196. svn path=/trunk/; revision=42248
2012-04-25Add wtap_dump_fdopen_ngAnders Broman1-0/+1
svn path=/trunk/; revision=42231
2012-04-25Handle wtap_dump_fdopen() as wtap_dump_open() eg callAnders Broman2-37/+79
wtap_dump_fdopen_ng() and add a dummy IDB to be able to write pcapng files. Solves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6969 mergecap: Can't open or create <FILENAME>: Internal error. We might want to add a SHB comment from mergecap giving the merged filenames or something like that, Merging of pcapng files is a different issue, idealy we should probably start using several SHB:s in that case. svn path=/trunk/; revision=42230
2012-04-25Remove some unnecessary includes and fix some indentation.Martin Mathieson1-8/+7
svn path=/trunk/; revision=42227
2012-04-22Fix a buildbot compile warning.Bill Meier1-1/+1
svn path=/trunk/; revision=42197
2012-04-22Various minor cleanup:Bill Meier1-200/+222
- fix a few small memory leaks; - fix some indentation to match style used (gnu); - remove trailing whitespace; - ... svn path=/trunk/; revision=42196
2012-04-22Global variables considered harmful (and unnecessary).Guy Harris1-13/+10
svn path=/trunk/; revision=42189
2012-04-21Lose some more unused variables reported by clang.Martin Mathieson1-7/+4
svn path=/trunk/; revision=42173
2012-04-20Try to fix up some clang warnings. Will look at other modules I addedMartin Mathieson1-37/+14
recently later. svn path=/trunk/; revision=42167
2012-04-20Add a couple of casts to try to make the Windows-7-x64 buildbot happy.Martin Mathieson1-2/+2
svn path=/trunk/; revision=42159
2012-04-20Missed file from previous commit.Martin Mathieson1-0/+29
svn path=/trunk/; revision=42156
2012-04-20Patch for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5048Martin Mathieson6-0/+2124
From Tom Cook and Tom Alexander. 1. A VWR encapsulation that reads VeriWave capture files (*.vwr) generated from WaveTest test hardware 2. Dissectors that display the VeriWave tap headers (both 802.11 and Ethernet) 3. A dissector for the WaveAgent protocol. The WaveAgent dissector is heuristic and parses the WaveAgent packet (a UDP payload). The WaveAgent dissector has been Fuzz tested. The VWR ENCAP and dissectors have been used extensively by VeriWave customers in a special version of WireSark compiled by VeriWave. svn path=/trunk/; revision=42155
2012-04-20Fix more indentation.Guy Harris1-1/+1
svn path=/trunk/; revision=42147
2012-04-20Use consistent 2-space indentation, and don't use tabs.Guy Harris1-496/+496
svn path=/trunk/; revision=42146
2012-04-19Fix typo.Guy Harris1-1/+1
svn path=/trunk/; revision=42145
2012-04-19Don't byte-swap bytes that aren't there.Guy Harris1-6/+16
svn path=/trunk/; revision=42144
2012-04-18From Rolf Fiedler:Anders Broman1-2/+3
patch to fix mp2t.c to reject more byte streams that are not MPEG2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7132 svn path=/trunk/; revision=42127
2012-04-18Get the Windows build going again. The Netxray "fix" cast to guint8 may not ↵Anders Broman2-2/+2
be OK. svn path=/trunk/; revision=42125
2012-04-18From Colus Tang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7134Alexis La Goutte1-1/+1
Unable to display the correct IEEE802.11 MCS data rates due to header definition The problem is due to the ieee_802_11_phdr.data_rate is defined as guint8, since this variable is counting number of 0.5Mbps units, any datarates which is higher than 255Mbps would get wrapped up. In the above example, only the lower 8bit value will be put into the ieee_802_11_phdr which is 0x04 and result in the incorrect 2Mbps display. There are 802.11n WLAN product is capable to transmit @450Mbps, we should fix this data_rate from guint8 to guint16. #BACKPORT svn path=/trunk/; revision=42123
2012-04-18If we see a 5View time-stamped header with a bad key, make sure weGuy Harris2-2/+6
return the right error code and information string. InfoVista bought Accellent Group, and, at least according to the InfoVista Web site, it's "5View", not "5Views". svn path=/trunk/; revision=42119
2012-04-18Fix some indentation errors from the previous change.Guy Harris1-3/+3
svn path=/trunk/; revision=42118
2012-04-18Get rid of tabs, so we don't have to worry about 4-space vs. 8-space tabs.Guy Harris1-160/+161
svn path=/trunk/; revision=42117
2012-04-15Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7048Michael Tüxen1-10/+40
Write timetamps for the interface statistic blocks the way specified by http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html svn path=/trunk/; revision=42080
2012-04-15Whitespace cleanup (done while debugging).Michael Tüxen1-65/+65
svn path=/trunk/; revision=42079
2012-04-15Fix a typo (just clearing my client out before I start doing diffs).Martin Mathieson1-1/+1
svn path=/trunk/; revision=42077
2012-04-14More double-free fixes - destroy_k12_file_data() frees its argument, soGuy Harris1-2/+0
calling g_free() on that argument after calling destroy_k12_file_data() is always an error. svn path=/trunk/; revision=42067
2012-04-14From From Evan Huus: Potential double-free while importing k12xx *.rf5 files ↵Anders Broman1-2/+0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7084 svn path=/trunk/; revision=42062
2012-04-13Remove doubled semicolons and semicolons outside function.Jakub Zawadzki4-4/+4
svn path=/trunk/; revision=42053
2012-04-10Call LAPD-with-Linux-pseudoheader "linux-lapd", and fix its descriptionGuy Harris1-2/+2
to indicate the Linux pseudo-header. Fix the description of LAPD-without-Linux-pseudoheader to be just "LAPD". svn path=/trunk/; revision=42018
2012-04-10Fix tpo.Guy Harris1-1/+1
svn path=/trunk/; revision=42017
2012-04-10It's "X.25", not "X25".Guy Harris1-1/+1
svn path=/trunk/; revision=42016
2012-04-09Mark some function static.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=41999