Commit graph

58388 commits

Author SHA1 Message Date
Guy Harris
460729091c Rename a variable to avoid a collision with the C++ keyword "template".
Change-Id: I27c5efc5586e97d19ef905921919e1385809eb9b
Reviewed-on: https://code.wireshark.org/review/8367
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 12:16:34 +00:00
Jamil Nimeh
6cf626e3ad SSL: fix dissection of CertificateStatus message with OCSP_MULTI
Bug: 11181
Change-Id: I05769e254f2e276e1594d7ed5cb50496e16cfc2f
Reviewed-on: https://code.wireshark.org/review/8356
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-09 07:44:55 +00:00
Jeff Morriss
2ad4bfedfb Eliminate a couple of empty Diameter grouped AVP lists.
Use Session-ID as a place holder for grouped AVPs that can hold any AVP and
look up the contents of a couple grouped AVPs whose contents wasn't specified.

Also, update the DTD to allow vendors to not add any AVPs.

Change-Id: Id2852e31cecbcfaf64efb46918101b3a81ed5bdb
Reviewed-on: https://code.wireshark.org/review/8355
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-09 07:20:48 +00:00
Martin Mathieson
9f613e3305 RRC: add domain and release cause information to the INFO column.
Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a
Reviewed-on: https://code.wireshark.org/review/8353
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>
2015-05-09 07:16:41 +00:00
Guy Harris
2d63e58b47 Fix some more constants to be unsigned.
Change-Id: I714078683cff517c79a15abf29e1ae4a9a60271d
Reviewed-on: https://code.wireshark.org/review/8365
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 06:56:10 +00:00
Guy Harris
795211b330 Fix definition of tnef_open().
Change-Id: I8d030ab48fc47e4948c9f6dcad08f0bd08ca5ff8
Reviewed-on: https://code.wireshark.org/review/8364
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 01:34:21 +00:00
Guy Harris
17ea21f902 Make everything unsigned.
The LHS of the & operation is unsigned; make the RHS unsigned as well.
That squelches a Sun/Oracle C warning.

Change-Id: I6983cc89603a512020b8e8b560c00632de6b2fb3
Reviewed-on: https://code.wireshark.org/review/8363
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 01:31:01 +00:00
Guy Harris
53025444b7 Keep everything unsigned there.
This squelches a warning from Sun/Oracle C, and it's the right thing to
do in any case, as the LHS of the & operator is unsigned.

Change-Id: I824a82d945f8f2535282bbf466dcd65806c6f695
Reviewed-on: https://code.wireshark.org/review/8362
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 01:27:17 +00:00
Guy Harris
a50eefbd0f Add some more warnings when building with Sun^WOracle's C compiler.
Change-Id: I696b0757ba7fece61f50ebcee79b576a4f15660f
Reviewed-on: https://code.wireshark.org/review/8361
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08 23:26:31 +00:00
Guy Harris
27f276f8b6 Fix indentation.
Change-Id: I90bddd1dd879706b95ab28539411e26fc29e61d8
Reviewed-on: https://code.wireshark.org/review/8359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08 21:36:48 +00:00
Pascal Quantin
db3412051f airpdcap: ensure that buffer put on stack is big enough to hold the result of AirPDcapRsnaPwd2PskStep()
g1439eb6 changed AIRPDCAP_WPA_PSK_LEN from 64 bytes to 32 bytes, leading to a stack corruption in AirPDcapRsnaPwd2Psk() function

Change-Id: Ibf51f6749715055cd84906a144214ed44c85256b
Reviewed-on: https://code.wireshark.org/review/8358
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-08 19:21:54 +00:00
Pascal Quantin
dce4cc675d GTPv2: fix unused parameter 'pinfo' warning
Change-Id: I41e9d429685752c10562e5255036c2b84390373c
Reviewed-on: https://code.wireshark.org/review/8354
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-08 16:48:09 +00:00
AndersBroman
92853e8ec4 [GTPv2] Add dissection of Throttling IE.
Change-Id: I9c71a9d6e276213eb43e4265578e57f87f1619fd
Reviewed-on: https://code.wireshark.org/review/8352
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 13:43:28 +00:00
Guy Harris
e7eaca4416 epan/nghttp2/nghttp2_net.h no longer exists, so don't list it.
Change-Id: I4a2f289a49edf10a62208dad186a9b6426b5af2b
Reviewed-on: https://code.wireshark.org/review/8344
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08 07:16:06 +00:00
Guy Harris
3859e552e3 A NULL is needed at the end of the argument list for g_object_set().
Change-Id: I086403275d596f19ef44374f956654cf94ac9a11
Reviewed-on: https://code.wireshark.org/review/8343
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08 07:11:14 +00:00
Jiří Engelthaler
7d0049c7fd Recent files: Disable mnemonic accelerator key for menu item
If recent file name contains underscore, menu item parses it as mnemonic accelerator. So disabled using underline for recent file menu item.

