aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
AgeCommit message (Collapse)AuthorFilesLines
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>
2015-08-29pcapng: handle NRB with optionsHadriel Kaplan1-2/+6
If a pcapng Name Resolution Block has options, they should not screw up the pcapng reader and cause it to fail to read the file. Bug: 11485 Change-Id: Ic27cba937b6d93a3d9ed92522ed6b39ae2daeb8f Reviewed-on: https://code.wireshark.org/review/10307 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-29pcapng: do not byte-swap NRB IPv4 addressHadriel Kaplan1-2/+2
Per the spec, it's always encoded in network order (4 separate bytes), and thus should not be swapped on read. Bug: 11484 Change-Id: I6a650896b324f42bfd2e05759c84e87ace733372 Reviewed-on: https://code.wireshark.org/review/10304 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-29pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0Hadriel Kaplan1-2/+3
An IDB snaplen of 0 means no limit, so a Simple Packet Block's capture length should be the same as its encoded packet length in such a case. Bug: 11483 Change-Id: I8856d6c6a669a0048ea64b3adbd23c37a598431d Reviewed-on: https://code.wireshark.org/review/10303 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-28Block sizes are unsigned 32-bit quantities; don't stuff them into an int.Guy Harris2-2/+2
*Especially* don't stuff the amount of remaining data in a block into an int that will then be passed to file_skip() as an amount to skip ahead, as a Really Large Value will turn into a negative value and produce various forms of bizarre and tricky-to-debug behavior. Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17 Reviewed-on: https://code.wireshark.org/review/10299 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-28Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file.Guy Harris1-18/+57
Don't treat an EOF at the beginning of a frame as an error. Treat I/O errors as hard errors; treat short reads as an indication that the file isn't an MPEG-2 Transport Stream file. Treat the PCR for a given PID not going forward as an indication that the file isn't an MPEG-2 Transport Stream file. Bug: 11471 Change-Id: I42b5887049423f8265db9d121d7b5bd388e5b244 Reviewed-on: https://code.wireshark.org/review/10286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-27Support BER files bigger than 256kBStig Bjørlykke1-5/+5
Also support APPLICATION as starting tag. Change-Id: Id85b08e2594969c98c530532a32268b01d50965e Reviewed-on: https://code.wireshark.org/review/10233 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-25Point to GitHub for the pcapng specification.Guy Harris1-3/+1
Change-Id: I33faa41e8b0f36ee49d29fe391feafd94d0a7e80 Reviewed-on: https://code.wireshark.org/review/10245 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-24Add some symbols to wtap.h so that we can correctly support 802.11ad.Richard Sharpe1-1/+27
Currently there are a lot of local hacks in the 802.11ad support and better support can be provided. Also add a structure to track 802.11ad (DMG) specific features in the phdr structure as suggested by Guy Harris. Also, respond to some suggestions by Guy Harris. Change-Id: I8459e3986a134a08ee2e31f0158b8aa5c9b91d86 Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/10204 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-21Fix memory leaks of dumper SHB and IDB infosHadriel Kaplan5-30/+120
Change-Id: I6b81d3e853d503c6a81f9793957b48ab34c6808c Reviewed-on: https://code.wireshark.org/review/10156 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-20pcapng: Fixed copying if_filter_bpf_bytesStig Bjørlykke1-1/+1
Bug: 11455 Change-Id: Ic99ff1bcd7dad65b3ade5a9f46ce0f64573cb059 Reviewed-on: https://code.wireshark.org/review/10147 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-20Remove unused struct member from wtapHadriel Kaplan1-1/+0
The 'number_of_interfaces' member of struct wtap is not used - nor is it needed since the interface_data is a GArray with its own 'len' member. Change-Id: Id0fb25248dea4bea9fc88a8ea35c09ba55029d89 Reviewed-on: https://code.wireshark.org/review/10138 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-19Pcap: wtap does not set interface timestamp precision when reading pcapHadriel Kaplan2-1/+3
Like bug 11447, when wiretap reads a legacy PCAP file it needs to set the interface description's tsprecision member. And like bug 11447, I'm wondering why we have the field to begin with. But I'm fixing this so that the Windows buildbots can get going again. Change-Id: I71d0fe2e999ee7d11f1f5cc424681a99e17b1b1b Reviewed-on: https://code.wireshark.org/review/10139 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Add more debug infor for windows buildbot test suite failureHadriel Kaplan1-0/+27
Down the rabbit hole we go... Change-Id: I8371b95b85128209b56960eb6e54648a6babbb84 Reviewed-on: https://code.wireshark.org/review/10137 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Try to debug merge test suite failure on windows buildbotHadriel Kaplan1-0/+30
This change will be undone once the problem is found. Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1 Reviewed-on: https://code.wireshark.org/review/10136 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19capinfos: add more info about file and interfacesHadriel Kaplan2-14/+118
Add more information about the capture file, and about the interface descriptions in it. Also remove long-unused g_options code. Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543 Reviewed-on: https://code.wireshark.org/review/10073 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan4-9/+840
Refactor the file merging code by removing the duplicate logic from mergecap.c and file.c's cf_merge_files(), into a new merge_files() function in merge.c. Also the following user-visible changes: * Removed the '-T' encap type option from mergecap, as it's illogical for mergecap and would complicate common merge code. * Input files with IDBs of different name, speed, tsprecision, etc., will produce an output PCAPNG file with separate IDBs, even if their encap types are the same. * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged. * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP. Bug: 8795 Bug: 7381 Change-Id: Icc30d217e093d6f40114422204afd2e332834f71 Reviewed-on: https://code.wireshark.org/review/10058 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18File-format: Add PCAP and PCAPNG dissectorsMichal Labedzki1-3/+17
They have educational values and can be used to debugging some issues. Now Wireshark can open three files (BTSNOOP, PCAP, PCAPNG) in two modes: Capture (Traditional) and File-Format. Change-Id: I833b2464d11864f170923dc989a1925d3d217943 Reviewed-on: https://code.wireshark.org/review/10089 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Pcapng: clean up Section Header Block handlingHadriel Kaplan2-19/+98
Change-Id: I8516d0c561ed0b63e49a3594027c9c15bb789258 Reviewed-on: https://code.wireshark.org/review/9726 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-17Pcapng: set interface description's tsprecision when reading fileHadriel Kaplan1-0/+1
Bug: 11447 Change-Id: I5fe14616ed6e86e0bfe02c58cc9fb31e43bc23ef Reviewed-on: https://code.wireshark.org/review/10071 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-16Run abicheck commands at compile time.Gerald Combs1-2/+5
The CMake dumpbabi targets collectively copy over 800 files. Do that when when we build the actual targets instead of at configure time. Hopefully this will speed up initial CMake runs. Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38 Reviewed-on: https://code.wireshark.org/review/10052 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-14Ident the merge.c/h files by 4 spacesHadriel Kaplan2-153/+153
Using 2 spaces for indent is way past its prime. Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c Reviewed-on: https://code.wireshark.org/review/10032 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-12Some further questions, asked in comments.Guy Harris1-5/+9
Change-Id: I41c7918b7396934c651fb957d3b61db0c7a19527 Reviewed-on: https://code.wireshark.org/review/9990 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-12Clean up the file header description.Guy Harris1-8/+5
Change-Id: I4928f99cdc2b8fc2a3aef648b613ce0b93ed3563 Reviewed-on: https://code.wireshark.org/review/9989 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-12Update comments.Guy Harris1-4/+4
Change-Id: I4b0b4bb31901208e09a535ef922e134116309531 Reviewed-on: https://code.wireshark.org/review/9988 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-12It looks as if the origin of the time stamps is the UN*X epoch.Guy Harris1-15/+0
If we assume that, the time stamps of the sample captures on the Colasoft site are in the range 2000-2014, and the HTTP time stamps in the HTTP capture from there are close to the packet time stamps. Change-Id: Id0e29c03dc8ada40f1040b95f169b4f3a8954a0f Reviewed-on: https://code.wireshark.org/review/9986 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-11Sort dump_open_table_base[] in the right order.Guy Harris1-5/+5
As the comment says, "Entries must be sorted by WTAP_FILE_TYPE_SUBTYPE_xxx values in ascending order." If they're not, the file type to file type string routines don't give the right answer. Change-Id: I06afe7bb98cb36c54ddc831113bb632598ab2eb0 Reviewed-on: https://code.wireshark.org/review/9975 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-10editcap: fix -T <encapsulation type> option when output format is pcapngPascal Quantin1-3/+15
Right now the output encapsulation type is ignored if the output (default) format is set to pcapng. Change-Id: Ibffaaed5979bf63ed4e3fa3b1f859a82b401d80b Reviewed-on: https://code.wireshark.org/review/9911 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-09[wiretap/nettrace_3gpp_32_423] Add editor modelinesBill Meier1-0/+13
Change-Id: Ie2b9da2b3a08d18fc913a00cf076aa881a583552 Reviewed-on: https://code.wireshark.org/review/9949 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-07Avoid (unlikely) NRB record size overflows.Guy Harris1-9/+42
If a host name is *so* long that an entry for it won't fit in a 65535-byte Name Resolution Block record, ignore the entry for that host. Use more appropriate data types (guint32 for sizes that are 32-bit unsigned integers, guint16 for the host name length as it'd better fit in 16 bits). Clean up some comments. Remove a _U_ that's applied to a variable that *is* used. Change-Id: I153d5aa885105149c62a5e5d2b78b54cf6ed7b4e Reviewed-on: https://code.wireshark.org/review/9917 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-06Fix pcapng.c:3788: warning: implicit conversion shortens 64-bit value into a ↵AndersBroman1-1/+1
32-bit value Change-Id: Ie796cee755470bea0416b46ff8ff6a94cd8d93d3 Reviewed-on: https://code.wireshark.org/review/9896 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-06Pcapng: support Name Resolution Block optionsHadriel Kaplan7-135/+367
Make pcapng decode options in an NRB during read, and store the comment option, and write it back out as well. Also make it handle plugin handlers for unknown options in received NRB(s). Change-Id: I81863ef8d85cb1c8b5ba6673ba0e562efe77714f Reviewed-on: https://code.wireshark.org/review/9723 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-04Rename nettrace3gpp324423 to 3gpp32423Luke Mewburn1-1/+1
Use "3gpp32423" instead of "nettrace3gpp324423": - There were too many "4"s in the previous name ("324423" vs "32423"). - "nettrace" isn't an official name, per 3GPP TS 32 423 - It's shorter. Change-Id: Ic981d0351a3014fb79702955ebef7b13f6ce4a2e Reviewed-on: https://code.wireshark.org/review/9863 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-27nettrace3gpp324423: fix name consistencyLuke Mewburn2-4/+4
Improve consistency when referring to 3GPP TS 32.423: - The standard name is "3GPP TS 32.423" (with "TS", and "." separator). - Fix typo in number series ("32" not "34"). - The standard refers to "Trace", not "Nettrace". Change-Id: If9994b9c6de69b6e1bdfc6679fbaabe698971949 Reviewed-on: https://code.wireshark.org/review/9795 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-07-241.99.8 → 1.99.9.Gerald Combs2-2/+2
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-18Cleanup pcapng.c fileHadriel Kaplan1-97/+168
Cleanup some pcapng.c comments, defines, etc. Change-Id: Id854c6ef033eb8cb99175ba62aa8733e21433463 Reviewed-on: https://code.wireshark.org/review/9698 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07Initialize the 11b presence flag to 0.Guy Harris1-0/+1
There were some cases where it wasn't getting initialized when we set the PHY to 11b, in addition to the one Pascal found. Change-Id: I127737cd29dc53c96342364de5cb722b135f23f3 Reviewed-on: https://code.wireshark.org/review/9540 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07Use the NSS provided by the Ixia Veriwave hardware.Guy Harris1-2/+3
It doesn't appear to provide the FEC type, although radiotap does, so add a flag to indicate whether we have that. Change-Id: I298d79bc6b640ee2408c3d70075c32bf331a210c Reviewed-on: https://code.wireshark.org/review/9533 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06Clean up a bunch of stuff.Guy Harris1-99/+157
The command byte values aren't FPGA-specific - if they were, the code wouldn't have worked. Provide #defines for the main ones and check for them, and use that to determine whether the packet is transmitted or received. Add a bunch of #defines, shuffle some defines to cluster related ones together and separate unrelated ones, get rid of duplicate #defines (where different FPGAs use the same value). Fix some typoes. Change-Id: Ic8adc589d7c36a4a91a81858de40c904743dd067 Reviewed-on: https://code.wireshark.org/review/9529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06Update a comment.Guy Harris1-1/+4
Change-Id: I71e66a8f6faf3b213ab6db2856a36c1d31897166 Reviewed-on: https://code.wireshark.org/review/9527 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06Add some comments.Guy Harris1-0/+5
OK, where's NSS for the presumably-one-and-only user hiding for 11ac? Change-Id: I53eb216c5d209dc5bb46c1d0aca7f8a200161e3e Reviewed-on: https://code.wireshark.org/review/9512 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 01:40:12 +0000