aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-05-13Move the Valgrind size check after the capinfos check of the file.Jeff Morriss1-5/+5
That way if we pass a file that doesn't exist to the fuzz-test script we won't get errors from 'ls' complaining that the file doesn't exist. Change-Id: I33f4bd692775e6d3f990adaaa37b7530d343fe52 Reviewed-on: https://code.wireshark.org/review/15410 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-13automake: fix wslua generation in out-of-source-tree builds.Jeff Morriss1-6/+7
We neeed to set the build directory (because that's where the wslua stuff gets put). Also fix up wslua dependencies: - It's needed (only) for the asciidoc->XML step - It's not needed for the wsug any more Change-Id: Ic1231a964b1edfb7d2eeacc5cc1c3fdda6969f21 Reviewed-on: https://code.wireshark.org/review/15407 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-12Update the release notes.Gerald Combs1-5/+9
Change-Id: I0e3296555ce95dd48256a7a8c39fc82c71466dcb Reviewed-on: https://code.wireshark.org/review/15392 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-12packet-nfs: add decoding and displaying of exclusive create attributesTigran Mkrtchyan1-0/+1
NFSv4.1 defines FATTR4_SUPPATTR_EXCLCREAT attribute which tells the client a bitmap of attributes which can be set during exclusive create. Wireshark did show that FATTR4_SUPPATTR_EXCLCREAT is provided, but doesn't show supported attributes. Bug: 12435 Change-Id: I29fc6beb2e75e9c78d68b1ca73a714bab2ad10a2 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/15401 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12BACAPP: Added dissection for NotificationParameterLori Tribble1-0/+36
Case 19 - change-of-reliability and related enums Bug: 11734 Change-Id: Ie40acc9d157adcf4d69b9cc57c6419daf8f6263d Reviewed-on: https://code.wireshark.org/review/15350 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12ERF: In packet-eth register ERF_TYPE_ETH variants.Anthony Coddington1-0/+5
Register for: ERF_TYPE_COLOR_ETH ERF_TYPE_DSM_COLOR_ETH ERF_TYPE_COLOR_HASH_ETH Change-Id: I5877ca5721abaa269f937cca0414df4f6b1a5eef Reviewed-on: https://code.wireshark.org/review/15398 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12codecs: Move noinst_HEADERS to Makefile.amJoão Valverde2-13/+14
It's not common code and because it is only required for make dist placing it in Makefile.am provides better automake readability. Also noinst_HEADERS is not necessary in _SOURCES. Change-Id: I5269b79b62141efbc3151e69c5584643e5ebec47 Reviewed-on: https://code.wireshark.org/review/15399 Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12WiX banner and dialog images.Gerald Combs8-6/+161
Add initial Wireshark-branded artwork to the WiX installer. Change-Id: I1997023784112890f5366a577ca3b8101be530da Reviewed-on: https://code.wireshark.org/review/15383 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12extcap (CID 1355644): fix the range check for guintMartin Kaiser1-4/+8
by using a temporary variable Change-Id: I4f1f51a9fd600356839cbb44f099965058556bf0 Reviewed-on: https://code.wireshark.org/review/15340 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12autotools: Move OSX autoconf macros to ws_osx.m4João Valverde3-338/+354
Change-Id: Icde077957810a0eb2a99cdfd6ec57dfd04b4ad47 Reviewed-on: https://code.wireshark.org/review/15354 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12configure.ac: Remove condition for AC_CHECK_FUNC (on Solaris)João Valverde1-9/+1
Change-Id: Iecf697c718cb2ca522060c64b4ca136458b38127 Reviewed-on: https://code.wireshark.org/review/15355 Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12configure.ac: Remove obsolete AM_PROG_LIBTOOLJoão Valverde1-12/+1
Not needed anymore. Change-Id: I4743554fc488767516b5c21b36eec19a4a08c818 Reviewed-on: https://code.wireshark.org/review/15352 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12Qt: Fix Show Packet Bytes ShowAsImageStig Bjørlykke1-14/+12
Always loadFromData when ShowAsImage to avoid situations where a valid image is not loaded. Enable print/copy/save-as buttons when loading a valid image. Change-Id: I8461f560e1e41388b59f7d8a46f30d511cf2e4a4 Reviewed-on: https://code.wireshark.org/review/15369 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>
2016-05-12Add ${LIBSSH_DLL} for generating Wix component group listMichael Mann1-1/+1
copy/paste error missed ${LIBSSH_DLL} when looping second time. Change-Id: Iccb32c0d32b328828e4da13f745fb0bc9bdc16ae Reviewed-on: https://code.wireshark.org/review/15395 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12pcap-common: Fix several serious ENCAP_ERF extension header writing issuesAnthony Coddington1-8/+29
Write ERF subheader after extension headers, especially important for Ethernet (other types predate extension headers for the most part). Add missing ERF_TYPE_MC_AAL2 and ERF_TYPE_COLOR_HASH_ETH. Truncate final ERF extension header when too many. Rlen is not currently adjusted so may be incorrect (see followup patch). Existing tools generally check against PCAP incl_len anyway as there are other scenarios where this can happen like naive snapping or Wireshark ERF-to-PCAP. Properly fixing this will involve getting rid of the ERF pseudoheader. Consistent with the ERF wiretap (except for different padding behaviour). Bug: 3606 Change-Id: I6086cbc3fef948586fbad6f585f648d99adfff4f Reviewed-on: https://code.wireshark.org/review/15358 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-12RPM: make autoconf (and a few other build dependencies) optional.Jeff Morriss1-4/+21
Most people building RPMs don't need autoconf, automake, flex, or bison. But enough people do patch Wireshark (in the spec file) to make it an option. Based on Joao's Ib3f85b59c26c25c83fe6a939aee1a2dc75dd28f9. Change-Id: I62bf2a0c5cbe0a1abd680322ab82fcb14aedd0c3 Reviewed-on: https://code.wireshark.org/review/15313 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-11Run checkAPIs in epan/ .Jeff Morriss3-13/+10
It runs cleanly (no errors anyway) now. Change-Id: I1dca3a3f854c4f2feebcf4193e3c5d444a01e06b Reviewed-on: https://code.wireshark.org/review/15378 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11QUIC: for QUIC < 33, display CID flag with 2 bitsAlexis La Goutte1-1/+20
Change-Id: I943a40b7a942a6175d9b92cbb6060de34060459d Reviewed-on: https://code.wireshark.org/review/15269 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11QUIC: Add conversation support for store the versionAlexis La Goutte1-10/+33
Change-Id: Id9e2cc4a8b94ed91e35a6ab7610ab37ab2c41340 Reviewed-on: https://code.wireshark.org/review/15268 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11QUIC: fix dissection when num_timestamp = 0 and also reason phrase length ↵Alexis La Goutte1-18/+20
use little endian Change-Id: Id0158463b437face3412ec416f28d95b63ae4a07 Reviewed-on: https://code.wireshark.org/review/15302 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11ERF: Fix Ethernet FCS detection and remove preferenceAnthony Coddington2-8/+8
Use eth_maybefcs instead of eth_withoutfcs. ERF_TYPE_ETH records almost always have FCS, but using maybe means the "Assume packets have FCS" is respected. Mark the erf_ethfcs preference as obsolete. It was being ignored. This was broken by Change 3670 which changed the ERF dissector to use a dissector table. Change-Id: I45cffdaed3890f8a0f505b2011be8c5204d9b2a6 Reviewed-on: https://code.wireshark.org/review/15360 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11automake/nmake: don't run checkAPIs on lex and yacc files.Jeff Morriss4-7/+3
The lex files use malloc and friends which is prohibited; don't check them (until checkAPIs becomes smart enough to realize this is OK). This mirrors what is done in cmake. Change-Id: Ie80ea7a9b7c0e25c70c8edf3671e80a493ea1b2f Reviewed-on: https://code.wireshark.org/review/15377 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11TShark: Separate columns using UTF-8 arrows.Gerald Combs1-19/+20
Use UTF8_RIGHTWARDS_ARROW and UTF8_LEFTWARDS_ARROW instead of "->" and "<-" between addresses. This matches the port-printing behavior of the TCP, UDP, and SCTP dissectors. Change-Id: I0add8bfb1748319758a1ce7dbd362af818139db8 Reviewed-on: https://code.wireshark.org/review/15319 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-11TShark: Add a "-E bom=" option.Gerald Combs4-0/+28
Add an option to print the UTF-8 BOM. Change-Id: I3d30c67852b9b89d1548b0f957d97fd8e8741049 Reviewed-on: https://code.wireshark.org/review/15318 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-11Run checkAPIs in epan/ftypes/ .Jeff Morriss3-11/+10
Michael cleaned up the strcpy()'s which were preventing it from running without errors. Change-Id: I3f02150a9b1fbefddb67c0cb90fc2c58766d7d2a Reviewed-on: https://code.wireshark.org/review/15375 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Qt: fix loading of profile by command linePascal Quantin1-11/+13
recent_read_static() must be called before processing the -C option as it will select the last profile used. While we are at it, add a missing profile_store_persconffiles(FALSE) call to match what is done in GTK based UI Bug: 12425 Change-Id: I9cfdca3ed25f0ed97535178973e3f0427b9ad2b1 Reviewed-on: https://code.wireshark.org/review/15371 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11s7comm: block/file up-/download redesignThomas Wiens1-235/+1210
Redesigned the block/file up- and download, using new informations from PI-Services. Changed the block-info items, as it's in general a string, which can be further dissected if it's a PLC program block. Other types of Siemens automation hardware may use this as a simple filename for filetransfer. Changed the display-style for block name/number in info-column, to be more compact. Change-Id: Ie7c3a285d25897f8516ed8827041a5dbdf80679e Reviewed-on: https://code.wireshark.org/review/15275 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Fixed value for experimental result code 5142Marius Paliga1-1/+1
Bug: 12428 Change-Id: Idc46b4bc881fb2c5e83af7ac55b5cfd060d9b185 Reviewed-on: https://code.wireshark.org/review/15370 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-11Create a Wix InstallerMichael Mann17-101/+2747
This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Create IEC401 source TCP port preference.Jaap Keuter1-7/+27
In order to decode IEC401 over TCP/IP it's not always the case that the source port is the default 2404. Makeing this port a preference addresses the decoding issue and src/dst determination. Bug: 12407 Change-Id: Ifaee829e014a5e0ce449d047d9e0e44c470cd2f5 Ping-Bug: 10933 Reviewed-on: https://code.wireshark.org/review/15321 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-11Fix warnings for good ISUP messagesRustam Safargalin1-1/+1
Bug: 12423 Change-Id: Ie4bd0507677850317fda69b991d167948b241397 Reviewed-on: https://code.wireshark.org/review/15356 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: Michael Mann <mmann78@netscape.net>
2016-05-11Decode the first 6 bytes of Unknown1 as Timestamp: Two recorded BeaconsJoerg Mayer1-3/+10
had the identical difference in the timestamp and unknown1 value, and the difference was almost identical to the beacon interval (102398 vs 102400us). Change-Id: Ic3fe8c1b52f3e9852ffdeae0fda79c5cb2e1482b Reviewed-on: https://code.wireshark.org/review/15368 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-05-11[tshark] Document -U option and create a list of tap names when enteringAndersBroman2-10/+25
an empty name "". Change-Id: I2b8332ff6900c8a88514a25a416f342d7b696d34 Reviewed-on: https://code.wireshark.org/review/15332 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>
2016-05-11MRCPv2: do not update info column under tree checkPascal Quantin1-146/+146
Bug: 12426 Change-Id: I1921e6d409af3290862f41f07e95c2c5036bee80 Reviewed-on: https://code.wireshark.org/review/15364 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-11correctly decode EA Data Length in CIFSChristian Ambach1-1/+1
This field is little endian, not big. The SMB2 dissector already does it right. Change-Id: I859f581424be861fdcc1a586d085ba3bfe70a2f0 Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-on: https://code.wireshark.org/review/15365 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-11Upgrade c-ares Windows library from 1.9.1 to 1.11.0Pascal Quantin3-8/+10
Bug: 12412 Change-Id: I5e5f8f86293e391ec425a6e3e314573711947bce Reviewed-on: https://code.wireshark.org/review/15345 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-05-11Revert "Simplify val_to_str[_ext] implementation."Guy Harris1-2/+18
This reverts commit 1d0a97493280fd79d00e85a0971b3842d7f00e5e. This appears to be causing a crash - and the code in val_to_str() isn't just a copy of the code in val_to_str_wmem(), as it doesn't do a wmem allocation if try_val_to_str(), which *doesn't* use wmem, succeeds. Change-Id: I40e9e8b4ed0a1c66e20ab4bd827ac51c3fac85ff Reviewed-on: https://code.wireshark.org/review/15351 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-11Simplify val_to_str[_ext] implementation.Michael Mann1-18/+2
All val_to_str API use wmem, so just call the wmem function version passing packet_scope instead of copying it. Change-Id: Ib58b6b702fbaf5a81cc445bd01ef1a523774be6e Reviewed-on: https://code.wireshark.org/review/15348 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Remove strcpy from wmem_strbuf.cMichael Mann1-1/+1
This removes all strcpy calls from Wireshark provided code (only ones remaining are in lemon.c) Change-Id: I7a467fc3e10cc94c97196ecea3277a5375bc14b7 Reviewed-on: https://code.wireshark.org/review/15347 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10Give FvalueToStringRepr a length parameter.Michael Mann13-55/+55
This allows the conversion of a few straggler strcpy calls in ftype library. Also provides a more accurate size value instead of the many hard coded values the ftypes were using. Change-Id: Ia6273980432e16ad3a6233816a6054d9fed5d2a4 Reviewed-on: https://code.wireshark.org/review/15344 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10Have fvalue_to_string_repr always return an (wmem) allocated buffer.Michael Mann12-57/+59
Previous patches converted all fvalue_to_string_repr calls to expect an allocated buffer (and not a passed in one). Now changing signature to force an allocated buffer. Added wmem in case that can be taken advantage of within epan (and since the function signature was changing anyway). Change-Id: Ica1ac4a9a182ce0e73303856329e198d9d525b7b Reviewed-on: https://code.wireshark.org/review/15343 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10rawshark: Have fvalue_to_string_repr just return allocated string ↵Michael Mann1-15/+8
representation. Simplify use of fvalue_to_string_repr in rawshark by just having it return an allocated string representation of a field value instead of trying to find the right allocated buffer size to pass in. This will also allow fvalue_to_string_repr to be converted to exclusively return allocated strings and not accept a provided buffer. Change-Id: I9996411dca4656d599b30ed415453d0207131824 Reviewed-on: https://code.wireshark.org/review/15342 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10rawshark: Get "field string values" from existing functionality.Michael Mann4-115/+30
rawshark shouldn't be converting FT_ and BASE_ values into strings on its own, there's a function for that. Change-Id: Ib4ce1651ee130a03644b5de3ab471333444e19a9 Reviewed-on: https://code.wireshark.org/review/15341 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10enttec: CID 1355670 (same code for different branches)Martin Kaiser1-5/+2
else if and else branch do exactly the same thing - remove the else if Change-Id: If6017f2fdb960b5533d02f1f863070de95babdf5 Reviewed-on: https://code.wireshark.org/review/15339 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10Dynamically allocate the string for representing FT_IEEE_11073_[S]FLOAT.Michael Mann1-31/+22
Most uses of fvalue_to_string_repr() don't provide a buffer to write to, so memory is allocated dynamically inside the function. Trying to move to where ALL cases don't provide a buffer to simplify fvalue_to_string_repr handling and the underlying functionality of the ftypes. Change-Id: Iac03e4eb63b5e38311a6472fbe488009ed55206c Reviewed-on: https://code.wireshark.org/review/15331 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10Qt: Keep the OverlayScrollBar from disappearing.Gerald Combs1-2/+15
Make sure we disable transience in both the parent and child scroll bar. This keeps the child from disappearing on Yosemite when "System Preferences → General → Show scroll bars: When scrolling" is enabled. Add some comments about what will be required to properly handle transience. Change-Id: I6fc37ef1783b6c8dea179f08ad6c4343c7cf8095 Reviewed-on: https://code.wireshark.org/review/15336 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-10enttec: uups, I forgot some if (tree) checksMartin Kaiser1-10/+6
Change-Id: Id092b91408cdac9e490cb060a3d95e4a1d78e4e6 Reviewed-on: https://code.wireshark.org/review/15338 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-10enttec: remove some unnecessary if (tree) checksMartin Kaiser1-27/+23
Change-Id: Id108b0bacac377ad1f3fe7e999fb4d772bb69789 Reviewed-on: https://code.wireshark.org/review/15337 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-10iso14443 ats: show explicitly if TA(1), TB(1) and TC(1) are transmittedMartin Kaiser1-0/+21
Change-Id: I3f6e2bb73da901de0c6127564612fba86d49ddb4 Reviewed-on: https://code.wireshark.org/review/15335 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-10When using clang, warn about c99 only syntax (like pedantic without all the ↵Joerg Mayer1-0/+2
rest). Change-Id: Ife6fcb14ce04e4d505ee4911a102420932fb18de Reviewed-on: https://code.wireshark.org/review/15334 Reviewed-by: Jörg Mayer <jmayer@loplof.de>