Commit Graph

63352 Commits

Author SHA1 Message Date
Pascal Quantin a383e692c8 Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d36.

It breaks the registration of codec, dissector and libwiretap plugins.

Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-19 10:47:10 +00:00
Joerg Mayer ff845123f1 Add modelines
Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e
Reviewed-on: https://code.wireshark.org/review/16011
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-19 08:40:16 +00:00
Joerg Mayer 51ceb6d66b Calculate and print CWmin and CWmax in addition to ECWmin and ECWmax
This also changes the summary presentation to make it more compact

Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b
Reviewed-on: https://code.wireshark.org/review/16000
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-19 08:33:08 +00:00
Guy Harris f4fd1a3640 Fix problems when compiling without pcap.
Change-Id: Id682a76ac561f92f65638bbdfcd4236eb92e46b7
Reviewed-on: https://code.wireshark.org/review/16010
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19 07:50:09 +00:00
Guy Harris 8634cee96d Put #ifdef/#endif around a variable used only on Windows.
Change-Id: Ia6fed6db03cb88433469e758693fcc72c4bd9071
Reviewed-on: https://code.wireshark.org/review/16009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19 07:39:57 +00:00
Michael Mann 9b5b4443cf Refactor command-line handling of GUI options.
Both GTK and Qt both use the same command-line options, so refactor
the parsing and (possibly) applying of those arguments to a single
location.

Ping-Bug: 12546
Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b
Reviewed-on: https://code.wireshark.org/review/16006
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: Anders Broman <a.broman58@gmail.com>
2016-06-19 05:56:45 +00:00
Peter Wu deef1dc1ff cmake: add PIDL dissector generation support
The dissectors list is generated based on regex magic on pidl/Makefile.
A dssetup.cnf file is added because all other protocols already have
this file. The srvsvc and wkssvc protocols cannot be built for some
reason, so just disable it (this mirrors the original Makefile).

Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
compared to autotools.

Tested with an out-of-tree and in-tree build with cmake (make and ninja):

    cmake -GNinja && ninja -v pidl-dissectors
    touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
    cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs

Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
Reviewed-on: https://code.wireshark.org/review/15962
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>
2016-06-19 02:28:53 +00:00
Binh Trinh c07fd447c3 DCE/RPC: fix array of pointers with NULL
Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f
Reviewed-on: https://code.wireshark.org/review/16004
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18 14:42:35 +00:00
Chris Brandson a7aaf0ba72 ZigBee dissector added support for the Power Negotiation bit
An update to R22 adds the Power Negotiation bit to the Parent
Information of the End Device Timeout Response

Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1
Reviewed-on: https://code.wireshark.org/review/16001
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-06-18 03:31:02 +00:00
Michael Mann 631b9c43e2 GTPv2: Use proto_tree_add_bitmask
Change-Id: I236a3513237a7a977389438adaf381542281943d
Reviewed-on: https://code.wireshark.org/review/15997
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18 03:29:54 +00:00
Samiran Saha 2dc3e52cb7 MKA: tvbrange for all subtrees corrected
* Incorrect tvbrabge was affecting highlight on selection.

* AN & Confidentiality Offset dissection fixed.

Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9
Reviewed-on: https://code.wireshark.org/review/15996
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 17:29:49 +00:00
Kenny Root 5a85adda16 ssh: add RSA host key printing
Adds a dissector for the ssh-rsa type of public key where the modulus
and public exponent are extracted out.

Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e
Reviewed-on: https://code.wireshark.org/review/15975
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 17:27:50 +00:00
Kenny Root e600526ccd ssh: add hostkey information
Adds a framework for hostkey to be printed out separately from the rest
of the key exchange. This will allow for individual key information to
be presented separately in subsequent changes.

Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa
Reviewed-on: https://code.wireshark.org/review/15974
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-06-17 17:26:41 +00:00
Binh Trinh ecd4120934 Diameter-3GPP: add AVP 21 RAT-Type decoding
Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f
Reviewed-on: https://code.wireshark.org/review/15993
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 17:24:57 +00:00
Joerg Mayer e912db4546 Add an expert item to asure that aifsn is at least 2
Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb
Reviewed-on: https://code.wireshark.org/review/15998
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-17 15:54:34 +00:00
Dario Lombardo 2e9f3c5d36 tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 15:38:03 +00:00
Binh Trinh 2aa55a387a GTPV2: add decoding of ECI into enodebid and cellid
Change-Id: If46cc354e202ff9a126580bf742d747e42678f83
Reviewed-on: https://code.wireshark.org/review/15994
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-06-17 13:01:09 +00:00
Jens Kilian a6da022898 Qt: Fix a compile error occurring on RedHat Enterprise Linux.
Another missing Qt #include; probably caused by commit 157721c.

