summaryrefslogtreecommitdiff
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
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
2013-07-12Avoid building ascend.h and ascend.c in parallel (2 bison's running at the ↵Jeff Morriss1-1/+3
same time sometimes results in corrupted output). svn path=/trunk/; revision=50524
2013-06-28Use newly assigned DLT for PDU export functionalityPascal Quantin3-0/+12
svn path=/trunk/; revision=50212
2013-06-21Fix some pointer-signedness (well, signedness of what the pointer pointsGuy Harris3-10/+10
to) warnings. svn path=/trunk/; revision=50104
2013-06-19Clarify (a V1.0 file might have a single zero byte at the end of theGuy Harris1-2/+7
page, which doesn't look like an "unused space" record because there aren't two bytes of record type, just one byte). svn path=/trunk/; revision=50027
2013-06-18Slight stylistic cleanup - most routines, when defined, have no spaceGuy Harris2-2/+2
between the routine name and the opening parenthesis, so remove it from the definition of the seek-read routine. svn path=/trunk/; revision=50026
2013-06-18Note that NetScaler trace files are page-oriented, with records notGuy Harris1-4/+16
split across page boundaries, rather than being a byte stream, and that the last page may be short. Fix some comments. svn path=/trunk/; revision=50025
2013-06-18Don't limit the on-the-wire length of packets to 64KB, there are larger packetsEvan Huus1-16/+3
out there (especially over USB) and we should be able to load them as long as they are snapped to a sane length. Also validate that packets do not specify a snapshot length larger than the one in the file header, though only make it a warning, as this is not necessarily a fatally corrupt packet. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8808 svn path=/trunk/; revision=49999
2013-06-17Put the code to fill in the struct wtap_pkthdr and to read the packetGuy Harris1-33/+31
data into a common routine, and use it in both the read and seek-read routines. svn path=/trunk/; revision=49996
2013-06-17Merge more of the read and seek-read code paths.Guy Harris1-29/+25
svn path=/trunk/; revision=49990
2013-06-17Merge "read record header" and "read packet data" routines into a singleGuy Harris26-989/+604
routine, used both by read and seek-read routines. svn path=/trunk/; revision=49988
2013-06-16Make the libwiretap Buffer routines usable from C++, and fix the C++ UIGuy Harris1-0/+8
code to handle the API changes for the seek-read routines. svn path=/trunk/; revision=49950
2013-06-16Have the seek-read routines take a Buffer rather than a guint8 pointerGuy Harris51-989/+647
as the "where to put the packet data" argument. This lets more of the libwiretap code be common between the read and seek-read code paths, and also allows for more flexibility in the "fill in the data" path - we can expand the buffer as needed in both cases. svn path=/trunk/; revision=49949
2013-06-15Pull some of the code to set the struct wtap_pkthdr intoGuy Harris1-47/+50
parse_netscreen_hex_dump(). svn path=/trunk/; revision=49944
2013-06-15Fill in at least some of the struct wtap_pkthdr in both the read andGuy Harris1-7/+14
seek-read routines. svn path=/trunk/; revision=49943
2013-06-14Rename radcom_process_rec_header() to radcom_process_rec_header() andGuy Harris1-102/+77
move the code to file in a struct wtap_pkthdr there. svn path=/trunk/; revision=49942
2013-06-10Allign the error messages.Anders Broman1-0/+1
svn path=/trunk/; revision=49870
2013-06-09libwireshark's add_new_ipv4() and add_new_ipv6() now silently ignoreGuy Harris1-16/+3
requests to add an entry with a zero-length name; we don't have to ignore them ourselves. svn path=/trunk/; revision=49854
2013-06-09Don't treat zero-length names in the NRB as errors, just silently ignoreGuy Harris1-11/+17
them. Works around the problem reported in bug 8763. svn path=/trunk/; revision=49851
2013-06-07Use g_try_malloc() for some memory allocations, and return an "out ofGuy Harris1-5/+21
memory" indication if it fails. Further fixes bug 8752. Also, clean up indentation. svn path=/trunk/; revision=49834
2013-06-07Prevent attempts to allocate huge amounts of memory by imposing anGuy Harris1-23/+141
artificial 16MB limit on blocks. Do some sanity checks when reading options, to make sure we don't read past the end of the block. Make some variables unsigned so as not to get inappropriate sign-extension (which, in practice, should never happen due to the 16MB block size limit, although if the limit is raised above 2^31-1, the limit won't protect you). Fixes bug 8752. svn path=/trunk/; revision=49833
2013-06-06From Mark C. Brown via ↵Pascal Quantin2-0/+4
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8777 : Add support for 10Gbe HP-UX drivers IOCXGBE and IQXGBE svn path=/trunk/; revision=49820