aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-12-20gitlab-ci: add retry.Dario Lombardo1-0/+20
Due to some network failures, add a retry to all jobs. Change-Id: Ic7737db3348b5e43a30680a7f8e7c2e3850116c3 Reviewed-on: https://code.wireshark.org/review/24903 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-12-19Avoid ASN.1 frame.protocols duplication.Gerald Combs12-62/+39
Some of the ASN.1 dissectors process their data indirectly through dissector tables. Add dissector_try_string_new so that they can do so without appending duplicate entries to frame.protocols. Change-Id: If9e12d81f9d0cc5b3bf19816e675a0fb79d904a6 Reviewed-on: https://code.wireshark.org/review/24886 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-19Convert Dissector Tables dialog to use modelMichael Mann9-280/+723
Now with searchability! Change-Id: I6ab4e89d4080d3599d522807d39de80cc46e7360 Reviewed-on: https://code.wireshark.org/review/24898 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-19Qt: Avoid using cmd+H as keyboard shortcut on macOSStig Bjørlykke1-1/+1
The keyboard shortcut Ctrl+H (cmd+H) is used on macOS to "Hide Wireshark". Change shortcut for "Export Packet Bytes" to Ctrl+Shift+X. Change-Id: I2d39911f83bc2aaf20930cda303741fa89738767 Reviewed-on: https://code.wireshark.org/review/24895 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-19Fix some copy/paste errors with new models.Michael Mann2-2/+2
Change-Id: Ic018fafece38ef0e49321ef9ea5351848d5dd486 Reviewed-on: https://code.wireshark.org/review/24899 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-19plugin: fix extra ';' outside of a function [-Wextra-semi]Alexis La Goutte1-1/+1
Change-Id: I923e4a4f84e8786523333daf372fc5d7cc7ad729 Reviewed-on: https://code.wireshark.org/review/24897 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-19Qt: add initializers (CID: 1426703).Dario Lombardo1-2/+11
Change-Id: Ib75685a099449672b55d63b647fd0f579ad1e5f6 Reviewed-on: https://code.wireshark.org/review/24893 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-19wslua: Fix logger after g6a5e90f2Stig Bjørlykke3-10/+8
The Qt log output changes in g6a5e90f2 changed the Qt message handler to use g_log. Lua logging already used g_log. The Qt variant of funnel logger, which is used by Lua as g_log backend, is currently using qDebug and this gives recursive calls to g_log and thus an assert. Rewrite the lua logging to not use g_log. Change-Id: Icf4f0022a11cb32d2b4f413f76d946f2506e283d Reviewed-on: https://code.wireshark.org/review/24888 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-19[SIP] Add dissection of oc-seq as time stamp.AndersBroman1-4/+29
Change-Id: I0273f8bff7693a7dc7416932649c083c360bc098 Reviewed-on: https://code.wireshark.org/review/24890 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-19Qt: Fix sorting of enabled protocols descriptionRoland Knall1-1/+8
Change-Id: Ifa7b6e61927615c342839b6c2e7d012198a5f939 Reviewed-on: https://code.wireshark.org/review/24892 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-19Convert Enabled protocols dialog to use model.Michael Mann9-264/+661
Change-Id: I618df2f2608adcd1be5da02262c5296e4d86cfba Reviewed-on: https://code.wireshark.org/review/24866 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-19Bugfix capture_info_open() folded into ui/capture.cMichael Mann1-7/+9
Id302e88bed4da8b9b457049fb78b0bc7d7ffabe3 forgot to add brackets around functionality Change-Id: I3aa2ed6e927a6daca93846650645d76b0d62043e Reviewed-on: https://code.wireshark.org/review/24885 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-12-19Qt: Resolve duplicate keyboard shortcutsStig Bjørlykke2-3/+9
Two Edit->Copy methods are using the same keyboard shortcut as other functionality: 1. Ctrl+Shift+D is used for "Copy this item's description" and "Ignore All Displayed packets" 2. Ctrl+Shift+F is used for "Copy this item's field name" and "Reload as File Format/Capture" Resolve this by changing the Copy methods to use Ctrl+Alt+Shift as modifier. Add a keyboard shortcut for "Copy all visible items" while here. Change-Id: I0d963501055e63963d93e211f592aa9e82801d3c Reviewed-on: https://code.wireshark.org/review/24884 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-19Qt: Add Collapse SubtreesStig Bjørlykke5-0/+42
This item is missing from the Qt port. Change-Id: Iacc18a7c2eb2368d6566622788a4e900868d446e Reviewed-on: https://code.wireshark.org/review/24879 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18androiddump: Fix adb tcpdump PTY CR/LF handlingFlorian Bezold1-13/+30
Devices running Android >= 7 have a different adb shell handling than before: - Before Android 7, adb always runs shell commands in a PTY (pseudoterminal), which automatically converts all \n to \r\n - Since Android 7, adb no longer uses a PTY if a command is directly started (like 'tcpdump' in our case). The original androiddump code reversed the PTY \r\n handling as for older devices. Commit 66507b9 for bug 13510 removed that which supported newer devices while breaking all older devices. This fix tries to support both by first trying to use the new "shell,raw:" adb command syntax. If that succeeds, adb/device must support non-PTY shells and we don't reverse any \r\n. If that fails, it's most likely an older device, and we fall back to the original "shell:" command and enable \r\n reversal. (To prevent misleading error popups in Wireshark, the warning log in adb_send when the first attempt fails is changed to a debug log). Ping-Bug: 13510 Change-Id: I7e0a4f594ebe5dde682cceb667330459337a0c9c Reviewed-on: https://code.wireshark.org/review/24721 Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18[SIP] Make a filter for Overload Control Value.AndersBroman1-0/+15
Change-Id: I8ee552d331388a1fa748bff765afe5b53508f63f Reviewed-on: https://code.wireshark.org/review/24878 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18asterix: special processing for field item I021/150Marko Hrastovec1-18/+40
There is a problem where one field decodes differently depending on another fields content. A code has been added to save information for 021_150_IM field. When the next field 021_150_ASPD is decoded, the stored information determines how it shall be scaled. This is a special case for I021/150 only. The same way as this change, other changes shall be done for fields that are dependent on other fields. Bug: 14076 Change-Id: I51f2c8f79bc6bde9efc0429e54fbea36818e9b36 Reviewed-on: https://code.wireshark.org/review/24734 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18Fix SOCKS5 state machine for authentication, two-pass dissectionFlorian Bezold1-31/+76
1. SOCKSv5 dissection was broken if authentication was used since the used state machine states were initialized, but not saved correctly, and the first server state transition was wrong. I also fixed the GSSAPI variant analogously, but could not verify this since I have no traces of this. 2. SOCKSv5 actually has a different "subnegotiation field" for the authentication messages. This is added, and the original SOCKS version is added as a generated field (i.e. for filtering). 3. Info column setting is moved to the *_display_socks_* routines to fix two-pass dissection (as used by GUI Wireshark), since only here the correct per-packet state is used. The hash_info (as used by the *_state_machine_* functions) is already fully populated on second pass. Change-Id: Ib39434dafce08188cd2da347118d0509a7613915 Reviewed-on: https://code.wireshark.org/review/24712 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18-1 is a valid tree_type value.Gerald Combs2-14/+5
Adjust tree_expanded and FieldInformation::treeType accordingly. Change-Id: I9b12c28550ba2639f636531a7ea1841df0638b5e Reviewed-on: https://code.wireshark.org/review/24844 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18ieee80211: Remove notices about D3.1 of IEEE802.11ac.Richard Sharpe1-2/+2
These items are now in 802.11 2016 so they are no longer draft items. Change-Id: I89b694f30700e08d9edc2e3707f36f8cf30dd0f2 Reviewed-on: https://code.wireshark.org/review/24877 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18Qt: Process our event loop less often at startup.Gerald Combs1-2/+9
Add back info_update_freq_ and use it to skip event loop processing. Change-Id: Id36b4786c5ff1458abbf12f4e9ded13c56e14d57 Reviewed-on: https://code.wireshark.org/review/24876 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-12-17Qt: Handle RecentFileStatus destruction manually.Gerald Combs3-5/+10
Restore the "deleteLater" behavior removed in 889aacae6e so that we don't trigger an assert in debug builds. Move the itemStatusFinished connection to RecentFileStatus while we're here. Bug: 14279 Change-Id: I79bc74d77fb3ad970c7c8a71037f680d55eac47c Reviewed-on: https://code.wireshark.org/review/24875 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-17QT: Fix qUtf8Printable errorUli Heilmeier1-0/+2
macro qUtf8Printable() has been defined with QT 5.4 therefore we need qt_ui_utils.h included Change-Id: I6301d5eda124d2033033c6a91447b15736cdc8c2 Reviewed-on: https://code.wireshark.org/review/24870 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-12-17autotools: Fixup plugins Custom.*.exampleJoão Valverde6-48/+26
plugin_ldadd was removed in 262a84c384353b2a88a6e81cdc499ab94a8316c2. Change-Id: I516aa1be3466433bf8db83ab3d1773bf88082e8c Reviewed-on: https://code.wireshark.org/review/24850 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-17CMake: Replace generator expression with variableJoão Valverde1-2/+2
Should fix OSX buildbot. Change-Id: I52abdeab8c547079edc8aec6a0c6e12e928838c6 Reviewed-on: https://code.wireshark.org/review/24873 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-17plugins: Remove moduleinfo.hJoão Valverde35-561/+36
Micro version bump for mate to homogenize it between CMake and autotools. The cmake macro doesn't handle the "a" suffix and it doesn't seem worth implementing. Change-Id: Ib022c6aa170623b83a9700e4fa098c60a9cddfab Reviewed-on: https://code.wireshark.org/review/24847 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-17plugin.rc.in: Cleanup some unnecessary codeJoão Valverde2-13/+6
Also add comment noting that MSVC_VARIANT is not the same thing as CMAKE_GENERATOR. Change-Id: Icc0f4a491786e4045c650509957655ef41352b29 Reviewed-on: https://code.wireshark.org/review/24846 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-17[Automatic update for 2017-12-17]Gerald Combs10-314/+474
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ideac9831381dbf6411af0e1d8bfa4fef6a1d7769 Reviewed-on: https://code.wireshark.org/review/24867 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-17Qt: Update our recent status sooner at startup.Gerald Combs5-77/+20
Update our recent file status as soon as we read recent_common. Run recent stats updates in the global thread pool. Revert 15a97b5986 since it's no longer needed. Change-Id: If1b08ea640dfcad26affab5d20c80c90fbf133f2 Reviewed-on: https://code.wireshark.org/review/24862 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-12-17LTE RLC graph: export graph as image, like TCP stream doesMartin Mathieson2-2/+49
Change-Id: I8709f7c09528a44a9729a06ea2ba4d6f99dbeccb Reviewed-on: https://code.wireshark.org/review/24864 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-17ieee80211: Bring VHT Capabilities IE into conformance with IEEE802.11-2016Richard Sharpe1-15/+15
IEEE802.11-2016 standardized those bits, so it's no longer a draft standard. I am slowly getting these things correct as I prepare for support for IEEE802.11ax D2.0. Change-Id: I3fc4497f2b85bae78043b9fd997379a44898f3db Reviewed-on: https://code.wireshark.org/review/24860 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-17Simple statistics export: fill in callback to get item dataMartin Mathieson2-0/+17
Bug: 13942 Change-Id: Ie7d13b1c17083d0a5b98282f04e6ac30319352a7 Reviewed-on: https://code.wireshark.org/review/24853 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-17Log output updates.Gerald Combs5-53/+91
Add a Qt message handler that calls g_log. Add milliseconds to the g_log_message_handler timestamp. Change-Id: I5b1c1d902b6b05cd8daa01741b19d6c2048dfb9a Reviewed-on: https://code.wireshark.org/review/24865 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-17Kerberos: Update and fix KDCOptions and TicketFlagsUli Heilmeier2-15/+99
Fix and update KDCOptions and TicketFlags. Used references: * https://github.com/heimdal/heimdal/blob/master/lib/asn1/krb5.asn1#L330 * https://msdn.microsoft.com/en-us/library/cc246090.aspx * https://tools.ietf.org/html/rfc8062#section-3 Bug: 14261 Change-Id: I0e34425fc35e0eba14c700f82cbf2441365b139d Reviewed-on: https://code.wireshark.org/review/24863 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16Fix memory leaks in Expert Info dialogMichael Mann3-0/+14
Models and children weren't deleted which leaked memory all over the place. Change-Id: I961016b2501ad8cc8c75cf5fa5b0c86756a29382 Reviewed-on: https://code.wireshark.org/review/24858 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16Convert Supported Protocols dialog to use modelMichael Mann7-135/+455
Also have search file search name, filter and description columns Change-Id: Id519c5b1deb4a80e3b95437cf2e6d3e9510e4b11 Reviewed-on: https://code.wireshark.org/review/24857 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16BGP: add Open message error/unsupported capabilityUli Heilmeier1-17/+22
According to RFC 5492 [1], paragraph 5, Data field of BGP notification for Open message error/unsupported capability must list the set of unsupported capabilities Bug: 14274 Change-Id: Iacd33b5c83bc234652d2a5444f0029640d33e1c5 Reviewed-on: https://code.wireshark.org/review/24829 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-16qt: follow stream: prevent duplicate closeMartin Kaiser1-0/+6
621498f88e882dbe8cc3a2c8373bb342bb0dbe77 fixed a crash that's caused by closing the follow stream dialogue multiple times. Another way to get a similar crash is to press the Back or "Filter out this stream" buttons again while we're already about to close. Ignore the two buttons in this case. Change-Id: Ia8d7b3ca500db2519a784b42c0744e2527b9d5f6 Reviewed-on: https://code.wireshark.org/review/24839 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16wslua: Fix crash in Dir.open()Stig Bjørlykke2-7/+3
Do not give an uninitialised error pointer to g_dir_open(), this will give a crash if g_dir_open() fails. Remove wslua_dir.dummy because it is not used by anyone. Change-Id: I044eee021393f2ea2aa022138bbf6fd099eb0908 Reviewed-on: https://code.wireshark.org/review/24840 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16Rework address matching to work with string input.Andrei Cipu1-45/+81
Currently, the function assumes the input is represented as a string representation of the hex string of the addresses. Instead, the parameters are sent as plain text IPs. We reactivate the helper functions that convert the addresses from the latter to th former representation and add support for handling masks in the input. Bug: 14229 Change-Id: I750a546b39404a1fbc86cee604a33e506f7240d8 Reviewed-on: https://code.wireshark.org/review/24469 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16packet-mq: Improve some display by adding CONST valuesRobert Grange2-97/+161
Change-Id: I66f9dc050735fd0a73b9938a9db0c5978cec40a4 Reviewed-on: https://code.wireshark.org/review/24834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16wslua: Fix memory leakagesStig Bjørlykke4-1/+7
Free some variables in error handling. Change-Id: I0d0653962b11f760c31872aa7e5b5f1d20c54dcb Reviewed-on: https://code.wireshark.org/review/24842 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-166LowPAN: always build IPv6 address whatever the tree statePascal Quantin1-117/+115
Bug: 14277 Change-Id: I320def755076ef8c52d4e5e0dbedf06ea88f25a7 Reviewed-on: https://code.wireshark.org/review/24848 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-12-16Qt: Show our recent files earlier.Gerald Combs1-5/+11
Show the recent file list before it's been scanned so that the welcome screen layout will be complete by the time we're done initializing. Change-Id: I09f0a68c6d36f30e7cdb2958f82af38f52444c34 Reviewed-on: https://code.wireshark.org/review/24849 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-15Qt: A node without a child can not be expandedStig Bjørlykke1-1/+1
Change-Id: I28bb5797e8eab69c761e257b90a11c646d06cf68 Reviewed-on: https://code.wireshark.org/review/24845 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-15plugins: Remove redundant plugin.rc.in filesJoão Valverde32-477/+30
plugin.rc is Windows specific, also add condition to reflect that. Change-Id: Ibbb7dab77dd1f277e2302c8f931218ca433f8c72 Reviewed-on: https://code.wireshark.org/review/24833 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-15Qt: Initialize QFontDatabase in a worker thread.Gerald Combs1-0/+13
QFontDatabase uses an internal list of system fonts which might take a while to initialize depending on your platform and hardware. On my notebook here it takes about 45 to 50 ms. Create a worker thread for QFontDatabase initialization similar to QMimeDatabase. Change-Id: Ieff683b023537a6c104a80f2611ea1e966b65610 Reviewed-on: https://code.wireshark.org/review/24841 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-15[ISAKMP] Added support for new Notify EMERGENCY_CALL_NUMBERS PayloadMatej Tkac1-7/+144
In accordance with the latest 3GPP TS 24.302 (Section 8.2.9.8) 3GPP TS 24.008 (Section 10.5.3.13) Bug: 14273 Change-Id: Ib5a24fa33633764f6bfb034250c309c1f4af9914 Reviewed-on: https://code.wireshark.org/review/24793 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-15epan: Add default type handling for custom columnStig Bjørlykke1-23/+8
Add default type handling in proto_custom_set() to prevent crashes when trying to use FT_IPXNET, FT_AX25 or FT_VINES items as custom columns. This will also work as a safeguard when adding new types. Change-Id: Iaf3b48aec72f0e5c10332b0e6d5f7221b0196e15 Reviewed-on: https://code.wireshark.org/review/24836 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-15Qt: Switch ProtoTree to a treeview+model.Gerald Combs18-575/+864
Add a ProtoTreeModel and use it in ProtoTree. This should make the UI more responsive when we have lots of items in the tree. Change-Id: Id26e6bcff84663867a8da17fd9ae86ff639b633f Reviewed-on: https://code.wireshark.org/review/24774 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>