Change-Id: I8ab4be9f18dffde7159debd842201e2a67230ec8
Reviewed-on: https://code.wireshark.org/review/15995
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-17 12:17:37 +00:00
Alexis La Goutte a4f58021d0 autotool: Add -Wc99-extensions CFLAGS
See with CMake (ga9070e1a90)

Change-Id: If768b663f9ed032503fc121785b078c0107cdadc
Reviewed-on: https://code.wireshark.org/review/15909
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-17 06:41:29 +00:00
Martin Kacer 42b060905e tshark JSON and Elasticsearch output
Added ouput -T for json|ek
Added -j switch fo filter EK json|ek fields.
Added -x switch to work with json|ek to insert raw fields.

Bug: 11754

Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7
Reviewed-on: https://code.wireshark.org/review/15869
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 06:09:29 +00:00
Peter Wu 0aa5f6c6c7 idl2wrs: fix more bad strndups
Fixed another g_strndup case that truncated the name and replaced more
by strdups when possible.

Change-Id: Id7ce4d82da9fb1d0071bc7a6b4e7c2062bf77f55
Reviewed-on: https://code.wireshark.org/review/15988
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 06:08:20 +00:00
João Valverde 22fb7a598b mswsp: Remove null check (CID1355407)
value->type is already asserted as not null (and probably shouldn't be).

Change-Id: I574d3e7e0d5c636e6b731c1c817f2e457447afc1
Reviewed-on: https://code.wireshark.org/review/15990
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 06:05:07 +00:00
João Valverde 0ca6a6da62 Align AUTHORS.src column
Change-Id: I17ed5e0be356666e9b29490ce43deb357fe177ff
Reviewed-on: https://code.wireshark.org/review/15991
Reviewed-by: João Valverde <j@v6e.pt>
2016-06-16 23:09:59 +00:00
João Valverde f9c2a2e92d LDSS: Add an assertion (CID280539,CID280540)
Change-Id: I18082a4d45f0c320b8ee0e11139295eb1aee2c89
Reviewed-on: https://code.wireshark.org/review/15968
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>
2016-06-16 22:45:25 +00:00
Gerald Combs 157721c0a9 Qt: Add "Copy As…" to VoIP Calls.
Bug: 4389
Change-Id: I88dba82bd63e8c3be2b6fac3eca88f810c62d8bd
Reviewed-on: https://code.wireshark.org/review/15985
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-16 22:25:05 +00:00
João Valverde ee6e89d900 CANopen: Check array bounds for untrusted index (CID 1356262)
Change-Id: If5ca51e5703fa4137ab9f388a99d613752d3b0d0
Reviewed-on: https://code.wireshark.org/review/15983
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: João Valverde <j@v6e.pt>
2016-06-16 22:05:21 +00:00
Gerald Combs 99e2466bd7 Add a sequence analysis wishlist item.
Change-Id: Idea0bab80c7c05e3ad9f8591904e882df69a17ff
Reviewed-on: https://code.wireshark.org/review/15984
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-16 20:32:48 +00:00
Martin Kaiser c26968434c lemon: use a define for fseek()'s whence parameter
for people who don't immediately understand what fseek(fp, 0, 2) does

Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435
Reviewed-on: https://code.wireshark.org/review/15976
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-06-16 19:57:15 +00:00
Victor Barratault 0600f92841 ldap: added modify-increment operation identification in packet dissection and generate the modified dissector dissector
Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7
Reviewed-on: https://code.wireshark.org/review/15977
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: Anders Broman <a.broman58@gmail.com>
2016-06-16 19:46:11 +00:00
Alexis La Goutte 86a7ab1ffe DEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ic2d333b418928351f32673890c9c432c7bfa0f16
Reviewed-on: https://code.wireshark.org/review/15982
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 19:44:19 +00:00
Alexis La Goutte c1626db0a0 SITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I2565b0bee66f934561df506e87a35fdd14590f92
Reviewed-on: https://code.wireshark.org/review/15981
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 19:43:39 +00:00
Michael Mann 13c013611d DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_value
Change-Id: I88398aa1923e86bb83b97cc3904529a5810f6c40
Reviewed-on: https://code.wireshark.org/review/15978
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-06-16 19:40:48 +00:00
Jaap Keuter c98b0d574d Add Cisco ttag dissector
Add dissector for Cisco ttag protocol.

Bug: 12518
Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef
Reviewed-on: https://code.wireshark.org/review/15964
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>
2016-06-16 19:00:39 +00:00
Jeff Morriss 0e8fef5827 Finish getting making the Diameter XML valid XML.
... Except for the fact that many AVP names start with "3GPP".

Make the AVP names XML IDs again.

Fix all the grouped AVPs that reference AVPs (by name) or vice-versa.  This
includes:
 * Fixing a bunch of typos (including type mismatches).
 * Commenting out a number of references to vendor AVPs for which we don't have
   the specs.
 * Adding a few missing AVPs.

Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4
Reviewed-on: https://code.wireshark.org/review/15973
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 17:12:08 +00:00
Kenny Root 4ad428dddf ssh: set packet lengths correctly
Each SSH packet was being set to be the remaining length of the frame.
This change sets the packet lengths correctly for each SSH packet.

Change-Id: Id9c2331d875465cd5e6bb788d420e0025f5d496e
Reviewed-on: https://code.wireshark.org/review/15966
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-16 17:10:00 +00:00
Kenny Root b22e1aeb58 ssh: packets after SSH_MSG_NEWKEYS are encrypted
According to RFC 4253 section 7.3, once the SSH_MSG_NEWKEYS is received
all packets after that will be encrypted using the negotiated keys. This
can happen in the middle of a frame, so account for the offset in the
frame where this happens.

Change-Id: Ibc3b06a4bdfe38ae15b0e65afac6f5d3646cb58d
Reviewed-on: https://code.wireshark.org/review/15965
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-16 17:05:37 +00:00
Michael Mann 9a5e6a6884 DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags
Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e
Reviewed-on: https://code.wireshark.org/review/15942
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-06-16 17:03:38 +00:00
Samiran Saha 946b03798a MKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suite
Change-Id: Ief38f949d3e30754a65fbfeaa64cbbd2f5646a9b
Reviewed-on: https://code.wireshark.org/review/15969
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>
2016-06-16 15:35:25 +00:00
Thomas Shen 7d6e3e040c NSH: Correct the display of the NSH header fields
Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c
Reviewed-on: https://code.wireshark.org/review/15963
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>
2016-06-16 15:34:25 +00:00
Stig Bjørlykke 44ba346c48 gtk: Check chunk before g_string_chunk_clear
Avoid this warning from wireshark-gtk:
 (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion
 'chunk != NULL' failed

Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91
Reviewed-on: https://code.wireshark.org/review/15970
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 15:19:30 +00:00
Victor Barratault d3bb3a03b8 Typing error line 4928 of packet-dns.c
Change-Id: I1a6409262614a87c159236375223707c85114650
Reviewed-on: https://code.wireshark.org/review/15972
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-16 15:12:34 +00:00
Peter Wu 44e3212bce gitignore: updated cmake paths
* files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
* epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to
  libwireshark build")
* asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors")

Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa
Reviewed-on: https://code.wireshark.org/review/15961
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-16 05:29:19 +00:00
Peter Wu dabbaaf418 filesystem: Fix build dir detection when using cmake
Fixes loading of plugins by detecting the build output directory of
cmake. This requires a "CMakeCache.txt" file to be present in the parent
directory (above run/).

Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8
Reviewed-on: https://code.wireshark.org/review/7453
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>
2016-06-16 04:40:55 +00:00
Gerald Combs 897f9f7cca Add a note about the new intelligent scroll bar.
Should we call it the intelligenter scroll bar?

Change-Id: I67e76c1aabeb4b2e87e38815fe4ab120f0869b25
Reviewed-on: https://code.wireshark.org/review/15936
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 04:39:39 +00:00
Martin Kaiser 50591ac861 CID 1250642: check the return value of dup()
abort if it is -1

Change-Id: Ie14c18679ff74529731558d6742f63ebfb9fe97b
Reviewed-on: https://code.wireshark.org/review/15958
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-06-16 04:38:53 +00:00
Jeff Morriss b223d649fe Make the rest of the Diameter AVP names unique.
In most cases this means prepending the application- or vendor-name to force
uniqueness.  A few vendors have duplicates within their namespace--append the
AVP code to these.

Also fix a few other invalid names (with spaces or parentheses in the names).

Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
Reviewed-on: https://code.wireshark.org/review/15960
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 04:38:32 +00:00
Balint Reczey f749a64280 cmake: Detect proper large file defines even with -Wno-error
Without this change large file support was detected as available
even when it was not without additional flags on 32 architectures.

As a result mergecap and other programs are built without large
file support causing mergecap not being able to write files
bigger than 2GB on i386 systems. This used to work properly
with autotools builds, but not with CMake ones.

Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808
Reviewed-on: https://code.wireshark.org/review/15937
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-16 04:02:43 +00:00
Dario Lombardo 4962ea601f qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog.
Add a reference count to stat_tap_table_ui to prevent bad deallocations.

Bug: 12437
Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3
Reviewed-on: https://code.wireshark.org/review/15920
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: Anders Broman <a.broman58@gmail.com>
2016-06-16 04:01:57 +00:00
Jeff Morriss a38db78f7d Update the X11 dissector to use the latest mesa and xcbproto.
Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
Reviewed-on: https://code.wireshark.org/review/15923
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>
2016-06-16 03:29:45 +00:00
Balint Reczey d1d27bd95a Qt: Clarify follow stream dialog's format button
The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc.

Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828
Reviewed-on: https://code.wireshark.org/review/15957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:28:35 +00:00