aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
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
2013-09-07trivial: fix a typoMartin Kaiser1-1/+1
svn path=/trunk/; revision=51813
2013-08-27Make sure we initialize the array of file type extensions before we useGuy Harris1-0/+2
it. svn path=/trunk/; revision=51553
2013-08-27Have a separate list of extension sets to use in the Open dialog;Guy Harris2-68/+168
include only extensions used mostly by capture files (i.e., not ".txt" or ".xml"), and list each extension set only once (it's silly to have, for example, separate entries for NetMon, Shomiti Surveyor, and NetScaler with ".cap" when you get all those types no matter which entry you choose). svn path=/trunk/; revision=51547
2013-08-23For the Windows Open dialog for capture files, get rid of the "(*.*)" inGuy Harris2-29/+81
the "All Files" entry (the current UI guidelines from Microsoft say to do so, and that's what Paint does, at least), and add an "All Capture Files" entry with all the file extensions for the file types we support (it'll pick up all text files, but there's not much we can do about that, and it won't pick up files with *no* extension or weird extensions, such as you might get from UN*X systems or from WinDump commands, but at least it'll filter out some other crud). Fix what appear to be memory leaks; that should be backported unless I've missed something and they aren't leaks. Fix an out-of-date comment, and add an additional comment. svn path=/trunk/; revision=51481
2013-08-22From Stephen Donnelly <stephen.donnelly@emulex.com>:Guy Harris1-1/+5
Move the check for vwr files *after* the check for ERF files, as it sometimes thinks ERF files are VWR files. svn path=/trunk/; revision=51467
2013-08-22Back out the previous change, so I can check it in again with theGuy Harris1-5/+1
*correct* checkin message. Sigh.... svn path=/trunk/; revision=51466
2013-08-22Copy over r51462 from trunk:Guy Harris1-1/+5
------------------------------------------------------------------------ r51462 | guy | 2013-08-21 20:21:47 -0700 (Wed, 21 Aug 2013) | 8 lines What was I thinking? ".caz" is used for compressed *Windows* Sniffer files (which are just gzipped uncompressed Windows Sniffer files, albeit with the checksum computed differently in some fashion, or perhaps just being computed incorrectly), not compressed *DOS* Sniffer files (which use their own form of compression, which doesn't compress the entire file, just most of it, and which use the same extensions as uncompressed DOS Sniffer files). svn path=/trunk/; revision=51465
2013-08-22What was I thinking? ".caz" is used for compressed *Windows* SnifferGuy Harris1-2/+2
files (which are just gzipped uncompressed Windows Sniffer files, albeit with the checksum computed differently in some fashion, or perhaps just being computed incorrectly), not compressed *DOS* Sniffer files (which use their own form of compression, which doesn't compress the entire file, just most of it, and which use the same extensions as uncompressed DOS Sniffer files). svn path=/trunk/; revision=51462
2013-08-15Original ERF file format documentation is still 404, link to bugzilla.Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=51382
2013-08-12Fix error when enable "debug" in wiretap/pcapng.c fileAlexis La Goutte1-1/+1
With gcc : pcapng.c: In function 'pcapng_read_packet_block': pcapng.c:1147:9: error: request for member 'pseudo_header' in something not a structure or union With clang : pcapng.c:1150:86: error: member reference type 'struct wtap_pkthdr *' is a pointer; maybe you meant to use '->'? pcap_get_phdr_size(int_data.wtap_encap, &wblock->packet_header.pseudo_header)); ~~~~~~~~~~~~~~~~~~~~~^ -> (Error message from clang is better...) svn path=/trunk/; revision=51317
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 17:22:15 +0000