aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-18Qt: Don't clobber the itemview hover behavior on Windows.Gerald Combs1-0/+2
Change-Id: I47a8087a1d3303baec9b598135c3f8a3021dadbe Reviewed-on: https://code.wireshark.org/review/22707 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-18[Diameter] Add a couple of command codes from IANA.AndersBroman1-7/+7
Bug:13895 Change-Id: Icaffd828eef2853d73da807040e5f550548d2804 Reviewed-on: https://code.wireshark.org/review/22698 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-18Extend enterprises.tsv to accept spaces as separatorsJoão Valverde3-14/+13
We can do so easily because the format is so simple. This makes it more convenient for a user to hand-edit a dictionary in the personal config folder. We still use tabs in the system file for a small space gain. Also add a brief description of the format as a comment. Change-Id: If3f741bff16f1f42c8ef07d643dc6463caaad1a5 Reviewed-on: https://code.wireshark.org/review/22678 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-18ZigBee cleanup minor errorsChris Brandson6-72/+76
Alarm Code now correctly displayed as a byte Missing ZCL status codes from ZCL 6 and ZCL 7 have been added Input and Output Cluster Lists now displayed in hex as they are everywhere else The term Device is no longer used, instead Nwk Addr and Address are used as applicable Change-Id: I552f4b64974bf44088a1c8f90d44e5459a0f81a6 Reviewed-on: https://code.wireshark.org/review/22683 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>
2017-07-18LPP: upgrade dissector to v14.2.0Pascal Quantin7-428/+5106
Change-Id: I445c5ef34c1a688310042634eb38bed9b17cadaf Reviewed-on: https://code.wireshark.org/review/22679 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>
2017-07-18Do the meta-tag stuff the same way in all three cases.Guy Harris1-4/+8
Undo most of the changes, but turn the return at the end of the default case into a break. Change-Id: I022b62a85254ff188f19fd3d7c3fe40b0789b3d2 Reviewed-on: https://code.wireshark.org/review/22695 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-18Revert "Don't byte-swap an 1-byte value."Guy Harris1-3/+1
This reverts commit 74a2ae4abac3be78d140d9671fa79977de449ed1. No, that's just Coverity not understanding macros *again*, and thinking a particular expanded instance of a macro is the result of some human being silly rather than of the arguments being such that some computations can be elided at compile time. Change-Id: I40f2ad8bf018b0df02d90ed0e272505be68dae7e Reviewed-on: https://code.wireshark.org/review/22693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-18CQL: Fixes the dissector so PREPARE Results have the Query IDSimon Vans-Colina1-2/+4
Change-Id: I518335dc317ac5fb3c1339686579ff44b73c2546 Reviewed-on: https://code.wireshark.org/review/22675 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-18Qt: Fix "Filter Button Preferences" shortcutStig Bjørlykke2-1/+3
When Expert preference UAT was promoted to main preference tree the entry for Filter Buttons was moved and the code for handling prefs_pane_to_item_ was wrong. This should be rewritten to a bulletproof solution. Change-Id: I1d98aa75da7107ac2e50b29ff19c52dc516053a6 Fixes: v2.5.0rc0-386-gd4d30faeb8 Reviewed-on: https://code.wireshark.org/review/22676 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-18Remove unnecessary test.Guy Harris1-4/+1
The default case ends with return, so the pointer won't be null by the time out exit the case statement - either a non-default case is processed and tag_ptr hasn't been set to null, or the default case is processed and you return before getting there. That also means we don't need to set tag_ptr to null in that case. Fixes CIDs 1415436. Change-Id: I21ada7a308d888b4cbb8557197a2e30bda118f44 Reviewed-on: https://code.wireshark.org/review/22691 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-18Don't byte-swap an 1-byte value.Guy Harris1-1/+3
Convert it to a 4-byte value and byte-swap *that*. Fixes CID 1415438. Change-Id: I5cf0b5905f5dd2086c5d8ed6b13b1921bdb69a84 Reviewed-on: https://code.wireshark.org/review/22689 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-18Remove unnecessary test.Guy Harris1-3/+1
The default case ends with return, so the pointer won't be null by the time out exit the case statement - either a non-default case is processed and tag_ptr hasn't been set to null, or the default case is processed and you return before getting there. That also means we don't need to set tag_ptr to null in that case. Fixes CID 1415439. Change-Id: Id2609c0828561c560820f9cb5e6b5a0ae614aead Reviewed-on: https://code.wireshark.org/review/22686 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-18Copy no more than MAX_ERF_EHDR - 1 additional extension headers.Guy Harris1-1/+7
The array of headers has MAX_ERF_EHDR entries, and the additional entries are appended after the first entry, so that leaves room for at most MAX_ERF_EHDR - 1. Fixes CID 1415440. Change-Id: Iaa2c3577bbff429bcc1301e4cfdf1961f067be93 Reviewed-on: https://code.wireshark.org/review/22684 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-17Qt: Simplify some version checks.Gerald Combs2-8/+8
We require Qt5 at configure time on macOS, so we no longer need to exclude Qt4 + macOS in the code. Change-Id: I9e233f963526b0051bd846d171105c1d33d1c4cc Reviewed-on: https://code.wireshark.org/review/22677 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-17Use time_t for the seconds part of a time stamp.Guy Harris1-6/+6
A packet time stamp is an nstime_t, and the seconds part of an nstime_t is a time_t. Change-Id: Id2452ceb2f33f43e4a040436d7b3ea1a5c4a0be3 Reviewed-on: https://code.wireshark.org/review/22673 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-17.gitignore: Add ignore to moc file on new qt subfolderAlexis La Goutte1-6/+5
See https://www.wireshark.org/lists/wireshark-dev/201706/msg00157.html and https://code.wireshark.org/review/#/c/22422/ for new folder Change-Id: If1ed71b844164fdf7a438d47244a0ad0e18b432b Reviewed-on: https://code.wireshark.org/review/22528 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-17802.11: fix SNR Report for 802.11ad is not decoded correctlyAlexis La Goutte1-2/+2
Wrong BITMAP Bug: 13892 Change-Id: I525c6d7534543f03db023bb43df2484531d43931 Reviewed-on: https://code.wireshark.org/review/22666 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-17ZigBee: Implemented zigbee zcl prepay dissectorMartin Boye Petersen1-11/+987
Change-Id: I61feeae7d20ad67ecb86fc53708f04e051fd88c7 Reviewed-on: https://code.wireshark.org/review/22655 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>
2017-07-17Fix formatting of AUTHORS list, fix Perl warningPeter Wu2-2/+5
Fixes the following warning in Perl 5.26: Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/(.*){ <-- HERE / at doc/make-authors-short.pl line 36. While at it, fix formatting of the AUTHORS-SHORT file, a newline must be present after "}" or the file will be mis-parsed. Change-Id: I76bc1a30714dafd703342d2d430dc1c90cf2bf82 Reviewed-on: https://code.wireshark.org/review/22637 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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>
2017-07-17Qt: Expand column preferences text edit fields to column widthStig Bjørlykke1-0/+3
When editing a custom column the text edit field should fill the column. Change-Id: I5505238d13c4dbe26e9dbc4ae60fd602120f9596 Reviewed-on: https://code.wireshark.org/review/22657 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>
2017-07-17Rename cf_get_comment() to reflect what comment it gets.Guy Harris5-9/+25
Change-Id: Id3b0430a1d462b29833259462536ed4cb0424f77 Reviewed-on: https://code.wireshark.org/review/22662 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-17Rename section comment get/set routines.Guy Harris6-14/+18
Rename cf_read_shb_comment() to cf_read_section_comment(); an SHB is a record type in a particular capture file format (pcapng), and not all files that have per-file or per-file-section comments have something called a Section Header Block. Rename cf_update_capture_comment() to cf_update_section_comment(); pcapng, at least, supports multiple sections, although we don't curently support that. This also gives them matching names. Change-Id: Idd8cb0f0fd9125b9626411274aebfb1ec0097665 Reviewed-on: https://code.wireshark.org/review/22659 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-17ERF_TYPE_META write and comment supportAnthony Coddington10-182/+1935
Support per-packet comments in ERF_TYPE_META through a new Anchor ID extension header with per-Host unique 48-bit Anchor ID which links an ERF_TYPE_META record with a packet record. There may be more than one Anchor ID associated with a packet, where they are grouped by Host ID extension header in the extension header list. Like other ERF_TYPE_META existing comments should not be overwritten and instead a new record generated. See erf_write_anchor_meta_update_phdr() for detailed comments on the extension header stack required. As Wireshark only supports one comment currently, use the one one with the latest metadata generation time (gen_time). Do this for capture comment too. Write various wtap metadata in periodic per-second ERF_TYPE_META records if non-WTAP_ENCAP_ERF or we have an updated capture comment. Refactor erf_dump to create fake ERF header first then follow common pseudoheadr and payload write code rather than two separate code paths. Support an ERF_HOST_ID environment variable to define Wireshark's Host ID when writing. Defaults to 0 for now. ERF dissector updates to support Anchor ID extension header with basic frame linking. Update ERF_TYPE_META naming and descriptions to official name (Provenance) Core changes: Add has_comment_changed to wtap_pkthdr, TRUE when a packet opt_comment has unsaved changes by the user. Add needs_reload to wtap_dumper which forces a full reload of the file on save, otherwise wireshark gets confused by additional packets being written. Change-Id: I0bb04411548c7bcd2d6ed82af689fbeed104546c Ping-Bug: 12303 Reviewed-on: https://code.wireshark.org/review/21873 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Donnelly <stephen.donnelly@endace.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-17Qt: More Main Welcome interface tweaks.Gerald Combs3-14/+12
ge036f4a282 didn't ensure that an interface was selected at app startup. Change-Id: I0b04020a344aaf8e35766a45287fe263d1227c64 Reviewed-on: https://code.wireshark.org/review/22656 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-16GPRSCDR: decoding of GPRS/UMTS QoS-informationJoakim Karlsson5-9/+44
Change-Id: Ia912925f689d2912c62d01fcc8230065204b6f15 Reviewed-on: https://code.wireshark.org/review/22633 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Qt: Main Welcome hover text color fix.Stig Bjørlykke1-0/+1
Use the default text color for hovered items. This makes the selected item look the same as non-selected items when hovering. Change-Id: Ic9e18323326f088202207ac15f844e7849f7ebc9 Ping-Bug: 12636 Reviewed-on: https://code.wireshark.org/review/22632 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>
2017-07-16Qt: Expand IO Graph text edit fields to column widthStig Bjørlykke1-0/+4
When editing a IO Graph the text edit field should fill the column. Change-Id: Idb5c9a7004d9be1b82e645ae2c1a3430c9c9e5f7 Reviewed-on: https://code.wireshark.org/review/22626 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>
2017-07-16Qt: Set IO Graph display filter when having Y fieldStig Bjørlykke1-4/+12
Calling setFilter() between setValueUnits() and setValueUnitField() will fail when having "Y Field" because check_field_unit() fails with inconsistent values. The display filter will then be ignored. Call setFilter() first to ensure filter_ is set before setting value units. setFilter() does not depend on the value unit when used to set the display filter. Change-Id: Ibf2d37fddcce9fcf6febebfefa0b2518ae093737 Fixes: v2.3.0rc0-2930-g0ea51ad822 ("Qt: Fix uninitialized memory access in val_units_") Reviewed-on: https://code.wireshark.org/review/22619 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>
2017-07-16[Automatic update for 2017-07-16]Gerald Combs11-5661/+4656
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I01c07ea17d54e5518659abac5cd3c8c9ddfea5e6 Reviewed-on: https://code.wireshark.org/review/22647 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-16Qt: add initializers (CID 1162824).Dario Lombardo1-0/+2
Change-Id: I46f56fb99c75eebc6418fa7ac88995f49abedc91 Reviewed-on: https://code.wireshark.org/review/22645 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16bthci-evt: decrement number_of_loops to avoid hang (CID 1399639).Dario Lombardo1-0/+1
Change-Id: Ib8af835a331582677a391c59d145530cf0590122 Reviewed-on: https://code.wireshark.org/review/22644 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Qt: refactor UatTreeView into something reusablePeter Wu11-34/+62
UatTreeView had two functions: 1. Saner navigation functionality when pressing tab. 2. Start editing when the currently selected item changes. Since this tab navigation functionality is desired in more places, extract this functionality. Add more documentation while at it and use an alternative, declarative style to connect signals. Move the second functionality to the caller since not all views need it. Change-Id: Ibe886f2c2763dbe024614203a44b72173fbbce06 Reviewed-on: https://code.wireshark.org/review/22639 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16ssl,dtls: make some fields in RSA keys dialog optionalPeter Wu3-18/+17
The IP address has been unused since 2.0. The port/protocol fields have become unnecessary since 2.4 with the introduction of Decode As. Do not require the user to specify these fields if they just want to set the RSA key file. In a future version, these three fields will be completely removed. Change-Id: Iefc5a8778aa1122b76b707018c00b6ec429dc107 Reviewed-on: https://code.wireshark.org/review/22640 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16.mailmap: fix duplicates and regenerate AUTHORSPeter Wu2-2/+12
Change-Id: I1332c63d59edf5b2a2ac8fe605d6f15cf6afa4ae Reviewed-on: https://code.wireshark.org/review/22638 Reviewed-by: Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> Reviewed-by: Jonathan M Munoz S <jonathan.munoz@inria.fr> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Qt: show UAT description for header itemsPeter Wu1-2/+11
Be sure to display the extended description for UAT fields in the tooltip for the column header like GTK+ did. Change-Id: I294d2d3fb7f6d55df239129bea5d780b15deacc6 Reviewed-on: https://code.wireshark.org/review/22641 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Ignore .moc.cpp files in ui/qt/widgets.Guy Harris1-0/+1
Change-Id: Ie709b9a13f1f2a76b355ffebeadbed0e47d90d2a Reviewed-on: https://code.wireshark.org/review/22636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-16Another enterprises -> enterprises.tsv rename.Guy Harris1-1/+1
Change-Id: I59dcc7fa066d75ba14f5f7bf645a8eb24839db1c Reviewed-on: https://code.wireshark.org/review/22635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-16Fix for building without libpcap and extcap.Guy Harris1-0/+2
(A further fix should be "don't put the "Capture" section into the welcome screen if we have neither libpcap nor extcap".) Change-Id: I83e65e6dc31040292af7fe88ccd73e485613c76f Reviewed-on: https://code.wireshark.org/review/22634 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-16Qt: fix build without libpcap and without extcapPeter Wu1-0/+4
global_capture_opts is only defined when libpcap or extcap are enabled. Change-Id: If692a7ac365b77d9efc52f589fef1aa906d5d14e Fixes: v2.5.0rc0-425-ge036f4a282 ("Qt: Main Welcome behavior tweaks.") Reviewed-on: https://code.wireshark.org/review/22629 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-15Qt: Main Welcome behavior tweaks.Gerald Combs3-16/+34
Update the recent item list and interface tree style sheets so that hovered items have a different background color. This should make it more obvious that they can be clicked. Select the default interface (or failing that, the first interface) at application startup and focus on the interface tree. This should make it less likely that the user will start typing in a capture filter with the wrong (or no) interface selected. Note that we should probably track selected interfaces in the recent file instead of forcing the user to select one via the preferences. This should hopefully address some of the issues in bug 12636 and do so without changing the layout (which we can do in another commit). Change-Id: I96a417973f4270a70f41d04c40c4947a09613bdc Ping-Bug: 12636 Reviewed-on: https://code.wireshark.org/review/22627 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>
2017-07-15Rename enterprises to enterprises.tsv and ship it.Gerald Combs9-5/+13
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 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>
2017-07-15Qt: implement saner tab navigation for coloring rules dialogPeter Wu5-1/+134
The default QTreeView/QTreeWidget behavior for (Shift-)Tab navigation is to select the previous/next row. For data entries with multiple columns (such as the UAT dialog or the coloring rules dialog), column navigation is closer to what a user would expect, so implement that. Bug: 13856 Change-Id: Ib585030380f894e0be214a95107cb264afac7eee Reviewed-on: https://code.wireshark.org/review/22561 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>
2017-07-15Add AMT (Automatic Multicast Tunneling) RFC7450 dissectorAlexis La Goutte4-0/+353
Change-Id: Ic5e52b76e84e1d02d614b34980f94fd1288c9760 Reviewed-on: https://code.wireshark.org/review/22594 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>
2017-07-15MP2T: Add video/mp2t media-typeUli Heilmeier1-0/+1
Add video/mp2t media-type to dissect MP2T inside HTTP Bug: 13888 Change-Id: I8af9727bd69ab28a21811a807a1f631bde952926 Reviewed-on: https://code.wireshark.org/review/22623 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: Michael Mann <mmann78@netscape.net>
2017-07-14vsock: add missing vsockmon header reserved fieldStefan Hajnoczi1-0/+7
The vsockmon packet header is defined in <linux/vsockmon.h> as follows: struct af_vsockmon_hdr { __le64 src_cid; __le64 dst_cid; __le32 src_port; __le32 dst_port; __le16 op; /* enum af_vsockmon_op */ __le16 transport; /* enum af_vsockmon_transport */ __le16 len; /* Transport header length */ __u8 reserved[2]; }; The vsock dissector forgot to include the 2-byte reserved field. This caused the transport header and payload that follow the vsockmon header to contain junk data. Change-Id: I0e7e6f1d9ad96ab339bd070c1becf43bc7e6a6b1 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-on: https://code.wireshark.org/review/22612 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-07-14vsock: add WTAP_ENCAP_VSOCK constantStefan Hajnoczi4-1/+17
A linktype was recently assigned to Linux vsock in libpcap commit cfdded36ddcf5d01e1ed9f5d4db596b744a6cda5 ("added DLT_VSOCK for http://qemu-project.org/Features/VirtioVsock"). The Wireshark vsock dissector can now be automatically applied when wtap_encap matches the new WTAP_ENCAP_VSOCK constant. This patch makes Wireshark dissect vsock packet captures without manually specifying the dissector. Change-Id: If252071499a61554f624c9ce0ce45a0ccfa88d7a Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-on: https://code.wireshark.org/review/22611 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-07-14SMB2: add sessionkey table in prefs for decryptionAurelien Aptel1-31/+162
Add table in SMB2 protocol options to store Session ID => Session Key mappings. If we find a matching session id while dissecting, use session key from the table to derive crypto keys used for decryption. Sample from https://wiki.wireshark.org/SampleCaptures#SMB3_encryption can be loaded as follows: tshark -ouat:smb2_seskey_list:3d00009400480000,28f2847263c83dc00621f742dd3f2e7b -r smb3-aes-128-ccm.pcap To obtain the session id and key you can compile your kernel with CIFS_DEBUG_KEYS enabled and all the info should be printed on the console when cifs.ko generates keys. The patch that adds this config option was merged recently and should appear in the not-yet-released 4.13 kernel. Alternatively you can read the keys from live memory on a x86_64 system by running a gdb script as root (see email [1] for usage and source [2]). [1]: https://lists.samba.org/archive/samba-technical/2017-May/120755.html [2]: http://lists.samba.org/pipermail/samba-technical/attachments/20170524/2950140e/cifs_dump_keys.py Change-Id: I2709bb5fb316a4a3614901efe967196c2925609a Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/21711 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>
2017-07-14SIP: Add Status Code 607 (Unwanted)Uli Heilmeier1-0/+1
RFC 8197 defines the new status code 607 Unwanted Change-Id: I61299788b25f5ada460c88949bed3cabddc3908f Reviewed-on: https://code.wireshark.org/review/22618 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>
2017-07-14[print.c] g_slist_free_full requires #include <wsutil/glib-compat.h>AndersBroman1-0/+1
Change-Id: Iba3a95d67413d7f1a84436fc51dfdf13251bcece Reviewed-on: https://code.wireshark.org/review/22620 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-14Remove some unneeded includes.Gerald Combs1-5/+0
Change-Id: I513936a74fe96211153fdf35f1832608b2cd053d Reviewed-on: https://code.wireshark.org/review/22617 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 08:12:50 +0000