aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
2013-11-29Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.Jakub Zawadzki5-83/+64
XXX, people are not aware that expression of this macros might be evaluated multiple times, like: - BSWAP16(tvb_get_letohs(tvb, off)) : \ + GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \ Should be tvb_get_ntohs() called? svn path=/trunk/; revision=53653
2013-11-29Expand macros: htoles(), htolel(), htolell()Jakub Zawadzki9-129/+124
svn path=/trunk/; revision=53651
2013-11-23Bluetooth improvements. Bug 9446 ↵Michael Mann1-3/+15
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) From Michal Labedzki svn path=/trunk/; revision=53525
2013-11-21Get rid of C++ comments.Guy Harris1-1/+1
svn path=/trunk/; revision=53486
2013-11-21Cope with empty VWR files (bug 9428)Martin Mathieson1-2/+9
svn path=/trunk/; revision=53475
2013-11-20Add support for a new type of frame data record seen in a k18 file, andGuy Harris1-10/+34
handle that file not ending with a 2-byte 0xffff end-of-file record. This fixes bug 9455, although it doesn't add support for reading an "index" file for a capture that's in multiple .rf5 files, which is a separate issue noted in that bug. It also doesn't attempt to figure out what the data in the new record type following the data that appears to be the same as that in the other data record format but preceding the actual packet data is. svn path=/trunk/; revision=53452
2013-11-20Add code to dump part of a record as ASCII, and use it to dump stringsGuy Harris1-27/+236
in a source description record, including the stack. Dump some other fields in those records as well. Attach separate sequential and random read buffers to the private data structure, rather than allocating them in various routines (and not always freeing them) and, in at least one case, allocating a single *common* buffer for all wth's to use. Fix some comments (the DS0 mask is 32 bytes long, but gets turned into a bitmask). Put in a description of what a "stack file"'s contents look like. Much of it may be useless to us (for example, we have the notion that TCP has protocol number 6 built-in...), but the RELATION entries that map from "BASE" to a protocol could obviate the need to have the user specify a map from stack file names to starting protocols, and we might be able to use, for example, entries that map TCP/UDP/SCTP port numbers to protocols to obviate the need for the user to explicitly use Decode As or otherwise configure port-to-protocol mappings themselves. Add a bunch of record length checks before we fetch data from records. svn path=/trunk/; revision=53450
2013-11-19Update URL for the Tektronix manual, and fix a typo in the same comment.Guy Harris1-20/+27
Dump the raw contents of records as hex and ASCII, not just hex. Sort the record types, and add a new one for a type we've seen in a k18 file and about which we know nothing. For unknown record types, print the type in hex. svn path=/trunk/; revision=53441
2013-11-19Fix some problems with the debugging code.Guy Harris1-4/+5
svn path=/trunk/; revision=53438
2013-11-181.11.2 → 1.11.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=53412
2013-11-151.11.1 → 1.11.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=53346
2013-11-11Export the right function name.Anders Broman1-1/+1
svn path=/trunk/; revision=53255
2013-11-09Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.Jakub Zawadzki6-14/+11
After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. svn path=/trunk/; revision=53184
2013-11-08(Trivial) whitespace cleanup (mostly trailing whitespace).Bill Meier28-89/+89
svn path=/trunk/; revision=53172
2013-11-08Looks like r53166 was not compile tested. Now k12text.l compiles again.Jörg Mayer1-2/+2
svn path=/trunk/; revision=53167
2013-11-08The "file types" we have are actually combinations of types andGuy Harris52-416/+418
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2 are separate "file types", even though they both come from Network Monitor. Rename various functions, #defines, and variables appropriately. svn path=/trunk/; revision=53166
2013-11-08For open dialogs, offer a list of sets of extensions, not of file types;Guy Harris2-24/+86
.cap, for example, doesn't refer to a particular file type - a whole bunch of file types use .cap. Also offer, in addition to "All Files", "All Capture Files", which matches all the extensions we know about. svn path=/trunk/; revision=53156
2013-10-29simplify file_error()Martin Kaiser1-5/+4
svn path=/trunk/; revision=52944
2013-10-29allow err_info==NULL in file_error()Martin Kaiser1-1/+2
this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9309 reported by Peter Wu svn path=/trunk/; revision=52943
2013-10-28Revert SVN #52914;Bill Meier5-247/+7
OSX-10.6-x64 buildbot still givs an error (At least we now know which line of code gives the error). svn path=/trunk/; revision=52915
2013-10-28From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.Bill Meier5-7/+247
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280 (Revised patch: let's see if this version compiles w/o error on all the buildbots) svn path=/trunk/; revision=52914
2013-10-28Fix up some formatting.Jeff Morriss1-11/+22
svn path=/trunk/; revision=52911
2013-10-27Fix up some more svn properties.Jeff Morriss1-1/+1
svn path=/trunk/; revision=52882
2013-10-23From Michal Labedzki viaEvan Huus1-1/+3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818 Add support for dissection ELF files. It opens as a "capture" file via wiretap at the moment for simplicity's sake, but the intention is eventually to have this (and other file types we dissect) open through some other program sharing much of the libwireshark infrastructure. svn path=/trunk/; revision=52775
2013-10-21Fix "unused variable 'dct3trace_magic_l2_end' ↵Bill Meier1-0/+2
[-Werror,-Wunused-const-variable" found by clang v3.4 svn path=/trunk/; revision=52749
2013-10-19Minor refactoring in CMake ABI dump generationBalint Reczey1-3/+1
svn path=/trunk/; revision=52689
2013-10-19Set and use TMPDIR for ABI dump generation when using CMakeBalint Reczey1-4/+4
svn path=/trunk/; revision=52688
2013-10-18White space cleanups (thanks either to shekhar.chandra@citrix.com orGuy Harris1-31/+31
Bill Meier; see bug 9280). svn path=/trunk/; revision=52677
2013-10-18Revert SVN #52665.Bill Meier5-299/+39
Compilation fails on (only the ?) OSX-10.6-x64 buildbot with error: netscaler.c: In function 'nstrace_read_v30': netscaler.c:1295: warning: implicit conversion shortens 64-bit value into a 32-bit value (Life is too short for me to dig multiple levels deep into a set of macros to try to see which actual line of code is causing the problem. Maybe the patch submitter can identify the problem). svn path=/trunk/; revision=52666
2013-10-18From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.Bill Meier5-39/+299
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280 From me: fix indentation(tabs->spaces) and trailing whitespace. svn path=/trunk/; revision=52665
2013-10-16Fix various: whitespace, comments & etc.Bill Meier1-612/+624
Add editor modelines. svn path=/trunk/; revision=52639
2013-10-15Add another cast.Gerald Combs1-1/+1
svn path=/trunk/; revision=52622
2013-10-15Add casts to fix some shortening errors.Gerald Combs1-4/+4
svn path=/trunk/; revision=52621
2013-10-15limit the values written to phdr.(cap)len to guint32, not to guint16Martin Kaiser1-6/+6
We read a two-byte length field and add a constant number of header bytes to this length, so we could in theory be larger than guint16. svn path=/trunk/; revision=52619
2013-10-15code review of parse_s1_W_stats()Martin Kaiser1-2/+16
range check for array index don't assign the result of pntohs() to a gint16 range check for the values stored in phdr.(cap)len svn path=/trunk/; revision=52618
2013-10-15Factor out common parts of ABI checks to UseABICheck.cmakeBalint Reczey1-15/+2
svn path=/trunk/; revision=52614
2013-10-14do some range checks when reading vwr filesMartin Kaiser1-14/+14
don't assign the output of pntoh24() to a gint16 unfortunately, vwr detection does not work reliably and many pdf files are recognized as vwr - this commit should prevent wireshark from crashing when it tries to load the USB 2.0 spec as pdf ;-) svn path=/trunk/; revision=52599
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice1-0/+1
using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-09-29Get rid of a redundant check - pcapng_read_packet_block() already checksGuy Harris1-89/+74
whether the (zero-based) interface ID is < the number of interface IDs, so we don't need to do so in pcapng_read(). Unions are tricky - if the compiler doesn't ensure that the right component of the union is being used at any given time, various problems can happen. Remove some members from the "data" union in the wtapng_block_t structure, and use a local variable of the specified type. svn path=/trunk/; revision=52262
2013-09-28The pcap-ng spec says the captured length is the minimum of theGuy Harris1-23/+40
interface snapshot length and the packet length; make it so. svn path=/trunk/; revision=52253
2013-09-28Actually, the captured length must be the minimum of:Guy Harris1-8/+32
the number of bytes available for packet data in the block; the packet length; *and* the snapshot length for the interface. One more fix for bug 9200, so it should *now* be fixed. svn path=/trunk/; revision=52250
2013-09-28Fix cut-and-pasteo.Guy Harris1-1/+1
Finishes the fix for bug 9200. svn path=/trunk/; revision=52247
2013-09-28Correctly calculate the captured length in a Simple Packet Block -Guy Harris1-3/+1
subtract out the minimum SPB size, which includes the length of *everything* except for the packet data. Fixes one problem found by the file in bug 9200. svn path=/trunk/; revision=52244
2013-09-28In a Simple Packet Block, the captured length isn't the block lengthGuy Harris1-5/+7
minus the lengths of the two length fields and the packet length field, it's the minimum of that and the packet length, as there might be padding. Fixes one problem found by the file in bug 9200. While we're at it, pcapng_read_packet_block() and pcapng_read_simple_packet_block() return an integer, not a Boolean; return 0, not FALSE (they have the same value, but returning 0 makes it clearer that the return value isn't restricted to TRUE or FALSE). svn path=/trunk/; revision=52241
2013-09-28There's no interface ID in a Simple Packet Block.Guy Harris1-10/+16
Fixes one problem found by the file in bug 9200. svn path=/trunk/; revision=52238
2013-09-22Fix some typos, indentation. Don't try to write the NRB if the pointer to ourEvan Huus1-139/+139
two lists is itself NULL. svn path=/trunk/; revision=52181
2013-09-22Remove unused parameter.Evan Huus1-3/+3
svn path=/trunk/; revision=52178
2013-09-22Turn off debuging.Anders Broman1-1/+1
svn path=/trunk/; revision=52177
2013-09-22Get rid of struct addrinfo, use the hastables for name resolution instead.Anders Broman4-96/+125
svn path=/trunk/; revision=52176
2013-09-15From Tom Cook via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 ↵Alexis La Goutte1-3/+3
Long / short guard interval not properly read from IxVeriWave vwr files The short / long guard interval is located in a different spot than the current vwr reader looks. svn path=/trunk/; revision=52047