aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-21configure: Check for minimum required GNU Make versionJoão Valverde3-0/+285
Change-Id: Ifb76a8426f3233e277a129e1d4e4a5ac0c832503 Reviewed-on: https://code.wireshark.org/review/24518 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-21Qt: Remove merge issue from Drag DropRoland Knall1-4/+0
Remove a remissent merge artefact Change-Id: I4c53d4b2adef124712091c40efccc1cad3db3301 Reviewed-on: https://code.wireshark.org/review/24521 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-21From looking at the OpenAFS source, the RX abort code is signed.Guy Harris1-1/+1
Change-Id: I79f578ee5fe4e63d5bb6adc9d90f24fac5f82b02 Reviewed-on: https://code.wireshark.org/review/24520 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-21mqtt: Add sanity checks for MQTT v5.0 Reason CodesStig Bjørlykke1-34/+53
Check if mqtt_msg_type is within boundaries of hf_rcode and gives a valid hfindex. Change-Id: Ib8ea710d7cd6c61ec493e218d64b50f6faa720c4 Reviewed-on: https://code.wireshark.org/review/24509 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-21Qt: Main Welcome hover sparkline color fix.Stig Bjørlykke1-0/+4
Use the default text color for sparkline in hovered items. This makes the selected item look the same as non-selected items when hovering. This is related to g1ed38dc2. Change-Id: I96ba349067cf7d398d11425cfa5ada5e5b4d587c Reviewed-on: https://code.wireshark.org/review/24516 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-21Qt: Remove an unused variable.Gerald Combs1-1/+0
Change-Id: Iba1abe66cfa4d39e95cf85b9fc866789151127f9 Reviewed-on: https://code.wireshark.org/review/24517 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-20Qt: Move the MIME init thread to WiresharkApplication.Gerald Combs2-23/+27
The Qt 4.8 "Starting a Thread" document at http://doc.qt.io/qt-4.8/threads-starting.html says, "Note that you must create the QApplication (or QCoreApplication) object before you can create a QThread." It looks like this changed some time around Qt 5.5 or 5.6, e.g. https://codereview.qt-project.org/#/c/120793/, but just to be safe move the MIME database initialization thread to WiresharkApplication. We start reading the database later than I'd like, but it's still early enough to make a difference here. QMimeDatabase was added in Qt 5.0. Add version checks. Change-Id: Ic80ebb8692e93b1e4aea7a8670f4fcf45e385b29 Reviewed-on: https://code.wireshark.org/review/24512 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-20Rename UseMakeDissectorReg.cmakeJoão Valverde15-23/+20
Change-Id: I2723e7f0309dbe21f23b65818fbea3a7eadf13d4 Reviewed-on: https://code.wireshark.org/review/24514 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20OpenAFS always puts out 3 bytes of padding in an ack packet.Guy Harris1-1/+2
Change-Id: Ia956ac7df43c307a8d5adac5c78c894017f7f7ec Reviewed-on: https://code.wireshark.org/review/24513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-20Qt: Fix various smalles issues with drag-dropRoland Knall4-10/+35
Cleanup adding a filter and implement some sanity checks in the drop code Change-Id: I1778be16abdea3f93ed11fc610962c4a23f10a2f Reviewed-on: https://code.wireshark.org/review/24505 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-20Revert "make-dissectors: Be more resilient with whitespace"João Valverde4-7/+7
This reverts commit ed9d08552049d061a8951f2dee5bc7b73173c14d. It's causing a segfault on our Windows buildbots. Change-Id: I3cdd31955bdec7be3ad91cff4af8dc3efdc9e8b7 Reviewed-on: https://code.wireshark.org/review/24510 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20dissector/mqtt: Add the MQTT v5.0 Reason CodesFlavio Santes1-9/+287
RCs and their text descriptions are added by this patch. We use defines for the values and descriptions because they are shared by many Control Packets, so in this patch we parameterize them to avoid writing the descriptions multiple times. Change-Id: I0afc2cbe69e8cfffa4f65df0b72f09045bb9b3a1 Signed-off-by: Flavio Santes <flavio.santes@1byt3.com> Reviewed-on: https://code.wireshark.org/review/24263 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-20make-dissectors: Be more resilient with whitespaceJoão Valverde4-7/+7
Preemptively try to be more resilient for files with spaces in them (for Windows). Use newlines to separate file list. Clean up duplicate PIDL file entries. Change-Id: Ib506cca785836e05e4665e911de0d45ab4da1165 Reviewed-on: https://code.wireshark.org/review/24507 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20ieee1905: fix typo bandwith => bandwidthAlexis La Goutte1-1/+1
found by lintian Change-Id: Id9b113eddae5bcbcfb0c9b3d1dfb6008aa3d7269 Reviewed-on: https://code.wireshark.org/review/24502 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-11-20ieee1905: fix typo addres => addressAlexis La Goutte1-1/+1
found by lintian Change-Id: Idb5ee47b709e10d53192ac966b638e160cec60ea Reviewed-on: https://code.wireshark.org/review/24501 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-11-20Rewrite make-dissector-reg.py in CJoão Valverde14-1741/+1767
The output compares equal to make-dissector-reg.py and the regex should be more robust (multiline, complete start of function definition). The primary motivation is to clean up the python script. This small binary results in much cleaner code. The python script is used only to generate plugin code, therefore it is renamed. Also in my casual measurements the C code is much faster (without cache) than the python script with the cache. Change-Id: Id4e8cac3c836d56775aba4819357a95ef19bcb85 Reviewed-on: https://code.wireshark.org/review/24497 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-20Remove unused dissector registration prototypes, fix typoJoão Valverde14-20/+1
Change-Id: Ide5d7f2241db4ac87ed516f91f0bcaca347bb546 Reviewed-on: https://code.wireshark.org/review/24496 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-20packet-tds.c: Correct encoding for hf_tds_colmetadata_maxbytesizeMichael Mann1-1/+1
It's just a FT_UINT16, not need for 2 encodings. Change-Id: I502a61a2ff2a1fd05f1efa48912119f98d10e636 Reviewed-on: https://code.wireshark.org/review/24498 Reviewed-by: Craig Jackson <cejackson51@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-20README.dissector: Add note to add 2 encodings for FT_UINT_BYTES in ↵Michael Mann1-0/+4
proto_tree_add_item Change-Id: I728091998c531c992aa1b741b03e653460a0e77f Reviewed-on: https://code.wireshark.org/review/24499 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-20file-elf: remove unuseful check (found by Clang 6).Dario Lombardo1-1/+1
error: comparison 'guint32' (aka 'unsigned int') <= 4294967295 is always true [-Werror,-Wtautological-constant-compare] Change-Id: Id1f6a0a01dd897d263f7133a0d95aaecfba31e14 Reviewed-on: https://code.wireshark.org/review/24495 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-19Fix (and chop) static build optionJoão Valverde22-278/+52
This sets the scope of the static build option to Wireshark support libraries only. Before the patch: Static plugins don't work with CMake and autotools. autotools static build is broken, and most likely will always be, as building Wireshark all-static is difficult and time-consuming. After the patch: For CMake Wireshark will be built with static or shared libraries and dynamic plugins. Everything just works. CMake apparently doesn't want you building static and shared libraries at the same time. For autotools Wireshark will be built with shared libraries by default. --disable-shared and --enable-static options work as usual. Dlopened plugins are not built if --disable-shared is given to configure (to disable shared libraries). This is a limitations imposed by libtool. Tested on Linux. This removes broken support for building plugins statically. Change-Id: Ib8e8176976f136eea93a2ce8f9857b6cf9bec64c Reviewed-on: https://code.wireshark.org/review/24241 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-19Qt: Fix Activation of menusRoland Knall1-0/+2
Fixes the bug, where submenu items are not properly activated Bug: 14232 Change-Id: I007010310dfa8a6c7eba3ba8cdf3eac74701b0ba Reviewed-on: https://code.wireshark.org/review/24493 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-19packet-h223.c: Ensure conversation data existsMichael Mann1-2/+4
There is more potential for conversation data than previous circuit data so ensure h223 conversation data exists in retrieved conversation. Bug: 14233 Change-Id: I7074b1c110d40b4727812d0ef4f5391b6d2c0c33 Reviewed-on: https://code.wireshark.org/review/24492 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-19CMake: Fix error from bab9abfb7d259e1daaf84776ed9d4d09e2469293Graham Bloice1-1/+0
Fix a cut and paste error Change-Id: I28fa3644d5b7969c8009f5722f270c8fa566dd34 Reviewed-on: https://code.wireshark.org/review/24491 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-19[Automatic update for 2017-11-19]Gerald Combs9-153/+224
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I52c4830ef81733156fa4ce0de65330c8aacd8932 Reviewed-on: https://code.wireshark.org/review/24487 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-19Move dissect_leb128 to file-elf.cMichael Mann7-113/+22
This allows for the removal of epan/dwarf.[ch] Functionality could probably be handled by an encoding (like dissect_uleb128), but for now keep it in file-elf.c as that's the only functionality currently using it. Change-Id: I84cf6af02abb3d53ea7d9b774e3313d77a1ff497 Reviewed-on: https://code.wireshark.org/review/24486 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-19dissect_uleb128 -> tvb_get_varint/proto_tree_add_item_ret_lengthMichael Mann6-68/+30
Also update ENC_VARINT_PROTOBUF documentation while we're at it Change-Id: I72e1f9175adc0c6a8bb03ceddba04ffd4844a12e Reviewed-on: https://code.wireshark.org/review/24485 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18CMake: Fix package requirements for building docsGraham Bloice1-19/+22
Make ASCIIDOC and XSLTPROC packages required if building any of the HTML, PDF or CHM guides. Don't attempt to build the release notes if ASCIIDOC isn't found. Change-Id: Id61653a635f91cbaffa32fb26ddbdbc568b74528 Reviewed-on: https://code.wireshark.org/review/24483 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18autotools: Library build products don't need explicit cleaningJoão Valverde32-130/+9
Change-Id: I5d68c05f2844d6c9ae486531b189dbf10bc09cff Reviewed-on: https://code.wireshark.org/review/24484 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18Fix indentationJoão Valverde3-22/+22
Change-Id: I558f23572dc36ba96fd1c2f904b1ac6b6c343297 Reviewed-on: https://code.wireshark.org/review/24482 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18ZigBee ZCL Device Management Cluster dissectorIvan Ermakov2-24/+325
Added Device Management cluster dissector: cluster, command names. Change-Id: I1ed9c53a09aed10584cd372630fbec5e661cacd8 Reviewed-on: https://code.wireshark.org/review/24449 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Boye Petersen <mbpflonidan@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18CMake: Clean up Windows buildGraham Bloice14-42/+70
Remove options that aren't supported on Windows Don't use pkgconfig on Windows Change-Id: I79718a1c43f56a9ec88f690490931b80b727dd68 Reviewed-on: https://code.wireshark.org/review/24481 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18The header is host-endian, not little-endian. Note that.Guy Harris1-8/+18
Change-Id: I7fc2874026430c3d7e8633c48ee0558ad69d5c9a Reviewed-on: https://code.wireshark.org/review/24480 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-18Reformat comment giving Kerberos 4 specification.Guy Harris1-7/+7
Change-Id: I06350d56aeedf0c0cb1c72f3597a093a6f97847c Reviewed-on: https://code.wireshark.org/review/24479 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-18URL for the document.Guy Harris1-0/+3
Change-Id: I9b381f923599f7b4750b21053cdfb3b1d72bce22 Reviewed-on: https://code.wireshark.org/review/24478 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-18Update .gitignoreJoão Valverde1-4/+2
Change-Id: Ia066511bc27618ee8e0a55e046a6d9437a4c3175 Reviewed-on: https://code.wireshark.org/review/24477 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18Begin cleanup of make-dissector-reg.pyJoão Valverde9-175/+255
Move registration code to a new register.c file so it is readable. Dissector load points are stored in a generated function pointer array instead. Simplify python script somewhat by not interleaving the plugin and dissector logic. Change-Id: I5ec21270f4e1550a5c911efa7f0dc4fc7fcb13a5 Reviewed-on: https://code.wireshark.org/review/24474 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18.mailmap: update (of November)Alexis La Goutte2-1/+2
Change-Id: Ia42fe05bbc250944441576a3b7894839f4fe6ed2 Reviewed-on: https://code.wireshark.org/review/24452 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18ieee1905: Fix the incorrect dissection of radio operation restrictionRichard Sharpe1-4/+11
The dissection was really wrong. Fixed now I have seen captures. Change-Id: I038fbf8786306fad9c65c87aa5d58c155113c442 Reviewed-on: https://code.wireshark.org/review/24476 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18Qt: Use QThreadPool instead of QThread.Gerald Combs1-4/+4
I'm not sure how many Qt worker threads we're going to create at startup, but using a thread pool is simple enough. Change-Id: I66c3e1e628f8c38c8e3322e0c01ee5fccda2a98e Reviewed-on: https://code.wireshark.org/review/24473 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18ieee80211: Complete fixed size fields for SAE authenticationCedric Izoard1-2/+200
SAE authentication (used for mesh-point) introduced new non IE fields (aka fixed size fields) that require explicit parsing. The tricky part is that some of those fields don't have a fixed size... - 'scalar' and 'finite field element' size depend of the group used. Retrieve size of all groups supported by wpa_supplicant. - 'anti-clogging token' size is not specified. Bug: 14222 Change-Id: Id0aa8790c55b21b2797ba131de9e46c32519e2cc Reviewed-on: https://code.wireshark.org/review/24446 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18Qt: Properly reset the byteviewRoland Knall4-1/+24
Reset the byteview on every load of a capture file, and on every start/reset of a capture Change-Id: I0edd30ffddc64484bc6f009d99dfc6fc1a3ceb59 Reviewed-on: https://code.wireshark.org/review/24468 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18IEEE 802.11: fix an infinite loopPascal Quantin1-1/+1
Presumably the element length is unsigned, otherwise it can be negative and reincrement tag length. Bug: 14231 Change-Id: I26d339aea7588a489b4252b67c212810029bff0e Reviewed-on: https://code.wireshark.org/review/24472 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-17Qt: Initialize QMimeDatabase in a worker thread.Gerald Combs3-11/+53
As part of its initialization, QMimeDatabase parses the freedesktop.org shared-mime-info database, which is a large-ish (2 - 4 MB) XML file. This takes about 85 - 90 ms here. We first access QMimeDatabase in our startup sequence when we load the normal and capture application icons. Create a worker thread that initializes QMimeDatabase as early as possible and load load the normal and capture icons as late as possible. Change-Id: I27e3d65d8ee1308a62d12d3ff7e1b95f82c2e75a Reviewed-on: https://code.wireshark.org/review/24471 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-17Qt: Fix selection of elementsRoland Knall2-9/+76
If two elements existed with the same filter expression, the first element got selected allways. This is much more secure, as it only takes the label into account. If the user by accident created two buttons with the same filter expression, but different label and wants to remove the second button, the first one no longer will be removed instead of the second one. Change-Id: I16130aa69cb853aedb9a5c9b0bbbb3eb64b467d1 Reviewed-on: https://code.wireshark.org/review/24399 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-17fp: Fix mac TVB for edch t1Darien Spencer1-2/+2
Using the '_caplen' function with length of -1 leads to a "truncated RLC" error. Change-Id: I5a5f650b244de1167ff7110558ad0559d0422103 Reviewed-on: https://code.wireshark.org/review/24462 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-173GPP NAS: fix dissection of PCO MSISDN container IDPascal Quantin1-3/+2
3GPP 24.008 is not very explicit regarding the encoding, but after rereading 3GPP 23.003 and 3GPP 29.272, it is most likely the E.164 number in TBCD encoding (so without TON/NPI byte). Change-Id: Iae58ccc2919d28cb802015205b3b5fb97a1c4abe Reviewed-on: https://code.wireshark.org/review/24463 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-17WSDG: Improve VS2015 chocolatey installGraham Bloice2-4/+95
Created an AdminDeployment.xml file for use with the chocolatey package for VS2015 Community Edition and updated the WSDG to include it. Bug: 14147 Change-Id: Id2a701067bf38874cf0bf534cca55dba9cfd30d4 Reviewed-on: https://code.wireshark.org/review/24464 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-17[Juniper ST] Dissect the "known" parts of the Juniper header.AndersBroman1-9/+83
Ping Bug: 14195 Change-Id: I7ab05857c054a0d914db9373d182008215d67367 Reviewed-on: https://code.wireshark.org/review/24461 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17rrc: fixed incorrect constantsDarien Spencer2-4/+4
The macinf->content field should be compared to MAC_CONTENT_* and not MAC_* Change-Id: I0dee7855938095c5d1c53f4db13003b90cf7ba91 Reviewed-on: https://code.wireshark.org/review/24460 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>