aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-25HTTP2: Fix an access invalid memory address error.Huang Qiangxiong1-1/+1
The tree may be NULL, so tree->parent may cause access invalid memory address error which will report 'Dissector bug ... STATUS_ACCESS_VIOLATION' in info column. Change-Id: I37d4aca2287e77a046e553221a6a824de60aae9c Reviewed-on: https://code.wireshark.org/review/22776 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-07-24There's no wka.tmpl file any more, it's just wka.Guy Harris1-1/+1
Change-Id: Ia44a02c92995a47357a3fded7131199117ad6425 Reviewed-on: https://code.wireshark.org/review/22779 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-24EPL: Add Modular device flagChristoph Schlosser1-0/+6
Add detection for the modular device flag in POWERLINK. Change-Id: I3e21eec383f1bdf2fa491d415631cda146a0fdef Reviewed-on: https://code.wireshark.org/review/22774 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-24print: use assert before dereference (CID 1412973).Dario Lombardo1-1/+3
Change-Id: I82602ceb735a055602a18c2c52e0669c4efd7773 Reviewed-on: https://code.wireshark.org/review/22748 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-07-23GPRSCDR: decoding of ULI in GGSN/SGW/PGW CDRsJoakim Karlsson5-51/+430
Change-Id: Id87920c5099553e51cfaa9ab0cb0c41cec6a127b Reviewed-on: https://code.wireshark.org/review/22767 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-23LTE RRC: upgrade dissector to v14.3.0Pascal Quantin11-3403/+22896
Change-Id: Ia64095a8a9bdd3b31589842809d8a5313b829f8e Reviewed-on: https://code.wireshark.org/review/22770 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>
2017-07-23Qt: Compile InterfaceToolbar with Qt4Stig Bjørlykke1-0/+28
The InterfaceToolbar does not currently work with Qt4 because usage of some Qt 5.2 features, but this should at least make it compile. Change-Id: Id610e04d6c266556bfb84da5399e57a6c1fe9938 Ping-Bug: 13909 Reviewed-on: https://code.wireshark.org/review/22761 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-23tshark: assert edt before calling print_packet (CID 1405107).Dario Lombardo1-0/+1
Change-Id: Iacde5514dc355cbb06fe45f5e342ddd45700999d Reviewed-on: https://code.wireshark.org/review/22749 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde9-311/+49
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 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-07-23Inhibit unhandled Ctrl key presses being redirected to the display filterLars Christensen1-1/+2
Pressing the display filter shortcut Ctrl-/ inserts a '/' into the LineEdit. On Windows QKeyEvent::text() contains a printable character when Ctrl is held down and are being redirected in MainWindow::eventFilter(). This patch filters events that has the CtrlModifier. Change-Id: Iefed962b7a2cc944a39b09de9d84b4522a39ff13 Reviewed-on: https://code.wireshark.org/review/22697 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-07-23RRC: upgrade dissector to v14.3.0Pascal Quantin7-8638/+12133
Change-Id: I3c15b26430e8159d10d5d7a52e3b5644fb76c7ae Reviewed-on: https://code.wireshark.org/review/22765 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-22Have UatFrame send out proper notifications.Michael Mann3-4/+21
UatFrame was originally written for filter expressions, so it still had some "filter expression specific" functionality in it. Move the "filter expression notifications" to the preferences dialog and add support for proper notification if UAT affects fields or dissection (like expert info UAT). Change-Id: I84cd0c7923450692916bbc6c2cdce93a9830d722 Reviewed-on: https://code.wireshark.org/review/22758 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-07-22HTTP2: Fix missing ifdef HAVE_NGHTTP2Uli Heilmeier1-0/+2
media_type_dissector_table is only defined with HAVE_NGHTTP2 Change-Id: I489e04f3d3066f2edf5c656b158c38c3dae84fb6 Reviewed-on: https://code.wireshark.org/review/22760 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-22Fix crash in UDT dissector when long NAK packet is dissectedSimon Graham1-15/+37
Change is to limit the number of entries from the NAK message included in the summary line (and add ellipsis if there are more than will fit). In addition, add checks to make sure we dont read beyond the end of the captured packet when parsing NAKs. Change-Id: I60db4b62d86c05329eb7c79ae1927eeb1b7e11ba Reviewed-on: https://code.wireshark.org/review/22733 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-07-22HTTP2: Dissect reassembled http2.data.data according to content-type (as ↵Huang Qiangxiong1-4/+72
text/html, png, application/grpc and etc) and some enhancement for displays. Change Details: 1. Just like HTTP1.1, dissect reassembled http2.data.data according to content-type header value (searching media_type dissector table). With this feature, we can add new dissector that based HTTP2 (for example application/grpc), or old text/html, image/png, image/jpeg dissectors. 2. Append stream id after frame type on info column, like: HEADERS[1], DATA[1], HEADERS[3], DATA[3] 3. Append request :method and :path inforamtion to info column, like: HEADERS[1]: GET /demo/1.jpg. (and also append :method and :path info to Stream Node in tree) 4. Append response status and reason-phrase to info column, like: HEADERS[1]: 200 OK One HTTP2 package file's info column will look like: 10.10.10.123 23.13.190.101 Magic 10.10.10.123 23.13.190.101 SETTINGS[0] 10.10.10.123 23.13.190.101 WINDOW_UPDATE[0] 10.10.10.123 23.13.190.101 HEADERS[1]: GET /demo 23.13.190.101 10.10.10.123 SETTINGS[0] 23.13.190.101 10.10.10.123 SETTINGS[0] 10.10.10.123 23.13.190.101 SETTINGS[0] 23.13.190.101 10.10.10.123 HEADERS[1]: 200 OK 23.13.190.101 10.10.10.123 DATA[1], DATA[1], DATA[1], DATA[1] (text/html) 10.10.10.123 23.13.190.101 HEADERS[3]: GET /demo/tile-0.png 10.10.10.123 23.13.190.101 HEADERS[5]: GET /demo/tile-1.png 10.10.10.123 23.13.190.101 HEADERS[7]: GET /demo/tile-2.png 10.10.10.123 23.13.190.101 HEADERS[9]: GET /demo/tile-3.png 10.10.10.123 23.13.190.101 HEADERS[11]: GET /demo/tile-4.png 23.13.190.101 10.10.10.123 SETTINGS[0] 23.13.190.101 10.10.10.123 SETTINGS[0] 10.10.10.123 23.13.190.101 SETTINGS[0] 23.13.190.101 10.10.10.123 HEADERS[5]: 200 OK 23.13.190.101 10.10.10.123 DATA[5] 23.13.190.101 10.10.10.123 HEADERS[7]: 200 OK 23.13.190.101 10.10.10.123 DATA[5], DATA[5] (PNG), DATA[5] 23.13.190.101 10.10.10.123 HEADERS[11]: 200 OK 23.13.190.101 10.10.10.123 DATA[7], DATA[7] (PNG), DATA[11], DATA[11] (PNG) 23.13.190.101 10.10.10.123 HEADERS[3]: 200 OK 23.13.190.101 10.10.10.123 DATA[3], DATA[3] (PNG) 23.13.190.101 10.10.10.123 HEADERS[7]: 200 OK 23.13.190.101 10.10.10.123 DATA[9], DATA[9] (PNG) Change-Id: I4452dadeeefc49806e3036a44d44b5f5186096b9 Reviewed-on: https://code.wireshark.org/review/22715 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-22IEEE 802.15.4: dissector tables for Information ElementsRobert Sauter2-305/+252
Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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-22c-ares isn't required.Guy Harris1-1/+1
Don't fail if it's not present. Change-Id: I7183ce6e1f2af822ebeed219be0f2ca7dd0bab0f Reviewed-on: https://code.wireshark.org/review/22759 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-21Qt RTP: Add the default device and adjust sample rates.Gerald Combs4-18/+45
In the RTP player dialog, list the default audio device first, ensure it's selected by default and ensure that the list items are unique. According to http://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp?h=5.9 the default device on Windows uses the special WAVE_MAPPER id, which appears to support various sample rates even when the underlying hardware doesn't. Ensuring the names are unique fixes an issue I'm seeing on a test machine here. When decoding, check to see if our sample rate is supported by our output device and adjust accordingly. Bug: 13906 Change-Id: Iddc0beb2459bfac42276ff29d227c2619b0a8d90 Reviewed-on: https://code.wireshark.org/review/22756 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-21cql: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+0
Change-Id: I74f4d33ad1805bd233190e7cb9ee1610ae628af5 Reviewed-on: https://code.wireshark.org/review/22755 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-21*Always* write out the trailing pcapng block total length in host byte order.Guy Harris1-8/+6
In the fast-path "no options" case for writing an Enhanced Packet Block, just copy the block total length to the buffer, don't put it into the buffer in little-endian byte order. If we're running on a big-endian machine, and thus *should* be writing out multi-byte integral block fields in big-endian byte order, that'll write out a corrupt pcapng file. Bug: 13802 Change-Id: I33958e3fc1d205ca6df3ef4057d92b461831c50e Reviewed-on: https://code.wireshark.org/review/22753 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-07-21androiddump: check return value of localtime() before dereference (CID 1400829).Dario Lombardo1-6/+8
Change-Id: I03c851e56f5bd967a35c668bcbc4e98170251b2c Reviewed-on: https://code.wireshark.org/review/22750 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-21Require at least c-ares 1.5.0 when configuring.Guy Harris3-4/+41
That way, if you have an older version, we fail at configure time, with what should be a message indicating that your c-ares is too old, rather than at compile time, with what might provoke users to ask "what am I doing wrong?" or "what do I need to fix?" or "why is my compile failing?" or.... Change-Id: I911574c4d90174b6bd074c5ef537557d47b199dc Reviewed-on: https://code.wireshark.org/review/22752 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-21androiddump: add a cast to please MSVC x64Pascal Quantin1-1/+1
Change-Id: I43cf913d48afabd826f7d6f861876e1cb62e7e7a Reviewed-on: https://code.wireshark.org/review/22751 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-07-21Add support for Metamako trailer extensions.Russell Lowes1-43/+265
Update dissector heuristic to match. Bug: 13898 Change-Id: I84445b3a6e6c903a51faae2757eb6002db835a31 Reviewed-on: https://code.wireshark.org/review/22711 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-21Require c-ares >= 1.5João Valverde1-31/+2
Version 1.5 was released on 21-nov-2007. RHEL, Suse, etc supported versions are all above c-ares v1.5. We don't bother testing for it at build time for now, because it's non-trivial (times two build systems). Change-Id: I9253256d8d905da0c75d80b2b0fa4527df2b1420 Reviewed-on: https://code.wireshark.org/review/22741 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>
2017-07-21Support heuristic sub-dissectors for UDTSimon Graham1-7/+16
Change-Id: Ief9d02dd3cf70dc37ad25061ce38bb1a570b2946 Reviewed-on: https://code.wireshark.org/review/22727 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-21ENIP: Add support for CIP Security Information in ListIdentityMichael Mann5-5/+145
Add tfs_open_closed to general tfs collection (tfs.[ch]) Change-Id: I79b22b591128c33084489880842e19e9a0d80560 Reviewed-on: https://code.wireshark.org/review/22730 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-20.gitignore: move ui/qt/gitignore to root gitignoreAlexis La Goutte2-3/+1
Change-Id: I303c6998b7b825ebb89aa1a81296b1ad69786ec1 Reviewed-on: https://code.wireshark.org/review/22538 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-07-20More precise error message.Guy Harris1-1/+1
"Missing newline after '}'" suggests either that the "}" is the line character in the file or that it's followed by a character other than a newline. What it actually appears to mean is "you didn't put a blank line between one author entry and the next author entry". Change-Id: Ic0e4dd02f04680ab84fbfcf1183c911d049ee2d2 Reviewed-on: https://code.wireshark.org/review/22746 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-20AUTHORS: add newline after bracket.Dario Lombardo1-0/+1
Get rid of the error: Missing newline after '}', found: Ben Stewart <bst[AT]google.com> { Change-Id: Ic8c83c23e5215032a9e06d4ad089be85f7b98b0d Reviewed-on: https://code.wireshark.org/review/22744 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-20androiddump: use actual buffer length instead of pointer sizeof.Dario Lombardo1-2/+2
Change-Id: I3481c98377a31fbef2ef8ad931e2a8d66f507e58 CID: 1414110 CID: 1414058 Reviewed-on: https://code.wireshark.org/review/22743 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-20Remove dead code for address reverse-mappingJoão Valverde4-216/+11
Removed get_ipxnet_addr(), get_ether_addr(). If this feature is desired at a minimum it should use an efficent data structure (and no disk-based lookups mid-dissection). Change-Id: Ie72449c631f21f4a3d82ec435bb5e1d7892f122c Reviewed-on: https://code.wireshark.org/review/22729 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>
2017-07-20DICOM: Add User IdentifyAlexis La Goutte1-0/+87
See ftp://dicom.nema.org/MEDICAL/dicom/2016a/output/chtml/part07/sect_D.3.3.7.html Bug: 13875 Change-Id: If5b55ef45b1dd7115a2eaf4a3d1a02bc2b1a5b93 Reviewed-on: https://code.wireshark.org/review/22714 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-20Give some references.Guy Harris1-0/+2
Change-Id: Iaa4912fa50ffde8d5408527f3b4b28a0d2a56cde Reviewed-on: https://code.wireshark.org/review/22737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-20CMake: Escape shell command quotes.Gerald Combs1-2/+2
Escape shell command quotes so that what appears to be "unquoted_legacy" behavior doesn't kick in. Ping-Bug: 12305 Change-Id: I4763df2fbc58b80d6e4e3ec15f78c16fa1cf3853 Reviewed-on: https://code.wireshark.org/review/22732 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-20Update the release notes.Gerald Combs1-1/+0
Change-Id: Ia6a5994b8728251a11a111f29f60455e8076dfb9 Reviewed-on: https://code.wireshark.org/review/22731 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-20[IP] Simplify paring of flags field by usingAndersBroman1-35/+33
proto_tree_add_bitmask_with_flags(). Change-Id: If8e9f9956543f253f4f59d8204c9536f444dbcd5 Reviewed-on: https://code.wireshark.org/review/22728 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-20DICOM: Add display of Unknown item typeAlexis La Goutte1-0/+35
Ping-Bug: 13875 Change-Id: Ic1de11aa7307f13cf6ba53f61477091fd37bf2a2 Reviewed-on: https://code.wireshark.org/review/22713 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-07-20Remove line numbers (locations) from .ts filesJoão Valverde8-22621/+21
To make translation updates less noisy. Change-Id: I3efee819ea10bb326862e0f818bfd3cd7eff48e3 Reviewed-on: https://code.wireshark.org/review/22654 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-07-20Add udpdump documentation to distributionPascal Quantin1-3/+12
Bug: 13903 Change-Id: I7e7aadfbec3e66ebac892e20b5632afa9f7e5923 Reviewed-on: https://code.wireshark.org/review/22725 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-07-20Display relative sequence numbers when dissecting UDT.Simon Graham1-33/+69
Note that this is only done if sufficient bytes are captured from the handshake packet to include the initial sequence number field. Change-Id: Ie92ec2ccaa5021c07c8666d6fdc46613d24d0da1 Reviewed-on: https://code.wireshark.org/review/22573 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-07-20ZigBee: Add touchlink commissioning dissectors.Owen Kirby5-3/+837
Change-Id: I745fa77626dd242d9a6f1bd79c6ae52d507f844a Reviewed-on: https://code.wireshark.org/review/22380 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-07-20Update WinSparkle.Gerald Combs1-4/+4
Change-Id: Ia0b717165b258fdc891b5d876b4acd31345ec00e Reviewed-on: https://code.wireshark.org/review/22722 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-19dcerpc-pn-io (profinet): fix typo for pn_io.iops display filterAlexis La Goutte1-1/+1
Change-Id: I8422005703c9e0a04d067dfe5ba501fe7417ff8a Reviewed-on: https://code.wireshark.org/review/22718 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-19X2AP: update version info in headerPascal Quantin2-2/+2
Change-Id: I5e5faf6cc389bc334c31ef0277858c9e99245b67 Reviewed-on: https://code.wireshark.org/review/22712 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-19ZigBee make ZCL Frame Control direction more descriptiveChris Brandson3-2/+5
Using just client or server as a direction is a source of confusion so made a more discriptive item Change-Id: I8675aba555b04f6ae8848cf9e1c720eb4b44b553 Reviewed-on: https://code.wireshark.org/review/22628 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-19ICMPv6: RA: Add Captive Portal Option (RFC7710)Uli Heilmeier1-1/+19
RFC 7710 (https://tools.ietf.org/html/rfc7710#section-2.3) defines option 37 Captive Portal URI for Router Advertisments. Change-Id: I257412ef1cf22d47018974cd0ef9000b748d01ac Reviewed-on: https://code.wireshark.org/review/22703 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-19AVRCP: fix parsing of Media Player ItemsMarie Janssen1-7/+7
From the AVRCP 1.6.1 spec, page 76, the "Player ID" is two octets. Also, the Play Status field comes before the Feature Bit Mask. Change-Id: Ifd0ad82650d395395b16f9441f02b8835befa360 Reviewed-on: https://code.wireshark.org/review/22709 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-19IEEE 802.15.4: MPX dissect IEEE 802.11 4WH/GKH with EAPOL dissectorRobert Sauter1-2/+2
Change-Id: I8972a9a9efef31ab77571f333fb040569fb7de9a Reviewed-on: https://code.wireshark.org/review/22622 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-07-19ICMPv6: Fix data length for unknown optionUli Heilmeier1-2/+2
The length value includes the Type and Length fields. Therefore the length of the Data field is two bytes smaller. Change-Id: I93878a016ace083f4e766bee6e16e301d6903967 Reviewed-on: https://code.wireshark.org/review/22702 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>