Commit Graph

58853 Commits

Author SHA1 Message Date
Gerald Combs 26dacfc8c3 Qt: Add protocol preferences menus.
Add protocol preferences in the packet list and packet detail context
menus. Note that we need a PreferencesEditorFrame in the main window for
editing numeric and string preferences. For now we just show the prefs
dialog.

Change-Id: Ice0cc8e9bc25963cc14aa47698f042f2a73088d8
Reviewed-on: https://code.wireshark.org/review/8957
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-06-17 01:25:27 +00:00
Gerald Combs d5215c2ef6 Save the wireless toolbar recent settings.
Change-Id: I2b0417b7dae8679e80f30de2cd10c7bb6fdc1dbf
Reviewed-on: https://code.wireshark.org/review/8956
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16 19:21:45 +00:00
Guy Harris c3335fb287 Don't include <wsutil/frequency-utils.h> if it's not needed.
Change-Id: I7c958a31681defb5297428fdb77aa43462b2d160
Reviewed-on: https://code.wireshark.org/review/8953
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 19:04:21 +00:00
Gerald Combs 6c4ec4aedb Qt: Make sure we have usable command line arguments.
Call arg_list_utf_16to8 in wireshark-qt.cpp on Windows. Set our default
codec in Qt4 to UTF-8 before doing so.

Bug: 11276
Change-Id: I8e0afb9523ddb5956d30424b7b7ad7f3ea0838c7
Reviewed-on: https://code.wireshark.org/review/8954
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16 18:58:54 +00:00
Guy Harris 200c15e96d Pass the pseudo-header to wtap_encap dissectors via the "data" argument.
Have the "data" argument to dissectors registered in thw wtap_encap
dissector table point to the pseudo-header for the packet.

Use that argument in the Bluetooth dissector.

Change-Id: I022bbfb796ef51d95df09fb952a149960170d631
Reviewed-on: https://code.wireshark.org/review/8951
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 17:52:14 +00:00
Gerald Combs 46a9afb462 Disable AirPcap by default in Autotools.
Note that we might want to remove the check entirely.

Change-Id: Ie0003abc64cd6f47c4f49770beb5d418995e939a
Reviewed-on: https://code.wireshark.org/review/8950
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16 15:58:47 +00:00
AndersBroman 7525cacf40 [Qt] Delete generated file config.pri at "clean"
Change-Id: Ia8469a91eebf92bf8349d2507bdfcfdba55da916
Reviewed-on: https://code.wireshark.org/review/8949
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 11:23:05 +00:00
Etienne Millon a0b0f37a62 PKCS12: fix a duplicate OID
The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above.
Its correct definition can be found in  RFC7292, whose relevant parts are in
pkcs12.asn.

Note that the capitalization is not consistent in the RFC (pbeWith/pbewith).
I used the same convention.

Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72
Reviewed-on: https://code.wireshark.org/review/8928
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-16 09:21:39 +00:00
Adam Pridgen c392db5b08 TLS Decryption is now possible with a user provided PMS and Client Random values
Bug: 11263
Change-Id: I1476948ed823fc34de2cecdeb1bddafccbb8ec39
Reviewed-on: https://code.wireshark.org/review/8803
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-16 08:31:51 +00:00
Michal Labedzki a1859b7254 Qt: Remove redundant actions from UI file
Change-Id: Ia571844a2729683ef5f9487fca0aa9d5fd09b235
Reviewed-on: https://code.wireshark.org/review/8948
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-16 06:56:57 +00:00
Tom Haynes 220aa51804 packet-nfs: For flexfiles the versions is now an array
Change-Id: I1b61f6a91fbd3553106d1a9a8aba56db1894a010
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/8940
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:13:06 +00:00
Weston Andros Adamson 112f8e6935 packet-nfs: flexfiles now uses string uid/gid
And no longer uses opaque_auth

