aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
2015-11-28Make the rate tables static and const.Guy Harris1-6/+6
No need to put them on the stack and initialize them at the beginning of the routine. Change-Id: Id6332be186660c881cf37290f70d03cc77ac66be Reviewed-on: https://code.wireshark.org/review/12265 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-28Make it more obvious why no bounds checks are necessary for 11n.Guy Harris1-6/+7
For unsigned x, x/8 is x >> 3, and x*8 is x << 3, so 8*(x/8) is the result of shifting x right 3 bits and then left 3 bits, which is the same as masking out the low-order 3 bits, and x - (8*x/8) is the result of subtracting all but the low-order 3 bits from x, thus it's the lower 3 bits, so you can just mask it with 0x7. That means the result is in the range 0 through 7, so as long as the array has 8 elements, you're OK; it does, but explicitly declare it as such, to make it clearer that it is, and to get compiler warnings if not all 8 elements are initialized. Change-Id: Iff9c0626b9bdc012cca52e4160dda9e947315bc4 Reviewed-on: https://code.wireshark.org/review/12264 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-28vwr: fix buffer overrun in getRatePeter Wu1-3/+6
Bug: 11789 Change-Id: Ieba9f32928b91be5d07b25bf54005155f7cc79f6 Reviewed-on: https://code.wireshark.org/review/12245 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-28Sanity check iSeries packet length to prevent heap-based buffer overflow.Michael Mann1-1/+1
Bug: 11798 Change-Id: I7aebe709ef4014a385819835ef6effabbb4f0ca4 Reviewed-on: https://code.wireshark.org/review/12238 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27wtap: Disable ISO C forbids conversion [-Wpedantic]João Valverde1-6/+4
wtap.c:74:25: warning: ISO C forbids conversion of object pointer to function pointer type [-Wpedantic] Choose ISO C or dynamic loading, can't have both. Change-Id: I6d48073dadaf7c1710bd87ed71a2e7b65970d47e Reviewed-on: https://code.wireshark.org/review/12165 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27pcapng: Fix ISO C forbids conversion [-Wpedantic]João Valverde2-12/+19
pcapng.c:461:31: warning: ISO C forbids passing argument 3 of 'g_hash_table_insert' between function pointer and 'void *' [-Wpedantic] pcapng.c:1404:32: warning: ISO C forbids conversion of object pointer to function pointer type [-Wpedantic] pcapng.c:1918:32: warning: ISO C forbids conversion of object pointer to function pointer type [-Wpedantic] Change-Id: I535633098cc5d37442732dd92e8c9d3cda36631a Reviewed-on: https://code.wireshark.org/review/12161 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-26Scan pcapng change time to unsignedJoão Valverde1-1/+2
Fixes warning: nettrace_3gpp_32_423.c:813:4: warning: format '%u' expects argument of type 'unsigned int *', but argument 3 has type 'int *' [-Wformat=] Change-Id: I4bfcc19ecac115d5aa2e222dfed8ea8b0b450d71 Reviewed-on: https://code.wireshark.org/review/12211 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26[mp2t] use the correct file infomation for PCR detectionMartin Kaiser1-7/+13
when we check for an mpeg2 transport stream, we're trying to detect an initial offset before the first sync byte and the length of additional data appended to each packet use those values when we go through the file again and verify the PCR Bug: 11749 Change-Id: Iab03cb271d23d38f850ca857b64ca47ba4501175 Reviewed-on: https://code.wireshark.org/review/12183 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26Process the radio information internally for AiroPeek classic files.Guy Harris3-41/+80
Process it in libwiretap; no need to hand it to libwireshark for dissection, it can just dissect the radio information pseudo-header with the processed information. Change-Id: I482697947eecbd3967cf1910ba2fa2bff805cd66 Reviewed-on: https://code.wireshark.org/review/12202 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26Add a check for the day of the month.Guy Harris1-2/+18
Also, fix the month check ("month" is in the range 1 through 12, not 0 through 11), and if neither sscanf() gets the right number of fields, fail immediately. Change-Id: I3f0da49e969c020c292facb843b9741116647302 Reviewed-on: https://code.wireshark.org/review/12170 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26Most fields in an ISO 8601 date/time are unsigned.Guy Harris1-3/+36
Add some bounds checks while we're at it. Change-Id: I19804aee10496fd68f95a27865f8f455d3abbe9f Reviewed-on: https://code.wireshark.org/review/12166 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-25Check whether create_tempfile() fails.Guy Harris1-0/+5
Thanks and a tip of the Hatlo hat to Coverity for finding this. Change-Id: Ie9d4089443e52ef427e0cc8ae6e90a9d9787134e Reviewed-on: https://code.wireshark.org/review/12123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-23merge: fix parameter 'in_files/in_count_files' not found in the function ↵Alexis La Goutte1-6/+6
declaration [-Wdocumentation] Change-Id: Ib3d9b7df5f1396179645456ea7359e711c26b8ef Reviewed-on: https://code.wireshark.org/review/12003 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19use the official DLT for ISO14443Martin Kaiser3-0/+7
add DLT_ISO14443 to pcap_to_wtap_map[] define WTAP_ENCAP_ISO14443, link it to the iso14443 dissector Change-Id: Id837197c4d66071094f9336d60db36a371424807 Reviewed-on: https://code.wireshark.org/review/11959 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-17Misc minor issues caught by cppcheckEvan Huus3-4/+1
All trivial (unused variables, duplicate `break`s, etc). Change-Id: Idbfffae4f6c0b0119a90ae5849de2ed7a1180c9b Reviewed-on: https://code.wireshark.org/review/11886 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-11-16catapult: fix sscanf buffer overflowEvan Huus1-1/+1
Caught by cppcheck. The buffer is 9+1 characters, which means we should specify 9, not 10 to the scanf string since the count does not include the null-terminator. Change-Id: I0aae8cce337055b304efa9399cd5d8059928d2d8 Reviewed-on: https://code.wireshark.org/review/11887 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-11-12Plug file descriptor leak.Guy Harris1-0/+1
Change-Id: I882cc5c264fdf97452c84bd5cea0e5d56bd6eb45 Reviewed-on: https://code.wireshark.org/review/11753 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12Add wtap_dump_open_tempfile routines, to write to a temporary file.Guy Harris2-0/+88
It includes the temporary-file generation, so you don't have to do it yourself. Change-Id: I0798df95a5c5646224ec49612f50b423ed78547a Reviewed-on: https://code.wireshark.org/review/11751 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Put wtap_dump_open() right before wtap_dump_open_ng().Guy Harris1-7/+7
That matches what we do with the other two pairs of dump opening routines. Change-Id: I0e6e475573c3a8d4ab6cf991d0aadc14150af233 Reviewed-on: https://code.wireshark.org/review/11744 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Make routines used only within wiretap/merge.c static.Guy Harris2-114/+46
We just export some UI helpers and the Big Merge Engine. Change-Id: I60bc8ab167e7100189a9ce60d84c0e4db27b6bda Reviewed-on: https://code.wireshark.org/review/11689 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10Initial Sysdig syscall (event) support.Gerald Combs3-5/+130
Add a dissector for reading Sysdig event blocks. It only handles plain events but it's usable for reading trace files on hand here. Use a script to generate various parts of the dissector. As an experiment, update parts in-place instead of using a template. Ultimately there should probably be a top-level "Syscall" or "Event" dissector alongside the "Frame" dissector, which could then call this. You could then directly compare an executable's system calls alongside its network traffic. For now leverage the pcapng_block dissector and keep everything under "Frame". Next steps: - Items listed at the top of packet-sysdig-event.c. Change-Id: I17077e8d7f40d10a946d61189ebc077d81c4da37 Reviewed-on: https://code.wireshark.org/review/11103 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-10Fix typo.Guy Harris1-1/+1
Change-Id: I417de6124925dbfd9599ec7e90e287eb971457a3 Reviewed-on: https://code.wireshark.org/review/11687 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10Call wtap_dump_open_check() in wtap_dump_init_dumper().Guy Harris1-15/+5
The callers of wtap_dump_init_dumper() always call wtap_dump_open_check() first, with the same arguments in all cases; pull the latter call into wtap_dump_init_dumper() itself. Change-Id: I2b44dc3a018745e175b5c74ff1a346749fec2b71 Reviewed-on: https://code.wireshark.org/review/11681 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10Add a comment for is_stdout.Guy Harris1-1/+1
Change-Id: I88abb5a37a00ebc1a2a742ff36c8d6be75420dbe Reviewed-on: https://code.wireshark.org/review/11677 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10Skip only the actual file descriptor close when writing to stdout.Guy Harris5-33/+122
Have a "this is stdout" flag for a wtap_dumper, and have "open the standard output for dumping" routines that set that flag. When closing a wtap_dumper, do most of the work regardless of whether we're writing to the standard output or not (so that everything gets written out) and only skip the closing of the underlying file descriptor. Change-Id: I9f7e4d142b3bd598055d806b7ded1cb4c378de8e Reviewed-on: https://code.wireshark.org/review/11673 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10Treat "-" as "standard input" in the CLI, not in libwiretap.Guy Harris1-27/+9
That's a UI convention, and the GUI shouldn't honor that convention - a user might get confused if they try to save to "-" and end up with nothing (and with a ton of crap in a log file if programs launched from the GUI end up with their standard output and error logged). While we're at it, make randcap report write and close errors. Change-Id: I9c450f0ca0320ce4c36d13d209b56d72edb43012 Reviewed-on: https://code.wireshark.org/review/11666 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-09Call the dumper routine to finish write a file the "finish" routine.Guy Harris19-52/+42
It doesn't actually *close* any handle, so it's best called a "finish" routine rather than a "close" routine. In libwiretap modules, don't bother setting the finish routine pointer to null - it's already initialized to null (it's probably best not to require modules to set it). Change-Id: I19554f3fb826db495f17b36600ae36222cbc21b0 Reviewed-on: https://code.wireshark.org/review/11659 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-08DCT2000 wiretap: Try to address CID 1158844 and 1158845Martin Mathieson1-2/+2
Change-Id: Icb6d93f2e85180e2a4c24e41114f76bb6c7b5a79 Reviewed-on: https://code.wireshark.org/review/11638 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-11-08Use ws_{read,write,fdopen,close}.Guy Harris2-6/+6
Be more consistent about using the ws_ routines, as we suggest in README.developer. In C++ on UN*X, define ws_close as ::close rather than close, so that it works even in classes with methods or members named "close". Change-Id: Ide2652229e6b6b4624cbddae0e909a4ea1efa591 Reviewed-on: https://code.wireshark.org/review/11637 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-08More unnecessary <stdio.h> includes.Guy Harris4-4/+0
libwiretap no longer uses standard I/O routines to read files; those includes are left over from when it did. Change-Id: Ia46c5e24ed25c6bd254cd271746ace539a37e590 Reviewed-on: https://code.wireshark.org/review/11634 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07Renames to avoid collisons with read() and write() routines.Guy Harris1-10/+10
(And with #defines of read as _read and write as _write on Windows, which might make structure members have surprising names if you try to look at them in a debugger.) Change-Id: Iaab5622cbde216d5fedd4bc014c83e4eef95f8a0 Reviewed-on: https://code.wireshark.org/review/11631 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07Check for read errors in the open routine.Guy Harris1-4/+15
While we're at it, rename a variable to avoid colliding with the read() routine. Change-Id: I6629ec761f48751f34a2e7d04180d7583ad85710 Reviewed-on: https://code.wireshark.org/review/11626 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07Clean up includes of unistd.h, fcntl.h, and sys/stat.h.Guy Harris6-31/+0
Have wsutil/file_util.h include them on UN*X, just as it includes io.h on Windows, so we can have a rule of "if you do file operations, include <wsutil/file_util.h> and use the routines in it". Remove includes of unistd.h, fcntl.h, and sys/stat.h that aren't necessary (whether because of the addition of them to wsutil/file_util.h or because they weren't needed in the first place). Change-Id: Ie241dd74deff284e39a5f690a297dbb6e1dc485f Reviewed-on: https://code.wireshark.org/review/11619 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06Don't include io.h in Flex scanners - they're not interactive.Guy Harris2-6/+2
We don't have any Flex scanners that support an interactive command-line interface, so none of our scanners are, or need to be, interactive. Mark text2pcap's scanner as not interactive. That means none of our scanners should call isatty(), so they don't have any need to include <io.h> on Windows; remove that include from the Lucent/Ascent text capture scanner. Update a comment to reflect that what matters isn't whether we can read from a terminal or whether we actually do so, what matters is whether they read *interactively* from a terminal (if you want to run text2pcap reading from the standard input and type at it, be my guest). Change-Id: I59979d1fdb37e1913125a400963ff7a3fa6b9bbd Reviewed-on: https://code.wireshark.org/review/11587 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04Don't include libwireshark headers from libwiretap.Guy Harris2-1/+17
Move the definitions of hashipv4_t and hashipv6_t to wiretap/wtap.h, as that's the main place they're used. Change them a bit not to depend on other stuff from libwireshark, and change the code as required by those changes. This should fix the Solaris build; apparently, the Sun^WOracle compiler is generating code for static inline functions even if they're never called, so that libwiretap ends up including code that calls tvbuff and wmem functions. There's probably further cleanup that could be done here, but this should at least fix the build, as well as getting rid of a dependency between two libraries that are at least somewhat independent (libwiretap should *not* depend on libwireshark, as some programs use libwiretap but not libwireshark, and, ultimately, we probably want it to be possible to use libwireshark without libwiretap but that'd be more work). Change-Id: I91c745282f17d7c8bff7809aa277eab2b3cf47c1 Reviewed-on: https://code.wireshark.org/review/11537 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-26[Nettrace] Port can have 5 characters.AndersBroman1-2/+2
Change-Id: Id09967378165b23358b4787e6ab96db42c41d2fd Reviewed-on: https://code.wireshark.org/review/11288 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-26Nettrace 3GPP 32.423: Fix Dead Store (Dead assignement/Dead increment) ↵Alexis La Goutte1-2/+0
warning found by Clang Change-Id: I721bb77fd95f02cd6795c09e780622575d031920 Reviewed-on: https://code.wireshark.org/review/11282 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-23[Nettrace] Add parsing of IP addresses and ports.AndersBroman1-58/+407
Change-Id: I4e2988edd9b5f75f7b104c8daddd1510bf1fc722 Reviewed-on: https://code.wireshark.org/review/11209 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-20[Nettrace] Parse timestamps and add to individual packets.AndersBroman1-12/+92
Change-Id: I4a84f19011ef0e02836c84dff665b6fcadbf59ae Reviewed-on: https://code.wireshark.org/review/11180 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-16CMake: Add /WXGerald Combs1-2/+2
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-09catapult_dct2000: code restyleDario Lombardo1-17/+7
Remove a clang 3.7 complain. Change-Id: I5237b130dcd0ffd3a4ea61a3c98fa344fddbe633 Reviewed-on: https://code.wireshark.org/review/10834 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-05Initialize 2.1.Gerald Combs2-2/+2
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Allow use of variadic macrosPeter Wu3-221/+203
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-04Expand, correct, and otherwise improve comments.Guy Harris1-4/+61
Change-Id: Id33a1a66114f6b01d203ad717342ae90c12981cc Reviewed-on: https://code.wireshark.org/review/10789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-03If we don't have an NDP flag, make it 0.Guy Harris1-1/+1
Change-Id: If2576eb6023776a348b3e2c85329509a9f9e80d3 Reviewed-on: https://code.wireshark.org/review/10758 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Fix some issues with Series III.Guy Harris1-32/+84
The packet data in some records has an FCS and in some records doesn't. It appears that only the Series III packets do. Handle that. Handle HT and VHT information supplied by Series III. Get rid of an unused include while we're at it, and make the checks for whether the protocol tree is being built a bit clearer, by testing the tree pointer we'll actually be using. Make some style cleanups. Get rid of some unused cruft. Fix FPGA version checks. This is based on Ixia's patches to an older version of Wireshark, but is much cleaned up. Bug: 11464 Change-Id: Ia341e6ffb1771cf38be812bf786f59b3250b7d5b Reviewed-on: https://code.wireshark.org/review/10756 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Fix indentation after previous change.Guy Harris1-4/+4
Change-Id: I64ead71afe09cb330163d4a15fc1310d07a23bb1 Reviewed-on: https://code.wireshark.org/review/10751 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Rename vwr_read_s2_W_rec - it handles both series II and III records.Guy Harris1-3/+3
Change-Id: Ia6c61500345a9f80945c900813e502046ac870c1 Reviewed-on: https://code.wireshark.org/review/10750 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-021.99.9 → 1.99.10.Gerald Combs2-2/+2
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-30stanag4607: add check for wtap max size.Dario Lombardo1-0/+10
Bug: 11472 Change-Id: Ic269046e697ac5e65301caf4ea5586098d030458 Reviewed-on: https://code.wireshark.org/review/10279 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>