aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-08-23Fix potential oob write crashesUlf2-10/+10
Bug: 13847 Change-Id: I3a706db25204fe4c1fd1b7be3b17b8c55365dccf Reviewed-on: https://code.wireshark.org/review/23169 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-23packet-bgp.c: using wmem_packet_scope() for decode_evpn_nlri_esiMichael Mann1-7/+6
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2736 Bug: 13995 Change-Id: Ia304251249e023a77a8fa3a650ef1640c3c2f314 Reviewed-on: https://code.wireshark.org/review/23168 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-22Fix a typo.Gerald Combs1-1/+1
Change-Id: I26fb82c00ef3ac1343930e473294a3aa338f3f96 Reviewed-on: https://code.wireshark.org/review/23164 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-22Use the Wayback Machine for the PDML spec.Guy Harris1-1/+1
It's not available at the old URL any more. Change-Id: Id8baba5e02cf0e3227365f53a11caa054ef2c40f Reviewed-on: https://code.wireshark.org/review/23165 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-22commandline: fix compilation without pcap.Dario Lombardo1-1/+1
Change-Id: I37b9dd3f9515948a5ccf72cd2fd76fc1251c9294 Reviewed-on: https://code.wireshark.org/review/23161 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-08-22Qt: fix compilation without pcap.Dario Lombardo1-0/+2
Change-Id: I277059e018a41ea011043d255508db4c5f05f63d Reviewed-on: https://code.wireshark.org/review/23162 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-08-22Fix requesting hardware timestamps without -kAhmad Fatoum5-0/+14
The interface_options struct passed to dumpcap is populated differently when running Wireshark with and without -k. Previously, only with -k was there a valid pointer in interface_opts.timestamp_type Fixes: aca55a2 ("Add hardware timestamping support") Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com> Change-Id: Ic7ecc5a1190c28197d6a7271f1b353f74d43ca61 Reviewed-on: https://code.wireshark.org/review/23160 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-08-22WSUG+WSDG: Add a typographic conventions section.Gerald Combs11-93/+154
Create a common_src directory for common guide content. Add a typographic convention section. Update some of the content accordingly. Change-Id: I4f69c0f52a985c48e07fa0628b19734ec691f74e Reviewed-on: https://code.wireshark.org/review/23131 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-08-22Add hardware timestamping supportAhmad Fatoum22-102/+379
pcap provides a pcap_set_tstamp_type function, which can be used to request hardware timestamps from a supporting kernel. This patch adds support for aforementioned function as well as two new command line options to dumpcap, wireshark and tshark: --list-time-stamp-types List time stamp types supported for the interface --time-stamp-type <type> Change the interface's timestamp method Name choice mimics those used by tcpdump(1), which already supports this feature. However, unlike tcpdump, we provide both options unconditionally. If Wireshark was configured without pcap_set_tstamp_type being available, --list-time-stamp-types reports an empty list. Change-Id: I418a4b2b84cb01949cd262aad0ad8427f5ac0652 Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com> Reviewed-on: https://code.wireshark.org/review/23113 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-22HTTP2: pass in the media type parameters to the media type dissectorRyan Doyle1-3/+61
A full media type could be "text/html; charset=utf-8". The the media type dissector wasn't being called properly with only the "text/html" but instead the whole string. Additionally, make sure that the media type parameters are passed in correctly which is important for things like multipart/* which should have a boundary. Most of the string parsing code was adapted from packet-spdy.c:spdy_parse_content_type(). Change-Id: Ide59da8f65264dc142e0f9bb67671ce2af66c8a2 Reviewed-on: https://code.wireshark.org/review/23140 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-08-22GSMTAP: Add UMTS RRC message type fieldDarien Spencer1-0/+72
Showing a description of the 'sub_type' in the fields tree for RRC payloads. Change-Id: Ie4fd4498690db27d4b996fff99fa74b676be9ddb Reviewed-on: https://code.wireshark.org/review/23133 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-21rpc: remove unnecessary NULL checkMartin Kaiser1-5/+3
call_dissect_function() does already check internally if dissect_function is NULL Change-Id: I4780733ee38bcde74b498bedb1031eefa3c07da4 Reviewed-on: https://code.wireshark.org/review/23159 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-21[skinny]: minor changes to xml fileDiederik de Groot7-434/+423
- Fix/syncronise spelling for similar field types - Fix cog.py script invocation Change-Id: Iab6d8ac6414c1ba9b97c49d7d0a4d2609eb1a55b Reviewed-on: https://code.wireshark.org/review/23153 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-08-21Fix bit depth of color psml and pdml xml attributesAnthony Coddington1-6/+6
color_t is 16-bit per channel, the print string assumes the usual 8-bit. Use 8-bit per channel as per older patches proposed for bug 6682 via color_t_to_rgb(). Change-Id: I7d71bc04e52376c0ecb598aedafa066f982de840 Ping-Bug: 6682 Reviewed-on: https://code.wireshark.org/review/23154 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>
2017-08-21RSVP: Add value_string for ctype sessionAlexis La Goutte1-20/+32
Need to add for other ctype value too... Change-Id: I815fee790403d848fed4c3501dae9951dbcb93a3 Ping-Bug: 13977 Reviewed-on: https://code.wireshark.org/review/23152 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>
2017-08-21RSVP: fix length of PSMP ID (2 -> 4)Alexis La Goutte1-2/+2
Ping-Bug: 13977 Change-Id: I162d967d4d38296231d5a16d651f848d600d49bc Reviewed-on: https://code.wireshark.org/review/23151 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>
2017-08-21More explanation in the comments.Guy Harris1-1/+5
Change-Id: I1e5597ac291d38370e8b1537a75f3ba1d9a86bc9 Reviewed-on: https://code.wireshark.org/review/23156 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-21Use a Wayback Machine URL for the PPI documentation.Guy Harris1-1/+4
It's not available from cacetech.com any more. Change-Id: I6627a9102235f07731c55a2fe3cd82adc1899450 Reviewed-on: https://code.wireshark.org/review/23155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-20802.11: Add Neighbor Sublement ID dissectionAlexis La Goutte1-1/+26
BSS Transition Candidate Preference (Figure 9-299) BSS Termination Duration (Figure 9-300) From 802.11-2016 Bug: 13985 Change-Id: I352a41c46ff741070c51f4ddc661e26a40d21570 Reviewed-on: https://code.wireshark.org/review/23149 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-08-20802.11: Update subelement IDs for Neighbor reportAlexis La Goutte1-0/+8
Table 9-151 from 802.11-2016 Ping-Bug: 13985 Change-Id: Ie2b0650feb03b984b2ac3c42ca46f4b5b8ed923c Reviewed-on: https://code.wireshark.org/review/23148 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20802.11: Add new flags on BSSID Info in neighbor report field (from 802.11-2016)Alexis La Goutte1-1/+15
Ping-Bug: 13985 Change-Id: I4188767021455002119b64862264e1540314f8cc Reviewed-on: https://code.wireshark.org/review/23147 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20802.11: Add always Data of Subelement (on Neighbor Report)Alexis La Goutte1-1/+9
Fix also typo on Neighbor Report Subelement length filter display name Ping-Bug: 13985 Change-Id: I924cadddb0d5f060d8af08cf0f27cab40f3bd6bd Reviewed-on: https://code.wireshark.org/review/23146 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-20[Automatic update for 2017-08-20]Gerald Combs29-748/+1832
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I676dc2814760f711a3d3b8b4979ef8a0077e26a1 Reviewed-on: https://code.wireshark.org/review/23141 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-19nordic_ble: Preserve legacy version supportStig Bjørlykke1-4/+6
Change-Id: I8354955f802ba47158b78358084cd4211c1c6d79 Reviewed-on: https://code.wireshark.org/review/23137 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-19sharkd: minor changes in comments, fix style.Jakub Zawadzki1-5/+6
Change-Id: I72d856bf223cea966bd505031417bc2b4dd12f82 Reviewed-on: https://code.wireshark.org/review/23136 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-19nordic_ble: Add packet format descriptionStig Bjørlykke1-4/+95
Also move "Length of packet" to correct position. Change-Id: I2efd5087396a8904eb16bcc3191cc9ea3beac2e9 Reviewed-on: https://code.wireshark.org/review/23135 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-08-19Remove support for CPack.Michael Mann3-133/+29
It's very incomplete and we already have installation makers for supported OSes. Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752 Reviewed-on: https://code.wireshark.org/review/22226 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-08-18gitlab-ci: add gcc 7.Dario Lombardo1-0/+21
Change-Id: I3b03c9fcbe67cca5c818f40875dc4828baa05012 Reviewed-on: https://code.wireshark.org/review/23118 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-08-18ZigBee scenes cluster scene valid attribute displaying incorrect bitChris Brandson1-3/+3
During validation it was discovered that the incorrect bit was displayed, verified against the ZigBee test tool that bit 0 is used for validity Change-Id: Iaaa2f8021b2aa269f660626fdd252cade732b60f Reviewed-on: https://code.wireshark.org/review/23124 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-18WSUG: Update the TCP analysis section.Gerald Combs1-4/+7
Clarify and fix some items. Change-Id: I1f9f8a32ceaa1de4c1ec2936913c87c08ba63c88 Reviewed-on: https://code.wireshark.org/review/23123 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-18RSVP: add Session C-type RSVP_SESSION_TYPE_P2MP_LSP_TUNNEL_IPV6Alexis La Goutte1-0/+27
Change-Id: I493771df32b83691fa587b9a725c15df6057fb52 Ping-Bug: 13977 Reviewed-on: https://code.wireshark.org/review/23104 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-18couchbase: update status codesSergey Avseyev1-1/+40
Change-Id: I7f0950d82c50c8f019d844d726ffe7a0015618c5 Reviewed-on: https://code.wireshark.org/review/23117 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-18WSDG: More VS 2015 fixesGraham Bloice1-1/+1
Change-Id: I5f0d543032f62bd0c57c14a56771a63fe1bed3a3 Reviewed-on: https://code.wireshark.org/review/23122 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-08-18RSVP: fix name of PSMP ID field (SESSION object C-Type 13/14)Alexis La Goutte1-3/+5
Also display PSMP ID in decimal Ping-Bug: 13977 Change-Id: If6b87ab87339038d763dcc1c97353aaf9d69a02c Reviewed-on: https://code.wireshark.org/review/23103 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-18TRANSUM fails with DCE-RPC request Packet Type 0Paul Offord2-4/+4
TRANSUM fails to calculate RTE figures for DCE-RPC where request Packet Type is zero Bug: 13988 Change-Id: I1dd7aee0283042703530a6d72fff063279e6147e Reviewed-on: https://code.wireshark.org/review/23115 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-18WSDG: Remove obsolete VS 2010 info from quick setupGraham Bloice1-37/+0
Change-Id: I767e04538d17702346e9343e136fc0ea4c2f9ec3 Reviewed-on: https://code.wireshark.org/review/23120 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-08-18WSDG: Update Qt installation infoGraham Bloice1-6/+10
Change-Id: I9da1c68949ac48e3e88227e9c4f4d4930dbd3268 Reviewed-on: https://code.wireshark.org/review/23119 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-08-18msdp: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+3
Change-Id: Ie98f0c70190206b4682bf1b1b13add51c52303db Reviewed-on: https://code.wireshark.org/review/23009 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-08-18ws.css: fix invalid colorAlexis La Goutte1-2/+2
use the same like original http://www.methods.co.nz/asciidoc/docbook-xsl.css Reported by Jay Turner https://www.wireshark.org/lists/wireshark-dev/201707/msg00141.html Change-Id: Ia44d7cbd24c1b2f3b9b011d3ed07619d2fa733cd Reviewed-on: https://code.wireshark.org/review/23022 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>
2017-08-18WSDG: Reference to an existing Qt versionStig Bjørlykke1-2/+2
Change-Id: Ia1c61cabf1bf3378bf993501dc1362163f33f1ed Reviewed-on: https://code.wireshark.org/review/23116 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-18ZigBee fix Default Response dissectionChris Brandson1-16/+12
The ZCL Default Response command can be sent in response to any profile-wide or cluster specific command. The Default Response command is itself a profile-wide command so the Default Response frame control is of no help in deciding whether the original request is profile-wide or cluster-specific. The simplest solution is to not attempt interpretation. A more sophisticated solution would be to cache all ZCL frame counters and match Default Responses based on sequence number, but this is problematic because sequence numbers repeat. At least for now we can always display the information correctly. Change-Id: I827e2d2f9d6e5f7c9dfa572d2ee2ac3c9f170d70 Reviewed-on: https://code.wireshark.org/review/22688 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-18[GSM MAP] Dissect Ext2-QoS-Subscribed, Ext3-QoS-Subscribed andAndersBroman3-33/+656
Ext4-QoS-Subscribed Change-Id: Ic6a0f80d5f2339fd90284d1fddffe57b66c6771d Reviewed-on: https://code.wireshark.org/review/23108 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>
2017-08-18androiddump: Support 802.11 monitor and nlmon interfacesMikael Kanstrup1-0/+6
Some Android devices support 802.11 monitor mode and nlmon interfaces. Add linktype defines to be able to capture frames from such interfaces. Change-Id: I8b8b444ac2821542fc946694b71c8d9fb7ba1238 Reviewed-on: https://code.wireshark.org/review/23080 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>
2017-08-17WSDG: More VS 2015 updates.Gerald Combs1-7/+12
Switch the Command Prompt instructions back to using the platform-specific variants. Switch back to setting WIRESHARK_BASE_DIR. Change-Id: Ie9f865e5fac1312f2eb3762e439d53ab9a038bd4 Reviewed-on: https://code.wireshark.org/review/23112 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-08-17Fix some comments.Guy Harris1-2/+6
"The release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG" isn't Linux-specific; it's true in the Unix Makefile generator, and possibly in other generators. (The Visual Studio generator, at least for newer versions of VS, lets you specify at *build* time what type of build to do, so the generated build files don't unconditionally define, or not define, NDEBUG, they do so based on the build type.) The RPATH stuff is done on Unix-like systems *except* for macOS. Change-Id: Ieffbaaa9a8e11a1a30b34036a2412c6735baa0c8 Reviewed-on: https://code.wireshark.org/review/23114 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-17GTPv2: Fix length of EPS Bearer ID (EBI)Uli Heilmeier1-1/+1
Field is only 1 not 2 bytes long. Bug: 13987 Change-Id: If22e19e917bd41907248a497b30883e89fc9ff4b Reviewed-on: https://code.wireshark.org/review/23109 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-17TLS: Add new cipher suite from draft-ietf-tls-ecdhe-psk-aeadAlexis La Goutte1-0/+5
Change-Id: I256496618e67df70ce02ee90f21bc0cd556b0b5a Reviewed-on: https://code.wireshark.org/review/23105 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-08-17802.11: Add dissection of BSS Transition candidate List entriesAlexis La Goutte1-2/+21
It is a list of Neighbor report (for request and response) Missing dissection of Neighbor Sublelement 0x03 (BSS Transition Candidate Preference) Issue reported by Mark Williams Bug: 13985 Change-Id: Ic3871866ba4779ee69e91d6d57b46926466b340c Reviewed-on: https://code.wireshark.org/review/23107 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-17androiddump: Fix bt snoop capturingMikael Kanstrup1-1/+1
Recent changes had the bt snoop capturing function stop working for Android API versions >= 21. One of the command strings used for detecting btsnoop server socket interface got messed up when refactoring code. Fix by using the correct command strings again. Fixes: faf100ec ("androiddump: Introduce adb_connect_transport helper function") Change-Id: Id645d24cfb0cb23f36484cfd6416768c89bce51b Reviewed-on: https://code.wireshark.org/review/23106 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-17Fix capitalization.Guy Harris1-1/+1
Change-Id: I43017bae5bc74678113377d0b4aad3d712647c5d Reviewed-on: https://code.wireshark.org/review/23099 Reviewed-by: Guy Harris <guy@alum.mit.edu>