Change-Id: I272e1c5c1391dac977ad850b899505a28c42b6fd
Reviewed-on: https://code.wireshark.org/review/8939
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:11:55 +00:00
Weston Andros Adamson 5f03f02341 packet-nfs: update to draft 05 of flexfiles xdr
Change-Id: I7a4e99242365a6fd7c0fa81c6bc97cbe01a00763
Reviewed-on: https://code.wireshark.org/review/8938
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:10:21 +00:00
Peng Tao 9c1f6ddec7 packet-nfs: flexfile getdeviceinfo needs to decode rsize/wsize
Change-Id: I67239a7cd1ea63499e5ee1956a2a5ac7b8191f9e
Reviewed-on: https://code.wireshark.org/review/8936
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:09:08 +00:00
Weston Andros Adamson e439bf6cec packet-nfs: flexfile getdeviceinfo support
Change-Id: I7ba0720f4f1dcf15d257d5358226e82b4ee7d2d9
Reviewed-on: https://code.wireshark.org/review/8935
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:06:33 +00:00
Weston Andros Adamson 3de93e711e packet-nfs: flexfile layoutget support
Change-Id: Idd162119b1fdc6747452b9a13ef580705567983e
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/8934
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:02:52 +00:00
Weston Andros Adamson 15593da67e packet-nfs: switch on layout type for getdeviceinfo
We can only parse file layout ds addrs, treat all other layouts as having
opaque data.

Change-Id: I50892dbdbd6785d8216e2d8725da7bec0c554ee2
Reviewed-on: https://code.wireshark.org/review/8933
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16 06:00:53 +00:00
Gerald Combs dd8b7ca992 Check for NL and AIRPCAP defines.
This should hopefully fix compilation on OS X.

Change-Id: I621c92499232dafb6d6db867615baed8dc81eb17
Reviewed-on: https://code.wireshark.org/review/8947
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16 05:07:37 +00:00
Gerald Combs ece4b01f21 Add the wireless toolbar.
Add the wireless toolbar to the Qt UI.

Start adding AirPcap support to ui/80211_utils. Add FCS validation
routines to ws80211_utils.

Move a bunch of AirPcap routines that require epan from caputils to
ui/gtk. They were required for driver key management, which we'll
leave to the AirPcap Control Panel in the Qt UI.

Move frequency-utils to wsutil.

Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1
Reviewed-on: https://code.wireshark.org/review/8910
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-06-16 03:45:54 +00:00
Guy Harris 2a3fa14185 wtap_encap dissectors don't get passed a media type name as data.
Get rid of stuff probably left over from copying-and-pasting a
lines-of-text dissector that *did* register for a media type.

Change-Id: I1197b254dd66d82883a4078c043f5cf1b2777e17
Reviewed-on: https://code.wireshark.org/review/8946
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 03:38:14 +00:00
Guy Harris 8baf88b8c2 Don't assume we get passed a null data pointer for JSON files.
That assumption will cease to be valid in the future.

Change-Id: I021900c7a2f18f94e24cf6d372bb0c5e6fa3fdfe
Reviewed-on: https://code.wireshark.org/review/8945
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 03:32:51 +00:00
Guy Harris 3d176c901c Clean up whitespace.
Change-Id: I5db2f0cdb2e5339d4f0fa1f8d1ce9b3866d640fb
Reviewed-on: https://code.wireshark.org/review/8944
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 03:24:58 +00:00
Guy Harris 68e65021e0 Clean up handling of metadata in Bluetooth dissectors.
Make the "previous protocol data" union in bluetooth_data_t a
discriminated union, and use the discriminator to decide whether to use
a given member of the union or not (or to check whether the member you
plan to use is valid).

Have separate top-level dissectors depending on what the data type
pointed to by the "data" argument is.

Use that member to point to pseudo-header metadata, and, for now, set it
to point to the appropriate pinfo->pseudo_header value; eventually, we
plan to pass the pseudo-header pointer in as the "data" argument from
the "frame" dissector.

Don't overwrite the pseudo-header in the packetlogger dissector -
construct a new one and pass it in.

Change-Id: Ia1ef71e7082a964c5d92d47221f8c00e32f3f087
Reviewed-on: https://code.wireshark.org/review/8943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 03:23:51 +00:00
Gerald Combs 60ab49592b Accept drop events immediately.
Accept drop events before opening our capture file instead after.

Change-Id: I48fe1cd1e3b5e6f7b076aaa0e3a0d035938a5af7
Reviewed-on: https://code.wireshark.org/review/8929
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-15 23:53:27 +00:00
Guy Harris 34124c857e Define XXX_phdr structures in the order in which they appear in the union.
Change-Id: Ia1fe1758998237a344889bdf8215ecfba7b871ee
Reviewed-on: https://code.wireshark.org/review/8942
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-15 21:10:35 +00:00
Guy Harris 560180b80a Move some structures used only in pcap-common.c there.
Those aren't pseudo-headers exported from libwiretap, they're just
structures corresponding to the pseudo-headers for some pcap/pcap-ng
link-layer header types.