Change-Id: I1253a0103e750a14a69f0d064587e0eb56581b82
Reviewed-on: https://code.wireshark.org/review/8325
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:33:03 +00:00
Gerald Combs
f77e02ccc6 Expert Info dialog.
Show all expert messages in a combined view. Group top-level items by a
(severity, group, protocol) tuple.

Let the user enable and disable messages via a check menu.

Add ProtoTree::goToField and expert_info_t.hf_index. Use them to jump to
what we hope is the afflicted item.

Enable the context menu only if the user has selected a packet item.

Add a free-form search field that matches expert summaries.

This differs from the GTK+ version but hopefully provides a smoother
workflow.

Bug: 10931
Change-Id: Ia12cb7c27cdea1634fa2798fb7e4c1b23bd16ad2
Reviewed-on: https://code.wireshark.org/review/8294
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: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:29:59 +00:00
Alexis La Goutte
3d7ff97e4f nghttp2: use g_ntoh[ls], g_hton[ls] from glib
Change-Id: I9e4278d469579022dd82bed4e40ff582fff266b6
Reviewed-on: https://code.wireshark.org/review/8328
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>
2015-05-08 04:28:39 +00:00
deagol
1439eb6778 IEEE 802.11: 802.1X (WPA-EAP) rekeying support
This patch extends the existing decryption support for WPA to also
handle rekeys by checking each decrypted packet for a 4-way-handshake.

Rekeys can be used for WPA-PSK, but are more common with WPA-Enterprise
(WPA-EAP).

