aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-22Add IANA arc and first entry (MUDURL) for lldp.Eliot Lear1-0/+53
PCAP file: https://github.com/the-tcpdump-group/tcpdump/blob/master/tests/lldp_mudurl.pcap Change-Id: If1f4946f8a8ade44dbab33a877bf7449f9ea2a6f Reviewed-on: https://code.wireshark.org/review/23982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22NFSv4: Fix for duplicate StateId hashesCal Turney1-57/+51
In WS v11.4.0 released In May, 2014, "tvb_get_string_enc()" was added to dissect_nfs4_stateid() which treats the numeric stateid as a string and converted it to UTF-8. Invalid UTF-8 chars were replaced with the "REPLACEMENT CHARACTER" which are actually three characters: 0xef, 0xbf, and 0xbd (0xefbfbd). A hash was made of the first 16 chars of the returned array although the string was often much larger due to 1 to 16 invalid chars. This has often caused duplicate hashes for different files and locks. That routine has been removed. In addition, the size of the hash has been reduced from 32 to 16 bits which affords a 99.9984% chance of unique hashes. Finally, hf_nfs4_seqid, used for the stateid hash seqid has been changed to hf_nfs4_seqid_stateid because in CLOSE requests the seqid has nothing to do with the stateid seqid. Change-Id: I3bf7caefc3341887a4c9137500dfeac0115af8cf Reviewed-on: https://code.wireshark.org/review/23966 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22autotools: Build and install user guideJoão Valverde3-7/+54
Installs the WSUG to $docdir, unless the --disable-guides option is given to the configure script. This will open the Help->Contents menu action using the locally installed guide. It will also point to the correct version for this Wireshark release. The wireshark.org link only provides the guide for the master branch. Change-Id: I9dd539c737cb3777dc1351707b9e45a3a6764aaa Reviewed-on: https://code.wireshark.org/review/23906 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22[Automatic update for 2017-10-22]Gerald Combs9-4/+101
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I2bc1e987630e05d2942e9405ab45e4c2f7452263 Reviewed-on: https://code.wireshark.org/review/24013 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-21Add button in Qt UAT dialog/frame to remove all UAT entries at once.Michael Mann12-0/+92
Change-Id: If5a172cd69beeb0b9a22eb7f6b9e7cb25f350b49 Reviewed-on: https://code.wireshark.org/review/23968 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-21Eliminate #include <epan/oui.h> from dissectors that don't need it.Michael Mann11-11/+1
Correct include patch for packet-lldp.c Change-Id: I5e2a267943ccd39616ef323848104fdba23c8f38 Reviewed-on: https://code.wireshark.org/review/24009 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-21Diameter 3GPP: call XML dissector for Civic-Address AVP payloadPascal Quantin1-1/+23
Bug: 14142 Change-Id: Iccf5c375087cabd08aa551af8e6586e18684252a Reviewed-on: https://code.wireshark.org/review/24008 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-21Warn the developer if we're building with GTK+.Gerald Combs3-6/+14
Move The Slowest Migration In The History Of Ever a little further along. Change-Id: Ib8b49708e7036dd412a7ffc8660ded9f681374c0 Reviewed-on: https://code.wireshark.org/review/24006 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-10-21Remove oui_vals value_string and epan/oui.cMichael Mann19-156/+38
oui.c is a very small subset of what comes from http://standards.ieee.org/regauth/oui/oui.txt, so use the "full" OUI list (and more) out of the manuf file and convert hf_ fields to just use BASE_OUI. Change-Id: Ic0c2ff618d8a6212f498e3b7475e0a7856c22b5b Reviewed-on: https://code.wireshark.org/review/24007 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-20nfapi: fix 'nfapi.p7_message_header.m_segment_sequence' exists multiple ↵Alexis La Goutte1-2/+2
times with NOT compatible types: FT_UINT8 and FT_BOOLEAN Change-Id: I221315e6dc28835ce976caf167962847d536edc6 Reviewed-on: https://code.wireshark.org/review/24001 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-20Qt: fix crash after loading SRT dialogPeter Wu2-3/+13
TapParameterDialog::on_applyFilterButton_clicked first calls fillTree to populate the table and endRetapPackets to add the results to GUI. The table data must remain valid until closing the dialog since the user can still interact with the GUI. Change-Id: Ie3105be78d39c562af52f2b49081552063afcada Ping-Bug: 14141 Reviewed-on: https://code.wireshark.org/review/23994 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-10-20file_util.c: do not leak service handlePascal Quantin2-5/+4
Follow-up of gd64c30052 Change-Id: I620b3fb44fe3090120f2d29809961623e00d55a4 Reviewed-on: https://code.wireshark.org/review/23999 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-20autotools: Improve SUBDIRS usageJoão Valverde5-60/+21
Change-Id: Ia40970c37f4b60f8b820c334c3c728a0ac33f228 Reviewed-on: https://code.wireshark.org/review/23996 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-20autotools: Sort out how we handle plugin.cJoão Valverde14-41/+82
Change-Id: Ie9570a63a1479021753807f76dd5e98fbbec7b86 Reviewed-on: https://code.wireshark.org/review/23995 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-20Do not add Npcap path if npf.sys service is foundPascal Quantin1-5/+18
Otherwise you can end with 2 Packet.dll (the one from WinPcap and the one from Npcap) being loaded at the same time, which can create incompatibilities. Bug: 14134 Change-Id: Ia06066fd54b60296e55dbfce6c6f2ddd99367479 Reviewed-on: https://code.wireshark.org/review/23969 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-20cmake: fix Qt build with CMake 3.0.0 and 3.0.1Peter Wu1-2/+2
AUTOUIC fails to generate some ui_*.h files because of a bug that was fixed in CMake 3.0.2: https://cmake.org/Bug/view.php?id=14981 Change-Id: I964d991c7edefcea55ae43b0768a7fd3503f94a9 Fixes: v2.5.0rc0-1366-gdfa893b1cf ("cmake: set CMAKE_AUTOUIC and CMAKE_AUTORCC to avoid CMP0071 warning") Reviewed-on: https://code.wireshark.org/review/23993 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-19LCSAP: fix retrieval of XML dissector handlePascal Quantin3-20/+14
Bug: 14131 Change-Id: Ie77ade9d54f9d0a5fa0183cedc154e6595a489cf Reviewed-on: https://code.wireshark.org/review/23991 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-19Suggest using CMake rather than autotools.Guy Harris1-22/+36
The configure script 1) can't find newer versions of Qt, thanks to the Qt developers not supplying any .pc files and 2) doesn't look for useful frameworks, so it's not the best way to build Wireshark on macOS any more. Discuss CMake instead. Change-Id: I28befffab010221e2e17e37f5beaf8b732974190 Reviewed-on: https://code.wireshark.org/review/23990 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-19TCP: Add a documentation note.Gerald Combs1-0/+2
Note that changes to tcp_analyze_sequence_number should be synced with docbook/wsug_src/WSUG_chapter_advanced.asciidoc#ChAdvTCPAnalysis. Change-Id: Iac72d2cf808d84c17fa5f12012675e0af1895cd1 Reviewed-on: https://code.wireshark.org/review/23989 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-19Add more notes about Asciidoctor.Gerald Combs1-9/+18
Change-Id: I7fd12b9189448a637d1bebac6687168f017d8d8d Reviewed-on: https://code.wireshark.org/review/23987 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-19Remove duplicate values in pfcp_pr_time_unit_valsMichael Mann1-1/+1
** (process:8955): WARNING **: Field 'Uplink Time Unit' (pfcp.ul_time_unit) has a conflicting entry in its value_string: 3 is at indices 3 (Day) and 4 (Week)) ** (process:8955): WARNING **: Field 'Downlink Time Unit' (pfcp.dl_time_unit) has a conflicting entry in its value_string: 3 is at indices 3 (Day) and 4 (Week)) Change-Id: I870af4a53721e0ffe0f9f778c8287e090f2b2929 Reviewed-on: https://code.wireshark.org/review/23985 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-19Correct duplicate values for csi_rs_class_valsMichael Mann1-1/+1
** (process:8955): WARNING **: Field 'Class' (nfapi.csi.rs.class) has a conflicting entry in its value_string: 1 is at indices 1 (Class A) and 2 (Class B)) Change-Id: I6063fd5fe0094efe776a3a04556c633a4e495a9a Reviewed-on: https://code.wireshark.org/review/23986 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-19FP Mux: disable heuristic dissector by defaultPascal Quantin1-1/+1
Without any specific pattern, it is too weak and catch a lot of unrelated UDP packets. Change-Id: Iacac5ae65de59da1d46a06184517834edd91eb18 Reviewed-on: https://code.wireshark.org/review/23984 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-10-19Update enumerations for SISO-REF-010 v22Graham Shanks1-99/+884
Change-Id: Icb326dac7cfe0478df3d892df279ad0f241c7ba6 Reviewed-on: https://code.wireshark.org/review/23981 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-19fpmux: Fix error string and commentNikolai Ipatyev1-2/+2
Change-Id: If4620a43d706f7067a018eb964e4db3733d65210 Reviewed-on: https://code.wireshark.org/review/23980 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-18FP Mux: reject empty tvbPascal Quantin1-1/+4
Bug: 14140 Change-Id: I43c635e97f33c190e2a4a7f42e58f4274bd03f2b Reviewed-on: https://code.wireshark.org/review/23978 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-18FP Mux: create conversation if it does not existPascal Quantin1-3/+6
Change-Id: Ib26145c30f6f3ba20e26d52f1e4b90825029809d Ping-Bug: 14140 Reviewed-on: https://code.wireshark.org/review/23977 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-18FP Mux: do not register UDP port 44955 by defaultPascal Quantin1-1/+1
It is not registered by IANA Change-Id: Iff462ee0a2366ae72681b34e4e7e107c8c479822 Reviewed-on: https://code.wireshark.org/review/23976 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-18FP Mux: fix a typo in preferencesPascal Quantin1-1/+1
Change-Id: I19ba1bb223a3356b4048448f0bb908f23e7364c0 Reviewed-on: https://code.wireshark.org/review/23975 Reviewed-by: Nikolai Ipatyev <wallprime@yandex.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-18Update packet-kerberos.cJoão Valverde1-3/+3
Change-Id: I86387e4f8ebf7f7cd2f3b9e01e9b4cfe91a7357e Reviewed-on: https://code.wireshark.org/review/23974 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18Refresh wsutil/Makefile.amJoão Valverde1-29/+24
Change-Id: I6a70a2dc45257826c930f57a59cdd9bf5b4c3c73 Reviewed-on: https://code.wireshark.org/review/23973 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18autotools: Remove abi-compliance-checker codeJoão Valverde5-101/+0
It's been broken for over a year, needs to be modernized and as implemented it's a maintenance nightmare. Get rid of it. Ping-Bug: 13036 Change-Id: I34a6e4c28b6d3b96dd6550dd21e9cbeaf050d58f Reviewed-on: https://code.wireshark.org/review/23967 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18DOCSIS: Fixed bug where OCD TLVs are nestedBruno Verstuyft1-12/+12
Change-Id: I3b6a7c6dabfe017eb6c223ab2491e0a3cda8c56c Reviewed-on: https://code.wireshark.org/review/23970 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-18autotools: Sort out how we handle register.cJoão Valverde1-35/+14
register.c is a built source. It should not be included in the distribution and should be removed with the distclean target. Remove XXX comment suggesting adding the cache to the distribution; let's not do that. Change-Id: I20f9467a93e2b5ad3ee56a5fa83381095b1d28c6 Reviewed-on: https://code.wireshark.org/review/23971 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18cmake: set CMAKE_AUTOUIC and CMAKE_AUTORCC to avoid CMP0071 warningPeter Wu1-11/+27
CMake 3.10 adds CMP0071 which results in warnings about applying AUTOMOC and AUTOUIC on generated files. It somehow tries to do this for files generated by QT5_ADD_RESOURCES and QT5_WRAP_UI. As a workaround, just convert from the legacy macros to the new method. Autogenerated ui_*.h and moc_*.h will now also be shown in the "External Dependencies" tab in Visual Studio Change-Id: I36df2212bbf0f938fcd4560000031b6137db93ca Reviewed-on: https://code.wireshark.org/review/23917 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-10-18Add FP-Mux dissectorNikolai Ipatyev5-0/+398
Change-Id: I58a9a0cf0364c8ce5f173ed28c054fd05738f690 Reviewed-on: https://code.wireshark.org/review/23868 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>
2017-10-18SMB2: accept and save empty filenames on CREATE requestsAurelien Aptel1-1/+1
[MS-SMB2] 2.2.13 CREATE Request, NameOffset: > A zero length file name indicates a request to open the root of the share. This also ends up enabling the parsing of missing fields (InputBufferLength, AdditionalInformation, Flags) in QUERY_INFO requests, which required a non-NULL saved->extra_info. Change-Id: I9af3933cc6bb93247bad23c7dd82a52787595f69 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/23959 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17Added default for every switch statementBruno Verstuyft1-3/+126
Change-Id: Ie74dec4d854f65835a4e7e68dac609290a84d791 Reviewed-on: https://code.wireshark.org/review/23957 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17Protobuf: Fix format errorUli Heilmeier1-1/+1
Fixes error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'guint64' Change-Id: I431ab2e1920b7856ff686bd79bc881dee494706f Reviewed-on: https://code.wireshark.org/review/23965 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17autotools: Smaller cleanupsJoão Valverde1-66/+17
ps.c is already correctly cleaned in epan/Makefile.am. make distclean also works well with tarballs so I think the other comment can also be removed. ldconfig may be needed for tshark. The installation step seems to do all the right things so just drop the rather verbose description of the XDG Base Directory Spec. Add the MKDIR_P and INSTALL variables for consistency and to address some of the portability concerns raised in the comment (INSTALL usage still needs to follow a standard form common for portable automake). Remove redundant plugin_ldadd else clause. Change-Id: Ic2cb04556f28622a8979b057e0abbe64256ed3c9 Reviewed-on: https://code.wireshark.org/review/23964 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17ZCL SE Octet Strings: Dissect zcl se octet strings as length and dataMartin Boye Petersen1-43/+95
Implemented a function to dissect zcl octet strings in a similar way as attributes that have a data type of zcl octet string. Currently the function is used for event data (publish event and publish event log), as well as top up code (consumer top up and publish top up log). Bug: 14138 Change-Id: Idae6240312bedeaa12f10777e1009b110d5f834d Reviewed-on: https://code.wireshark.org/review/23881 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17Suggest CMake if Qt not found on Darwin; say "not installed for development".Guy Harris1-19/+107
Hopefully this will allow more people to figure out how to compile Wireshark without 1) e-mailing wireshark-dev, 2) asking in ask.wireshark.com, or 3) filing a bug, if the underlying problem is that 1) they didn't install the appropriate xyzzy-dev package for something Wireshark uses or 2) they're trying to use autotools on macOS and they've installed a recent, and not-very-pkg-config-friendly, version of Qt. Change-Id: I69236558f207ed0bf81d2acdc0230630f6069dec Reviewed-on: https://code.wireshark.org/review/23963 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-17autotools: remove macOS Frameworks supportJoão Valverde4-70/+6
This treats macOS/OSX like any other Unix-like build target (Darwin), thus removing autotools support for macOS-specific build options. Anyone needing that is advised to use the fully-supported-on-macOS CMake build. Change-Id: I88e2fa7a8eea42241efcf84223ac2362d38b1e12 Reviewed-on: https://code.wireshark.org/review/23951 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17autotools: Remove setuid-root.plJoão Valverde3-93/+0
It seems to be some sort of development helper, and since CMake doesn't use it presumably it is not useful anymore. Change-Id: I23e4ab24199f21310ebd09064c3ae53e48673e4d Reviewed-on: https://code.wireshark.org/review/23945 Petri-Dish: Gerald Combs <gerald@wireshark.org> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17dissector/ptp: fix typo - should be ptp.as.sig.tlv.flagsAdam Wujek1-1/+1
Change-Id: I31be23516d7fb169daa827b505bcde04426e84dc Signed-off-by: Adam Wujek <adam.wujek@cern.ch> Reviewed-on: https://code.wireshark.org/review/23961 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17SMB2: rename QUERY_INFO buffer input fields and parse Reserved fieldAurelien Aptel1-10/+13
Since the packet has an output and input buffer, having a field just called "size" or "offset" was confusing. Change-Id: Iadb45fa50e6ea6ffaa7c3b041704837641f64ab6 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/23958 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17autotools: Fix bogus checkAPI targetsJoão Valverde2-3/+3
Change-Id: Ifc8884fc0f0e4548db79a68e3fbc35c7e5fb9be9 Reviewed-on: https://code.wireshark.org/review/23947 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17[Bluetooth] Prepare for adding a BT Mesh dissector.AndersBroman1-19/+48
Change-Id: I79140a15c93e7bfada5036fd3fbb1bb94d99a655 Reviewed-on: https://code.wireshark.org/review/23940 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>
2017-10-17CMake: increase minimum required version to 2.8.11Peter Wu1-1/+1
Due to the use of target_include_directories (when sshdump or ciscodump are enabled), the minimum required version is 2.8.11. The supported OS versions do not change, but Debian Wheezy users must enable backports. Change-Id: I883c81e5e81425ca1869f442686faf1e66a638f3 Reviewed-on: https://code.wireshark.org/review/23955 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-17CMake: fix Qt build with CMake 2.8.12 and beforePeter Wu1-28/+15
The Qt5Widgets_EXECUTABLE_COMPILE_FLAGS option is only needed for CMake before 2.8.12 and before as documented by Qt, so this ugly piece can be restricted to older CMake versions. That also helps avoiding exposing the Qt 5.5.0 in Windows since that requires a much newer CMake version. For those older versions, use COMPILE_FLAGS such that -fPIC is added after -fPIE (the latter is enabled by CMAKE_POSITION_INDEPENDENT_CODE). Tested with CMake 2.8.11, 2.8.12.2, 3.0.2 and 3.9.4 using Qt 5.9.2 and GCC 7.2.0. Change-Id: I4962f7f5a087ee5b8c79905dd3b2cce17c731bdf Fixes: v2.1.0rc0-566-gd66d379ac8 ("Try retroactively applying the Qt folks' fix for QTBUG-47942.") Reviewed-on: https://code.wireshark.org/review/23954 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 17:48:57 +0000