Change-Id: Iec37cfc162b64adacdeb57e14e546bced7b673fa
Reviewed-on: https://code.wireshark.org/review/8941
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-15 21:03:18 +00:00
Graham Bloice 678c5d5da6 Fix the CMake windows installer to pickup the locally built zlib1.dll
Change-Id: I8880a760d9817dd038694e96b4a3d9b8d2db3c2c
Reviewed-on: https://code.wireshark.org/review/8931
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-15 20:30:31 +00:00
Bill Meier 86285d552e [vsip] Fix 2 minor bugs; Do some minor cleanup
Bugs: Incorrect bytes pane highlighting in certain cases.

Change-Id: I6f0fd4e3f7f1599c20524c8715ef831668b7391f
Reviewed-on: https://code.wireshark.org/review/8932
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-15 20:11:24 +00:00
Pascal Quantin c1ebd209d4 GTP: put T-PDU Data item under GTP tree
Otherwise it is put in the top tree, which seems a bit surprising (as seen in the attachment for bug 11271)

Change-Id: I0e7f9c89d8ecaeecc3a951893e10154bc11927d3
Reviewed-on: https://code.wireshark.org/review/8927
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15 19:57:10 +00:00
Alexis La Goutte 5a4f44a93e TFS: Mutualize Response/Request TFS
move tfs_response_request to epan/tfs.[ch] and use this

