aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-10-26Fix comments, remove a no-longer-needed include.Guy Harris2-5/+8
Change-Id: I58cc8db41b474e937eb806510c277fe1830204fb Reviewed-on: https://code.wireshark.org/review/24072 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26RANAP: Associate RTP dissector with CS streamsDarien Spencer3-100/+314
Change-Id: If02b8cc5110c70e50ae04d245c45b1d133ee7fd3 Reviewed-on: https://code.wireshark.org/review/24010 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-26CMake: Don't check for windows.h or winsock2.h.Gerald Combs2-6/+3
If we're building on Windows we're going to have windows.h and winsock2.h. Don't bother checking for them. Change-Id: I0004c44d7364ab3f41682f34b8c84cd8617c9603 Reviewed-on: https://code.wireshark.org/review/24068 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-26Swallow up the stuff from epan/ipv4.c into epan/ftypes/ftype-ipv4.c and ↵Guy Harris5-219/+69
epan/ipv4.h. Most of it doesn't need to be public; pull it into epan/ipv4.c. Pull the two routines that *are* used outside epan/ftypes/ftype-ipv4.c into epan/ipv4.h as static inline functions. This allows some optimization, and makes epan/ipv4.h more like epan/ipv6.h. Change-Id: I80229acde559d810aecec2acd5c995076440c181 Reviewed-on: https://code.wireshark.org/review/24071 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25asn2wrs.py: use 64 bits variant for constrained integers using MIN or MAX ↵Pavel Strnad10-53/+53
keywords Change-Id: Iffc7c81e9653e8c1cd938de8f4fc26c5912eceec Reviewed-on: https://code.wireshark.org/review/24049 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-25We're using inet_pton(), so we don't need to worry about non-dotted-quad ↵Guy Harris1-14/+0
addresses. inet_pton(), and thus ws_inet_pton(), won't accept hex or fewer-than-four-component IPv4 addresses, at least on Single UNIX Specification-compliant systems - the SUSv4 explicitly says The inet_pton() function does not accept other formats (such as the octal numbers, hexadecimal numbers, and fewer than four numbers that inet_addr() accepts). so we don't need to check for "inet_atons that accept strings such as - "130.230" as valid addresses". That also means that, "if there are any places where this needs to support the hex-address form for IPv4 addresses, or to support fewer than 4 components for a network address", those places were hosed even before we stopped using inet_aton(), so there are presumably no such places. (Itojun's comment was probably just an expression of general concern, rather than a note of a known problem.) Change-Id: Id16b6ebd3550dc3bf5a0fc283898a99b7abc163c Reviewed-on: https://code.wireshark.org/review/24057 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25Get rid of a no-longer-needed variable.Guy Harris1-3/+1
We don't need a temporary IPv4 address variable in get_host_ipaddr(), we can just use the pointer we've been handed. Change-Id: Id7cbd0c14b2eeb3efde5a556f3414bd635411908 Reviewed-on: https://code.wireshark.org/review/24056 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25Clean up and expand comments.Guy Harris1-6/+19
Note the dropping of support for hex IPv4 addresses and addresses with fewer than four components, and indicate that, if there are any places where that support is expected, we should change those places (i.e., don't just change get_host_ipaddr() and, if there aren't any such places, just leave everything as it is). It's not clear that get_host_ipaddr() is "Used more in the dfilter parser rather than in packet dissectors"; that may depend on whether you're counting number of calls executed from those places or the number of lines of code making those calls. Just drop the claim, which is absent in the comment for get_host_ipaddr6(). Also ask whether we're using get_host_ipaddr{6}() in any places where it should *only* support numeric addresses rather than names. Change-Id: Ib5d8730ca703339342f308081a68309479f842c5 Reviewed-on: https://code.wireshark.org/review/24055 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-25Remove inet_aton() usage everywhereJoão Valverde6-59/+55
Including where it says not to in comments. Use IPv4 dotted-decimal notation. Change-Id: Iafe1f6fbd2bd5867c41642dc27411f47dff8ce6a Reviewed-on: https://code.wireshark.org/review/24044 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-25rdm: Support NACK_REASON and fix a PD dissectorRyan Mullen1-172/+228
- Introduce support for the NACK_REASON response type - Tweak the PD dissector for DMX_PERSONALITY_DESCRIPTION, which misinterpreted the "Personality Requested" field and used the wrong length for the "DMX512 Slots Required" field Change-Id: If5bc64f82e531e6cfb03a508c335b0468bf6e836 Reviewed-on: https://code.wireshark.org/review/24048 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-10-24Fix registration of SIP atop SSL/TLS.Guy Harris1-1/+2
See https://ask.wireshark.org/questions/64151/sip-tls-is-only-shown-as-tcp. Change-Id: Ife182136601007ff6a5713666d9fada5abcd00b9 Reviewed-on: https://code.wireshark.org/review/24041 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-24mqtt: Use proto_tree_add_bitmaskMichael Mann1-31/+43
Change-Id: I8e9cd64edcabf810e70b134ecce7a771babafebc Reviewed-on: https://code.wireshark.org/review/24017 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-10-23Improve http object export for URLs with long extensionsEldon Stegall1-23/+12
This allows the export of objects with extensions that may be longer than the allowed file name of an export (due to underlying filesystem, etc). The extension detection mechanism previously preserved everything in the file name after the final ".", but in some cases (especially with long query strings) this would exceed the allowed maximum file length, and simply refuse to export the object. Now, if the length of the extension and duplicate number is longer than the allowable file length, the extension is ignored, and the entire string is truncated to allow an acceptable export filename. Bug: 14130 Change-Id: I6fa0281519d031c07a9ac621002ac328f34f54cc Reviewed-on: https://code.wireshark.org/review/23960 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-22ssl-utils: Add export tls13_hkdf_expand_labelAlexis La Goutte2-1/+6
for reuse on QUIC dissector Change-Id: Ic1d6b875e1e1944bb2aa6c7a85bfdd984c00948c Reviewed-on: https://code.wireshark.org/review/24018 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22QUIC: Add draft-07 value_stringAlexis La Goutte1-0/+1
Change-Id: Icc4cfc4ce007eac29d9a502eae76527713e93e05 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/24019 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22mqtt: Fix some mistakes from previous commitStig Bjørlykke1-24/+39
- PUBREL, SUBSCRIBE and UNSUBSCRIBE does use QoS for v3.1 - CONNACK is also different between v3.1 and v3.1.1 - DUP flag is not reserved, it's Retain which is reserved - Use proto_tree_add_item for reserved fields - Use uniform layout and fixed indent (2 spaces in this file) Change-Id: I26337ad63cd67d832db84993349fa3406e305b72 Reviewed-on: https://code.wireshark.org/review/24025 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22[RFC] dissector/mqtt: Fix handling of fixed header flagsFlavio Santes1-23/+64
According to the MQTT v3.1 and v3.1.1 specifications, the fixed header flags (DUP, QoS and RETAIN) are only set by the PUBLISH message. The DUP flag is also set by the PUBREL, SUBSCRIBE and UNSUBSCRIBE messages but only when version 3.1 is used. Currently, the MQTT dissector shows the header flags for all the v3.1 and v3.1.1 messages. This patch fixes the issues mentioned above. To track the protocol version used during the connection handshake a conversation is used. For subsequent messages, the way the header flags are displayed is determined by this variable. Change-Id: Iad808f77a2c379f9786152c26d3aa86e24be1b16 Signed-off-by: Flavio Santes <flavio.santes@1byt3.com> Reviewed-on: https://code.wireshark.org/review/23939 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22Add IANA arc and first entry (MUDURL) for lldp.Eliot Lear1-0/+53
PCAP file: https://github.com/the-tcpdump-group/tcpdump/blob/master/tests/lldp_mudurl.pcap Change-Id: If1f4946f8a8ade44dbab33a877bf7449f9ea2a6f Reviewed-on: https://code.wireshark.org/review/23982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-22NFSv4: Fix for duplicate StateId hashesCal Turney1-57/+51
In WS v11.4.0 released In May, 2014, "tvb_get_string_enc()" was added to dissect_nfs4_stateid() which treats the numeric stateid as a string and converted it to UTF-8. Invalid UTF-8 chars were replaced with the "REPLACEMENT CHARACTER" which are actually three characters: 0xef, 0xbf, and 0xbd (0xefbfbd). A hash was made of the first 16 chars of the returned array although the string was often much larger due to 1 to 16 invalid chars. This has often caused duplicate hashes for different files and locks. That routine has been removed. In addition, the size of the hash has been reduced from 32 to 16 bits which affords a 99.9984% chance of unique hashes. Finally, hf_nfs4_seqid, used for the stateid hash seqid has been changed to hf_nfs4_seqid_stateid because in CLOSE requests the seqid has nothing to do with the stateid seqid. Change-Id: I3bf7caefc3341887a4c9137500dfeac0115af8cf Reviewed-on: https://code.wireshark.org/review/23966 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-21Eliminate #include <epan/oui.h> from dissectors that don't need it.Michael Mann11-11/+1
Correct include patch for packet-lldp.c Change-Id: I5e2a267943ccd39616ef323848104fdba23c8f38 Reviewed-on: https://code.wireshark.org/review/24009 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-21Diameter 3GPP: call XML dissector for Civic-Address AVP payloadPascal Quantin1-1/+23
Bug: 14142 Change-Id: Iccf5c375087cabd08aa551af8e6586e18684252a Reviewed-on: https://code.wireshark.org/review/24008 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-21Remove oui_vals value_string and epan/oui.cMichael Mann19-156/+38
oui.c is a very small subset of what comes from http://standards.ieee.org/regauth/oui/oui.txt, so use the "full" OUI list (and more) out of the manuf file and convert hf_ fields to just use BASE_OUI. Change-Id: Ic0c2ff618d8a6212f498e3b7475e0a7856c22b5b Reviewed-on: https://code.wireshark.org/review/24007 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-20nfapi: fix 'nfapi.p7_message_header.m_segment_sequence' exists multiple ↵Alexis La Goutte1-2/+2
times with NOT compatible types: FT_UINT8 and FT_BOOLEAN Change-Id: I221315e6dc28835ce976caf167962847d536edc6 Reviewed-on: https://code.wireshark.org/review/24001 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-20autotools: Improve SUBDIRS usageJoão Valverde3-51/+11
Change-Id: Ia40970c37f4b60f8b820c334c3c728a0ac33f228 Reviewed-on: https://code.wireshark.org/review/23996 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-19LCSAP: fix retrieval of XML dissector handlePascal Quantin3-20/+14
Bug: 14131 Change-Id: Ie77ade9d54f9d0a5fa0183cedc154e6595a489cf Reviewed-on: https://code.wireshark.org/review/23991 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-19TCP: Add a documentation note.Gerald Combs1-0/+2
Note that changes to tcp_analyze_sequence_number should be synced with docbook/wsug_src/WSUG_chapter_advanced.asciidoc#ChAdvTCPAnalysis. Change-Id: Iac72d2cf808d84c17fa5f12012675e0af1895cd1 Reviewed-on: https://code.wireshark.org/review/23989 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-19Remove duplicate values in pfcp_pr_time_unit_valsMichael Mann1-1/+1
** (process:8955): WARNING **: Field 'Uplink Time Unit' (pfcp.ul_time_unit) has a conflicting entry in its value_string: 3 is at indices 3 (Day) and 4 (Week)) ** (process:8955): WARNING **: Field 'Downlink Time Unit' (pfcp.dl_time_unit) has a conflicting entry in its value_string: 3 is at indices 3 (Day) and 4 (Week)) Change-Id: I870af4a53721e0ffe0f9f778c8287e090f2b2929 Reviewed-on: https://code.wireshark.org/review/23985 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-19Correct duplicate values for csi_rs_class_valsMichael Mann1-1/+1
** (process:8955): WARNING **: Field 'Class' (nfapi.csi.rs.class) has a conflicting entry in its value_string: 1 is at indices 1 (Class A) and 2 (Class B)) Change-Id: I6063fd5fe0094efe776a3a04556c633a4e495a9a Reviewed-on: https://code.wireshark.org/review/23986 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-19FP Mux: disable heuristic dissector by defaultPascal Quantin1-1/+1
Without any specific pattern, it is too weak and catch a lot of unrelated UDP packets. Change-Id: Iacac5ae65de59da1d46a06184517834edd91eb18 Reviewed-on: https://code.wireshark.org/review/23984 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-19Update enumerations for SISO-REF-010 v22Graham Shanks1-99/+884
Change-Id: Icb326dac7cfe0478df3d892df279ad0f241c7ba6 Reviewed-on: https://code.wireshark.org/review/23981 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-19fpmux: Fix error string and commentNikolai Ipatyev1-2/+2
Change-Id: If4620a43d706f7067a018eb964e4db3733d65210 Reviewed-on: https://code.wireshark.org/review/23980 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-18FP Mux: reject empty tvbPascal Quantin1-1/+4
Bug: 14140 Change-Id: I43c635e97f33c190e2a4a7f42e58f4274bd03f2b Reviewed-on: https://code.wireshark.org/review/23978 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-18FP Mux: create conversation if it does not existPascal Quantin1-3/+6
Change-Id: Ib26145c30f6f3ba20e26d52f1e4b90825029809d Ping-Bug: 14140 Reviewed-on: https://code.wireshark.org/review/23977 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-18FP Mux: do not register UDP port 44955 by defaultPascal Quantin1-1/+1
It is not registered by IANA Change-Id: Iff462ee0a2366ae72681b34e4e7e107c8c479822 Reviewed-on: https://code.wireshark.org/review/23976 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-18FP Mux: fix a typo in preferencesPascal Quantin1-1/+1
Change-Id: I19ba1bb223a3356b4048448f0bb908f23e7364c0 Reviewed-on: https://code.wireshark.org/review/23975 Reviewed-by: Nikolai Ipatyev <wallprime@yandex.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-18Update packet-kerberos.cJoão Valverde1-3/+3
Change-Id: I86387e4f8ebf7f7cd2f3b9e01e9b4cfe91a7357e Reviewed-on: https://code.wireshark.org/review/23974 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18autotools: Remove abi-compliance-checker codeJoão Valverde1-42/+0
It's been broken for over a year, needs to be modernized and as implemented it's a maintenance nightmare. Get rid of it. Ping-Bug: 13036 Change-Id: I34a6e4c28b6d3b96dd6550dd21e9cbeaf050d58f Reviewed-on: https://code.wireshark.org/review/23967 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18autotools: Sort out how we handle register.cJoão Valverde1-35/+14
register.c is a built source. It should not be included in the distribution and should be removed with the distclean target. Remove XXX comment suggesting adding the cache to the distribution; let's not do that. Change-Id: I20f9467a93e2b5ad3ee56a5fa83381095b1d28c6 Reviewed-on: https://code.wireshark.org/review/23971 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-10-18Add FP-Mux dissectorNikolai Ipatyev4-0/+397
Change-Id: I58a9a0cf0364c8ce5f173ed28c054fd05738f690 Reviewed-on: https://code.wireshark.org/review/23868 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-10-18SMB2: accept and save empty filenames on CREATE requestsAurelien Aptel1-1/+1
[MS-SMB2] 2.2.13 CREATE Request, NameOffset: > A zero length file name indicates a request to open the root of the share. This also ends up enabling the parsing of missing fields (InputBufferLength, AdditionalInformation, Flags) in QUERY_INFO requests, which required a non-NULL saved->extra_info. Change-Id: I9af3933cc6bb93247bad23c7dd82a52787595f69 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/23959 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-10-17Protobuf: Fix format errorUli Heilmeier1-1/+1
Fixes error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'guint64' Change-Id: I431ab2e1920b7856ff686bd79bc881dee494706f Reviewed-on: https://code.wireshark.org/review/23965 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-10-17ZCL SE Octet Strings: Dissect zcl se octet strings as length and dataMartin Boye Petersen1-43/+95
Implemented a function to dissect zcl octet strings in a similar way as attributes that have a data type of zcl octet string. Currently the function is used for event data (publish event and publish event log), as well as top up code (consumer top up and publish top up log). Bug: 14138 Change-Id: Idae6240312bedeaa12f10777e1009b110d5f834d Reviewed-on: https://code.wireshark.org/review/23881 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17dissector/ptp: fix typo - should be ptp.as.sig.tlv.flagsAdam Wujek1-1/+1
Change-Id: I31be23516d7fb169daa827b505bcde04426e84dc Signed-off-by: Adam Wujek <adam.wujek@cern.ch> Reviewed-on: https://code.wireshark.org/review/23961 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17SMB2: rename QUERY_INFO buffer input fields and parse Reserved fieldAurelien Aptel1-10/+13
Since the packet has an output and input buffer, having a field just called "size" or "offset" was confusing. Change-Id: Iadb45fa50e6ea6ffaa7c3b041704837641f64ab6 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/23958 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-10-17[Bluetooth] Prepare for adding a BT Mesh dissector.AndersBroman1-19/+48
Change-Id: I79140a15c93e7bfada5036fd3fbb1bb94d99a655 Reviewed-on: https://code.wireshark.org/review/23940 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-10-17nfs: fix nfs dissector to show correct mirror and data server countsTigran Mkrtchyan1-20/+22
nfs dissector wrongly have used proto_tree_add_item to display a counter, by assuming that last argument is a value. Replace proto_tree_add_item with proto_tree_add_uint or proto_tree_add_subtree_format when a loop counter must be displayed. Update tree item size calculation. Change-Id: I4137e42673fa33cae61494effe1195206fbf7f28 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/23748 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-10-17CMake: fix build regression with CMake 3.0Peter Wu1-1/+8
This kind of generator expressions do not seem to work in CMake 3.0. It works fine in CMake 3.1.0 and later versions. Change-Id: I262566a5ea831ae0fbe4b6a3249b59401f9d3b15 Fixes: v2.5.0rc0-1334-gd3f636ece0 ("cmake: fix CMP0026 deprecation warning in CMake 3.9") Reviewed-on: https://code.wireshark.org/review/23949 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-17ssl: regression fix for decryption with renegotiationPeter Wu1-9/+9
A renegotiated session with decrypted records has !maybe_encrypted which means that the plaintext buffer is passed to dissect_ssl3_handshake. Do not assume that this plaintext buffer might be encrypted, it is definitely not the case. Change-Id: I2ce9a5305e5cbc24b5c7e93077f7e796bf8cb406 Fixes: v2.5.0rc0-1314-g9d189c7e20 ("ssl: assume everything after CCS is encrypted") Ping-Bug: 14117 Reviewed-on: https://code.wireshark.org/review/23948 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-16nfapi: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+3
Value stored to 'offset' is never read Change-Id: Ia7f651edec36a75c60816a3803e53dc86d749262 Reviewed-on: https://code.wireshark.org/review/23942 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-10-16nfapi: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
Value stored to 'item' is never read Change-Id: I964c06d1a3896e9e5c52dfcb2f17478f15350910 Reviewed-on: https://code.wireshark.org/review/23941 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 07:41:23 +0000