For decrypting WPA-EAP secured packets the user must provide all used PMK's
of the connection (aka PSK's) as WPA-PSK 32 byte hex values to wireshark
via the existing interface.
(The capture must have all 4-way-handshakes included also, starting with
the first unencrypted one.)

Every decrypted unicast packet will habe the used PMK and TK shown in the
CCMP/TKIP section below the key index in the GUI. Group packets will display the
GTK instead.

Additionally this fixes a small issue with group rekey handling, so every packet
can be selected in the GUI in random order, removing the need to manually find
the correct group keying packets prior to that.

It was tested primary with WPA-CCMP, but TKIP is also working.

One section in the code touch bluetooth 802.1X support. It should do
exactly the same, but will now also examine all decypted packets for rekeys.

Ping-Bug: 11172
Change-Id: I19d055581fce6268df888da63485a48326046748
Reviewed-on: https://code.wireshark.org/review/8268
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>
2015-05-08 04:27:49 +00:00
Jeff Morriss
b644698bef Use the correct AVP type in a couple of places: IPAddress instead of Address.
(For whatever reason the Diameter dictionary calls it IPAddress rather than
Address--the latter is what's in the RFCs.)

Change-Id: I5efcffc2a9bced6ba841b09fd83cb3dcd128d440
Reviewed-on: https://code.wireshark.org/review/8341
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:26:19 +00:00
Jeff Morriss
1244ee0394 Fix several Starent enums that didn't have codes.
The codes were there but the strings got messed up somewhere along the way.

Change-Id: I41cc581dba0c00936737ea77e789cac1aecadf0f
Reviewed-on: https://code.wireshark.org/review/8340
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:25:47 +00:00
Jeff Morriss
bc2605e1c9 Add Float32 and Float64 types to the Diameter dictionary.
Change-Id: I74f7c37fc9b62ae0b9f29e4da0b1b3d5037b8192
Reviewed-on: https://code.wireshark.org/review/8339
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:25:16 +00:00
Jeff Morriss
5b64a693f9 Update the Diameter DTD to reflect the fact that vendors are no longer defined
in base or applications.

(IOW update the DTD to reflect I5119f0dc7f8e3bbf59e2207046a8bb0f42ab0ca1.)

Change-Id: I459b3aac50ce4dabb552e674145d9097920e0a5d
Reviewed-on: https://code.wireshark.org/review/8338
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:24:45 +00:00
Jeff Morriss
f5c4dc7bd8 Fix Starent vendor definition: it's not an empty element.
Change-Id: Ib61b9be817bcfd2fbdc0ec57f69edda9052b588c
Reviewed-on: https://code.wireshark.org/review/8337
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:24:05 +00:00
Jeff Morriss
0b4e883803 Allow empty-element Diameter Applications and use that format.
This also fixes a couple of applications that weren't properly terminated
(as a result of some of my recent changes).

Change-Id: I9662017a81c63aceeb950d3b29cb17dde16d4f0c
Reviewed-on: https://code.wireshark.org/review/8335
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 04:23:10 +00:00
Pascal Quantin
301f5ffde0 ftypes: display 64 bits BASE_HEX fields as hexadecimal
Change-Id: Ie9bedf6c17c0a941ebaabd5144460a42eb4ca1ed
Reviewed-on: https://code.wireshark.org/review/8336
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-07 20:52:48 +00:00
Gerald Combs
e55ac64077 Qt: Fix packet list column resizing.
The size hint changes in g5ab8490 broke packet list column resizing. Add
back a way to force the hinting necessary for sizeHintForColumn to work
properly.

Bug: 11067
Ping-Bug: 10924
Change-Id: Icd525200f7a88f2b6d22a3039cda98ad0527239e
Reviewed-on: https://code.wireshark.org/review/8334
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-07 20:15:29 +00:00
Moeller, Thies
141c923e2f fix FT_INT64 fields output in tshark
Bug: 11170
Change-Id: Ife7f565d17b92cd5f84e92ce109f530e68d98cfa
Reviewed-on: https://code.wireshark.org/review/8333
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-07 14:35:26 +00:00
Alexis La Goutte
1362a0b50b SIGCOMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I66e4e4735a16de5e50f86e29c34202e6668cd44e
Reviewed-on: https://code.wireshark.org/review/8329
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-07 12:39:35 +00:00
Alexis La Goutte
0310c72377 Revert "QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)"
This reverts commit b394aa5f1e.

The patch don't fix this issue...

Change-Id: I654933ec4ebebdef840f24ba20162f1f1a5321cc
Reviewed-on: https://code.wireshark.org/review/8332
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-07 12:16:27 +00:00
Jiří Engelthaler
d8ccd27181 packet-iec104: make object number filterable if SQ flag is set
Make object number filterable again if SQ flag is set which breaks my commit 785fab7f
Sample capture https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=IEC104_SQ.pcapng

Change-Id: I450b86452876fab26e1a9f1bfc2f729573c52124
Reviewed-on: https://code.wireshark.org/review/8313
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-07 11:53:52 +00:00
cbontje
7771ed2faa Fix detection of 'Write Multiple Registers' and 'Write Multiple Coils' function message 'direction'
Also did some refactoring of existing code to make it more readable for the various existing function code types.

** Commit amendment to not use depreciated tvb_length() function.

Change-Id: Ia4c9f3514968c2a7bebc404ca9185cf8d814dfca
Reviewed-on: https://code.wireshark.org/review/8301
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07 08:26:17 +00:00
Michael Mann
c3c4d42d86 Reduce proto_tree_add_text calls in packet-sigcomp.c
Some other minor cleanup.

Change-Id: I267fe1512e57ce15f9e6be83ac1b55e6e897e7a1
Reviewed-on: https://code.wireshark.org/review/8322
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>
2015-05-07 07:29:54 +00:00
Moeller, Thies
924093cc02 fix FT_UINT64 fields output in tshark
Bug: 11170
Change-Id: Ica259867e2c8e0b4b680bca94970e13962a8dbb1
Reviewed-on: https://code.wireshark.org/review/8290
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-07 07:24:39 +00:00
Michael Mann
f735d4b3ec Need to generate hf_ variable for aliases in structs.
Change-Id: I6bd995d42cf54aaf2ad90d0322056c7ff0830ea9
Ping-Bug: 11156
Reviewed-on: https://code.wireshark.org/review/8324
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>
2015-05-07 06:07:37 +00:00
Michael Mann
718e900824 Remove proto_tree_add_text from idl2wrs generation.
Change-Id: Iab9df3e68d2a3878c3081c6352c45f7c329b983e
Reviewed-on: https://code.wireshark.org/review/8323
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07 06:05:50 +00:00
Jeff Morriss
12e0f0fa4f Update the 3GPP list of Experimental-Result-Code values.
Change-Id: I7223eaeb40f6590814cc1748f6aa457bbd92eddc
Reviewed-on: https://code.wireshark.org/review/8320
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07 06:02:32 +00:00
Jeff Morriss
80358079fe Add/clarify some comments about how the Experimental-Result-Code AVP is handled.
Specifically we put Experimental-Result-Codes specified by 3GPP in the XML file
and let other vendors' codes be handled through a dissector table.

Change-Id: I2c3977fb959ad84faa5cb90aeb3d191c8b465ede
Reviewed-on: https://code.wireshark.org/review/8319
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-06 20:27:26 +00:00
Guy Harris
0f55a0f547 Have global_capture_opts if we either have pcap or extcap.
The extcap code uses it; if the intent is not to support extcap if you
don't have pcap, then don't enable it in the configure scripts/CMake.

Change-Id: I4af80a2e6f557134fa8c542ad3143f3e8ca555d4
Reviewed-on: https://code.wireshark.org/review/8318
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-06 19:53:46 +00:00
Guy Harris
8886fbd608 Fix some --without-pcap build problems.
Change-Id: Ic80de2bf2e2e047667784b8d19207f7f097b3d5c
Reviewed-on: https://code.wireshark.org/review/8317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-06 19:50:33 +00:00
Alexis La Goutte
abdfd88492 PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ia8eca42bae42fb139bfc63232c6d9bf05811ad39
Reviewed-on: https://code.wireshark.org/review/8280
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-06 17:12:28 +00:00
Gerald Combs
1e3be59fbe WildPackets → Savvius.
Change-Id: I2494c2b1dcc9e324535b3f659b51b44059c478bd
Reviewed-on: https://code.wireshark.org/review/8304
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-06 16:48:03 +00:00
AndersBroman
0e3d53aad8 [Thrift] Fix a copy-paste-o and add dissecton of T_BYTE
Change-Id: I2623d273a39393533c10568ef2f7642c05ac636c
Reviewed-on: https://code.wireshark.org/review/8311
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06 14:06:58 +00:00
Alexis La Goutte
67da8aeda1 GTPv2 : fix unused parameter 'tree' [-Werror=unused-parameter]
Change-Id: I01097889dd4a1c29135f50dcfb737ff50b0de2b7
Reviewed-on: https://code.wireshark.org/review/8310
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-06 13:09:38 +00:00
AndersBroman
7fcd7b0b8a [GTPv2] Add dissetion of IE Overload Control Information and Metric.
Change-Id: I8bd423ea41929bfd20cecf9d80a686f1b286082f
Reviewed-on: https://code.wireshark.org/review/8309
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06 11:35:19 +00:00
Alexis La Goutte
8e3c1e7085 THRIFT: Fix Mac Buildbot
packet-thrift.c:99: warning: declaration of 'tvb_captured_length' shadows a global declaration
packet-thrift.c:114: warning: declaration of 'tvb_captured_length' shadows a global declaration
packet-thrift.c:138: warning: declaration of 'tvb_captured_length' shadows a global declaration
packet-thrift.c:166: warning: declaration of 'tvb_captured_length' shadows a global declaration

Change-Id: I0ce4fc0bf6470f1b3a89de599346c1efe8bb93cf
Reviewed-on: https://code.wireshark.org/review/8308
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-06 10:56:41 +00:00
AndersBroman
b5a44d258b Add a THRIFT dissector.
Change-Id: I69f2a99bde5a9f8c4c969cdd9145838ac776521b
Reviewed-on: https://code.wireshark.org/review/8298
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06 10:26:44 +00:00
Michael Mann
050de6aa2f Set tap filter when WLAN "Limit to display filter" option is checked.
Bug: 11160
Change-Id: Ic2f1475a3b51eb8919435f1064fc0faf3c4da3eb
Reviewed-on: https://code.wireshark.org/review/8296
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>
2015-05-06 06:12:22 +00:00
Michael Mann
64c2bf7727 Fix the need to manually adjust packet-gias.c (take 2)
Need to have packet-gias.c in the DIRTY_CORBA_IDL_DISSECTOR_SRC grouping to work around the warnings still generated.

Change-Id: I08ea1f7d90577cc112b85e7fc00171827f58d6d2
Reviewed-on: https://code.wireshark.org/review/8266
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06 06:09:20 +00:00
Guy Harris
2cf2f36fb3 Fix configuration with --without-qt and with no --with-gtk[23].
If building with Wireshark wasn't explicitly disabled - i.e., if we are
building Wireshark, which means we are building an application with a
GUI - and Qt was explicitly disabled, and neither GTK+ 2 nor GTK+ 3 were
explicitly enabled, look for GTK+ 3.

Change-Id: Ib913355f7b483d065e766605aa88a71fa9984f36
Reviewed-on: https://code.wireshark.org/review/8306
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-06 05:38:25 +00:00