Change-Id: I29d5894fade721b5234649a7c2d83dd1d6a19a0d
Reviewed-on: https://code.wireshark.org/review/8930
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15 19:55:58 +00:00
Robert Cragie cedaa0d7f3 Support for MPL
(https://tools.ietf.org/html/draft-ietf-roll-trickle-mcast-12)

Change-Id: Idde0f0ef6c23b4c91f08fed1d5b18c68e8c5cf4e
Reviewed-on: https://code.wireshark.org/review/8885
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>
2015-06-15 14:36:19 +00:00
Graham Bloice aeb6419145 Separate Windows CMake compiler definitions and flags
Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238
Reviewed-on: https://code.wireshark.org/review/8926
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-15 14:34:41 +00:00
Birol Capa 75ddc454f1 Profinet: Combined Object Container is added.
An IO device may define so called “combined objects”.
A particular combined object is a group of related submodules, e.g. an interface and its ports.
The Combined Object Container holds the parametrization for all submodules.

Change-Id: Ifb6c63d2c3a1d3cf2cf100a8f54cf0eafa84fe6c
Reviewed-on: https://code.wireshark.org/review/8853
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>
2015-06-15 12:33:26 +00:00
Pascal Quantin 1131398db3 PCP: fix dissection of R bit
Request and response values were inverted.

Bug: 11278
Change-Id: I9b337f423055578252cc01211d74c77837b7ae87
Reviewed-on: https://code.wireshark.org/review/8924
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-15 12:09:43 +00:00
Hiroaki KAWAI 960d310e52 openflow_v4: oxm_length includes experimenter
As defined in section 7.2.3.10 "Experimenter
Flow Match Fields" of openflow-switch v1.3.5 spec.

Change-Id: I7268f614417720f225a22b226c8f21603b7f2d0f
Reviewed-on: https://code.wireshark.org/review/8882
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-06-15 11:00:35 +00:00
Peter Wu c11a912b6f icmp,wimax: Fix undefined shift
Fixes these warnings reported by Undefined Behavior Sanitizer (UBSan)
while running the test suite:

    icmp: left shift of 55099 by 16 places cannot be represented in type 'int'
    wimax: left shift of 1 by 31 places cannot be represented in type 'int'

Change-Id: I72913a901b61033098750da9c8f1617b055999a1
Reviewed-on: https://code.wireshark.org/review/8913
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: Anders Broman <a.broman58@gmail.com>
2015-06-15 10:55:35 +00:00
Michal Labedzki 7102a06811 Qt/Bluetooth: Add Devices dialogue
Please found it under Bluetooth menu. It shows all devices found
in logs, not only connected, all that its address can be found in
logs. Show if device is local (in most cases: capturing on it side)
and manufacturer and LMP version what should answer the question what
version of Bluetooth is used by Bluetooth device chip.
Also firmware version.

Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1
Reviewed-on: https://code.wireshark.org/review/8901
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-15 05:40:25 +00:00
Gerald Combs 9fb6ec6c89 Qt: Add the ability to show preferences by module name.
Currently unused, but allows feature parity with the GTK+ UI.

Change-Id: I33e0bfb434949aabd75ecd2ed36e696731195542
Reviewed-on: https://code.wireshark.org/review/8922
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-06-15 02:02:41 +00:00
Guy Harris 6625cf5e52 Clean up the ATM dissection a bit.
Have separate dissectors for ATM MPLS pseudo-wire traffic and regular
traffic.  That way, we can handle the regular traffic dissectors being
handed private data, e.g. an ATM pseudo-header from libwiretap.

Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a
Reviewed-on: https://code.wireshark.org/review/8921
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:51:04 +00:00
Martin Kaiser 0e721578ee ZVT: add the transaction struct as an argument to the payload functions
Change-Id: Idec2ca4f2db7a10e96c7acb030e0619c4f607b73
Reviewed-on: https://code.wireshark.org/review/8920
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-14 21:08:27 +00:00
Martin Kaiser ea7896a506 ZVT: check the minimum apdu length
Change-Id: Ie86519345556b4a674ff1c7b4527de7219b2a539
Reviewed-on: https://code.wireshark.org/review/8919
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-14 21:07:53 +00:00
Gerald Combs f661b3c99e Include QUrl.
It's apparently required by Qt4.

Change-Id: Ic5f32b9acd0a244477b7631bff39b3ed5ba86a39
Reviewed-on: https://code.wireshark.org/review/8918
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14 18:30:31 +00:00
Gerald Combs d42e0f7f12 Qt: Enable Drag and Drop in the main window.
Change-Id: I446163dd9e1a277118caab2f7296a3605cb23fd5
Reviewed-on: https://code.wireshark.org/review/8917
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14 18:06:35 +00:00
Gerald Combs 5432151d16 [Automatic update for 2015-06-14]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id3ff0d609b0a34066c3d23053b8d8bbebfc43070
Reviewed-on: https://code.wireshark.org/review/8914
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14 15:34:05 +00:00
Peter Wu eaf702bdcc ber: fix undefined shift
Fixes this UBSan warning:

    epan/dissectors/packet-ber.c:1917:23: runtime error: left shift of
        54645397829836991 by 8 places cannot be represented in type
        'long int'

Integers are two's complement, so really just cast it to unsigned to
avoid undefined behavior and still set the upper bit.

Change-Id: Ia5d080ae8b9dd39aef5e700daeede5c235b425ea
Reviewed-on: https://code.wireshark.org/review/8908
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-14 13:23:09 +00:00
Pascal Quantin 8e746bdd20 MPLS: always display payload when no 'Decode As' preference is set
Based on the heuristic suggested by Jasper, check whether ethertype matches
IPv4, ARP, RARP, VLAN or IPv6 and decode payload as Ethernet PW (CW heuristic)
by default. Otherwise display payload as data by default.
This can be overridden by the 'Decode As' configuration.

Follow up of g7ca0472

Bug: 11271
Change-Id: Idb2ce1f8b967813a8f4a5e29e6005d5442729395
Reviewed-on: https://code.wireshark.org/review/8912
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>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-13 16:15:36 +00:00
Graham Bloice a57398dacb Fix some CMake compiler tests for Win64
Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7
Reviewed-on: https://code.wireshark.org/review/8909
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-12 20:36:37 +00:00
David Ameiss 905506fd98 Cleanup and hardening for the Aeron dissector.
Change-Id: Iee544315401784b097ab05e6de5e5c950b622c80
Reviewed-on: https://code.wireshark.org/review/8877
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12 20:36:07 +00:00
Petr Gotthard a7f2b7f1de AMQP 1.0: Fix dissection of UUID datatypes
Set a correct data length: 16-bytes, not 1-byte. And use the
standard function to print the uuid.

Change-Id: Ic4cc8d8de3f469e43664fbd7f6eb89083dc83be6
Reviewed-on: https://code.wireshark.org/review/8905
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12 13:18:50 +00:00
Petr Gotthard 70fa77f1a3 AMQP 1.0: Don't treat decimal[32|64|128] as packet errors
Packets with a decimal datatype should be correctly dissected.
Yet, we still cannot display the decimal floating-point numbers as
there is no support in printf and glib.

Change-Id: I48a6dafd1e12ab55f660fad37a759dd16a9cf4b1
Reviewed-on: https://code.wireshark.org/review/8902
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12 13:16:38 +00:00