summaryrefslogtreecommitdiff
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
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
2013-08-10Initialize float variables with float constants, not double constants,Guy Harris1-6/+6
and assign float constants, not double constants, to float variables. Floating-point constants are double by default; you have to add "f" to the end to make them float. This squelches 64-bit-to-32-bit warnings. svn path=/trunk/; revision=51289
2013-08-10Fix error when build with clang 3.0Alexis La Goutte1-1/+1
wiretap/lanalyzer.c:643:24: error: implicit conversion loses integer precision: 'const __suseconds_t' (aka 'const long') to 'gint32' (aka 'int') [-Werror,-Wshorten-64-to-32] gint32 usec = a->tv_usec; ~~~~ ~~~^~~~~~~ svn path=/trunk/; revision=51249
2013-08-10IxVeriwave 11ac patch (bug 8912) from Tom Cook.Martin Mathieson1-528/+516
This was the 4th patch, but also: - use gmalloc0() to allocate vwr struct. Otherwise, valgrind says that many of fields were still uninitialised when parse_s1_W_stats later read them - whitespace tidyup, got rid of remaining tabs and trailing whitespace Did a fair bit of fuzz-testing without seeing any problems. svn path=/trunk/; revision=51248
2013-08-08Clarify what the special cases in wtap_wtap_encap_to_pcap_encap() areGuy Harris1-17/+17
doing. svn path=/trunk/; revision=51209
2013-08-08Point to the tcpdump.org link-layer header types page.Guy Harris1-1/+2
svn path=/trunk/; revision=51203
2013-08-08Rename "dlt_value" to "linktype_value", and give more details inGuy Harris1-30/+43
comments about LINKTYPE_ values vs. DLT_ values. svn path=/trunk/; revision=51202
2013-07-31Back out previous checkin, which wasn't intended (and which had theGuy Harris1-147/+137
wrong checking message - wrong source tree...). svn path=/trunk/; revision=51051
2013-07-31Copy over r51049 from trunk:Guy Harris1-137/+147
------------------------------------------------------------------------ r51049 | guy | 2013-07-30 22:00:28 -0700 (Tue, 30 Jul 2013) | 5 lines If no target OS version was specified, default to the major version on which we're running, so we *always* build against an SDK. (The "10" in "10.x.y" is not *really* part of the version number, so the "major version" includes the "10" and the major version number following it.) svn path=/trunk/; revision=51050
2013-07-29Try to fix error: uninitialized const 'zeroes' is invalid in C++ ↵Pascal Quantin1-1/+1
[-Werror=c++-compat] svn path=/trunk/; revision=51004
2013-07-29Make a never-changed pile-o-zeroes const.Guy Harris1-1/+1
svn path=/trunk/; revision=51003
2013-07-29Make a never-changed table const.Guy Harris1-1/+1
svn path=/trunk/; revision=51002
2013-07-29Make non-static a variable that doesn't need to be static.Guy Harris1-2/+2
svn path=/trunk/; revision=51001
2013-07-29The base_secs value should be a time_t, as it's calculated usingGuy Harris1-5/+14
mktime(). That eliminates the need for casts. It should *also* be part of a per-wtap-structure private data structure, not a global variable; make it so. svn path=/trunk/; revision=51000
2013-07-29Add a URL for a STANAG 4607 spec.Guy Harris1-2/+4
Fix some typoes in comments. svn path=/trunk/; revision=50999
2013-07-28Use the portable g_ntohl, also add some casts.Evan Huus1-5/+5
svn path=/trunk/; revision=50997
2013-07-28From Linas Vepstas via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8962Evan Huus7-0/+243
Enhancement: Add STANAG 4607 file format svn path=/trunk/; revision=50996
2013-07-28If a core Wireshark developer repeatedly can't remember that theGuy Harris1-2/+11
argument to the -F flag for pcap format is "libpcap", not "pcap", we have a problem. Make it "pcap", and add a backwards-compatibility hack to support using "libpcap" as well. Update the man pages to refer to it as pcap as well, and fix the capitalization of "WinPcap" (see http://www.winpcap.org) while we're at it. Also, refer to http://www.tcpdump.org/linktypes.html for the list of link-layer header types for pcap and pcap-ng. svn path=/trunk/; revision=50989
2013-07-23Don't cast away constness (except where APIs render that impossible).Guy Harris1-1/+1
svn path=/trunk/; revision=50854
2013-07-23Don't cast away constness.Guy Harris1-1/+1
svn path=/trunk/; revision=50853
2013-07-23Handle operating systems that are anticipating the day when files shouldGuy Harris1-1/+9
be read in chunks > 2GB. svn path=/trunk/; revision=50847
2013-07-23Use largefile detection in cmake.Jörg Mayer1-1/+1
Move wiretap/file_wrapper.c back to clean sources. svn path=/trunk/; revision=50825
2013-07-22Move file_wrappers.c to dirty files, it has some warnings (turning errors)Jörg Mayer1-4/+8
when compiled with clang. Just for documentation: [ 6%] Building C object wiretap/CMakeFiles/wiretap.dir/file_wrappers.c.o /home/jmayer/work/wireshark/svn/trunk/wiretap/file_wrappers.c:987:28: warning: implicit conversion loses integer precision: 'gint64' (aka 'long long') to '__off_t' (aka 'long') [-Wshorten-64-to-32] if (ws_lseek64(file->fd, off, SEEK_SET) == -1) { ~~~~~~~~~~ ^~~ /home/jmayer/work/wireshark/svn/trunk/wiretap/file_wrappers.c:1051:35: warning: implicit conversion loses integer precision: 'long long' to '__off_t' (aka 'long') [-Wshorten-64-to-32] if (ws_lseek64(file->fd, offset - file->have, SEEK_CUR) == -1) { ~~~~~~~~~~ ~~~~~~~^~~~~~~~~~~~ /home/jmayer/work/wireshark/svn/trunk/wiretap/file_wrappers.c:1076:34: warning: implicit conversion loses integer precision: 'gint64' (aka 'long long') to '__off_t' (aka 'long') [-Wshorten-64-to-32] if (ws_lseek64(file->fd, file->start, SEEK_SET) == -1) { ~~~~~~~~~~ ~~~~~~^~~~~ 3 warnings generated. svn path=/trunk/; revision=50798
2013-07-16The new frame-based tvbuff code found that the DOS Sniffer code forGuy Harris1-8/+51
compressed sniffer files failed if the very first read involves seeking past the first blob; fix that. svn path=/trunk/; revision=50679
2013-07-16Make camins_read_packet static.Chris Maynard1-1/+1
svn path=/trunk/; revision=50671
2013-07-16Include merge.h, so it shows up in the distribution tarball.Guy Harris1-0/+1
svn path=/trunk/; revision=50662
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss4-0/+419
svn path=/trunk/; revision=50656
2013-07-16Explain that we don't have to worry about fixed-length buffers whoseGuy Harris1-1/+6
size is based on the snapshot length. svn path=/trunk/; revision=50647
2013-07-15On the suggestion of Cal Turney, viaEvan Huus1-0/+6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8937 Don't warn if a file has packets larger than the global snapshot length. svn path=/trunk/; revision=50646
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 22:02:24 +0000