aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-06ui/follow: fix The 'find_addr[UDP_STREAM]' variable is assigned values twice ↵Alexis La Goutte1-1/+1
successively. Perhaps this is a mistake. Found by PVS Studio (V519) Yes, there is a mistake ! Change-Id: I6c6c67300c0e05d3ede00be27f675cc8b15bb439 Reviewed-on: https://code.wireshark.org/review/8794 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06ISAKMP: fix dissection when building with libgcryptPascal Quantin1-1/+2
Regression introduced in gb5b3a6b Change-Id: I26b9d703a40ca92703fd3e2a749386996667ea4c Reviewed-on: https://code.wireshark.org/review/8795 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06SKYPE: fix The use of 'if (A) {...} else if (A) {...}' pattern was detected. ↵Alexis La Goutte1-1/+1
There is a probability of logical error presence found by PVS Studio (V517). Yes, there is a bug ! :-) Change-Id: I16319e6441575b9d7b702e6b23f7a7996ef85523 Reviewed-on: https://code.wireshark.org/review/8793 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06SMB2: There are identical sub-expressions to the left and to the right of ↵Alexis La Goutte1-2/+2
the '&&' operator: si && si->saved && si->saved found by PVS Studio (V501) Change-Id: I9323ee98bd0f4b9b6d8c6921e99d32ad62a5f18f Reviewed-on: https://code.wireshark.org/review/8791 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06SCSI: There are identical sub-expressions ↵Alexis La Goutte1-1/+1
'tvb_reported_length_remaining(tvb, offset)' to the left and to the right of the '!=' operator found by PVS Studio (V501) Change-Id: Iaf7ea99e983d3b42dedf2620250dec0f3d68f937 Reviewed-on: https://code.wireshark.org/review/8790 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06DCERPC: There are identical sub-expressions 'tvb_reported_length(tvb)' to ↵Alexis La Goutte1-1/+1
the left and to the right of the '==' operator found by PVS Studio (V501) Change-Id: I6cd745d07c89a5fa08ef976bab406f96cdae2881 Reviewed-on: https://code.wireshark.org/review/8789 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06DCC: fix There are identical sub-expressions 'tvb_get_guint8(tvb, offset + ↵Alexis La Goutte1-1/+1
4)' to the left and to the right of the '|' operator found by PVS Studio (V501) Change-Id: I8c71ee5b0c07f7ee9a4b64fee4ac226918ed4307 Reviewed-on: https://code.wireshark.org/review/8788 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06BER: fix There are identical sub-expressions ↵Alexis La Goutte1-1/+1
'tvb_reported_length_remaining(tvb, offset)' to the left and to the right of the '==' operator found by PVS Studio (V501) Change-Id: I9e462461c66f2f3338a059b64dbc28682df94ae2 Reviewed-on: https://code.wireshark.org/review/8787 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06ISAKMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I06d09d5d0d54c96e18d9b423999cb309559612dd Reviewed-on: https://code.wireshark.org/review/8784 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-06IEEE 802.11: Add a option for disable FCS checkAlexis La Goutte1-11/+21
Bug:11205 Change-Id: Ia3bc63dbb1504381b58f9e31b56412574ec96f4e Reviewed-on: https://code.wireshark.org/review/8675 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>
2015-06-06Aruba ERM: Use decode AS for decode Aruba ERM Type..Alexis La Goutte1-45/+179
Change-Id: I4c0813a273e88b16dcad7996dc1dcaaac3d01944 Reviewed-on: https://code.wireshark.org/review/8712 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>
2015-06-06Aruba ERM: Fix FCS for Type 1 (PEEK)Alexis La Goutte2-7/+21
Type 1 is Peek type (using Peek dissector) Peek dissector is also update for Cisco AP, Pass info to peek dissector it is "Aruba PEEK" (with buggy FCS) Add also check of signal value (when signal strength = 100%) it is a TX packet and there is no FCS Bug:11204 Change-Id: I435e0e3275bc0a03fa534e49e86251114f568040 Reviewed-on: https://code.wireshark.org/review/8710 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06Aruba ERM: Fix FCS for Type 3Alexis La Goutte1-7/+15
Add a check of signal value (when signal strength = 100%) it is a TX packet and there is no FCS Only work for Type3 (no signal information on Type 0) For type 0, Always display the FCS Bug:11204 Change-Id: I837f8c01c0d0284ecb218b6b03fa9ac025fac5f2 Reviewed-on: https://code.wireshark.org/review/8569 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06TCP: Add (generated) field with first letter of TCP FlagsAlexis La Goutte1-1/+39
from help TCP Troubleshooter Based on http://blog.didierstevens.com/2014/04/28/tcp-flags-for-wireshark/ Change-Id: I115717f738a77dd1b22cefa8f646bcdbe9884ec2 Reviewed-on: https://code.wireshark.org/review/8733 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>
2015-06-06Print unsigned long values with %lu, not %ld.Guy Harris1-4/+4
Change-Id: Ic437f5ec918c1cd4d39eb27e0a4fafb2a2f4b244 Reviewed-on: https://code.wireshark.org/review/8782 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-05Clean up stats_tree_presentation.Gerald Combs5-71/+5
Remove some unused struct members and accompanying callbacks. Change-Id: I64d32ddf886038e8f19bc3f88e86c8d7578db648 Reviewed-on: https://code.wireshark.org/review/8779 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-05Qt: clear Go To Packet text box when opening itPascal Quantin1-0/+1
Most of the time you intend to go to a new packet, not to go to the previously selected one. This makes it consistent with all the editors I have used so far. Change-Id: Ib0cde3c8361a8c3103dd05d622eaba4ee7deab78 Reviewed-on: https://code.wireshark.org/review/8772 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>
2015-06-05Fix a few issues reported by PVS-StudioPascal Quantin5-7/+8
See http://www.viva64.com/en/b/0328/ for details Change-Id: Ic9ddfd690b49401c96cb8a4a277c671f9824be31 Reviewed-on: https://code.wireshark.org/review/8775 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> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-05GTK: fix a crash when switching a column to custom through 'Edit Column Details'Pascal Quantin1-1/+2
Bug: 11245 Change-Id: I269d4dc8bd1ec23e3e6be4c9432563b8e275c548 Reviewed-on: https://code.wireshark.org/review/8778 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>
2015-06-05Qt: Add the capture and display filter dialog.Gerald Combs19-46/+661
Use a single overloaded dialog, similar to the GTK+ UI. Change-Id: If85db14a7101770f115bef725f5145e0010c518d Reviewed-on: https://code.wireshark.org/review/8776 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-05Don't include cfile.h.Gerald Combs2-3/+1
Change-Id: I98bc0d02e23abd32796f15bf28ceef0b6ea56d42 Reviewed-on: https://code.wireshark.org/review/8777 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-05BGP: MP (UN)REACH NLRI SAFI is 1 octet longAlexis La Goutte1-2/+2
Break when remove proto_tree_add_text (g1307c2255f) Change-Id: Id5512424180b4834c20fa5416499fc939c06d1ea Reviewed-on: https://code.wireshark.org/review/8774 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-05BGP: Add EVPN draft-rabadan-l2vpn-evpn-prefix-advertisement supportMatthieu Texier1-5/+70
Bug: 11252 Change-Id: I125e3075125451d2cbeac6cc183977e73040887f Reviewed-on: https://code.wireshark.org/review/8767 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-05iSCSI: handle repetition of InitiatorTaskTag fore request / response trackingPascal Quantin1-20/+60
Use a red-black tree instead of a hash map so as to take he current frame number into account Only insert entries in the red-black tree on first pass Bug: 11250 Change-Id: Ic6e4a5e4f3cd4a22c2df0b8851c6651695648fa8 Reviewed-on: https://code.wireshark.org/review/8763 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-05Add dissector for the Aeron protocol.David Ameiss4-0/+3070
Bug: 11164 Change-Id: I7ed6a3fd18aaadfc9b7b9619b1035206e86f46d6 Reviewed-on: https://code.wireshark.org/review/8240 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-04ZVT: start dissecting the tlv containerMartin Kaiser1-9/+109
Change-Id: I555e4f487fb5aafa61dabfcab784dad5e71510ec Reviewed-on: https://code.wireshark.org/review/8769 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-04DVB-CI: minor cleanupMartin Kaiser1-2/+2
tvb_length -> tvb_captured_length copyright ... - 2015 Change-Id: Id3043725edda2b59c06d17de41c8dfc8ea4ae11c Reviewed-on: https://code.wireshark.org/review/8768 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-04Fix decryption test suite on WindowsPascal Quantin2-1/+1
Change-Id: Ib8207d56a7e064855ce1444c927913c9c9258788 Reviewed-on: https://code.wireshark.org/review/8766 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-04Ensure that run_and_catch_crashes has UNIX/POSIX line endingsPascal Quantin1-7/+8
Change-Id: If7b5047c15c747ac306960003c60a3ccd35f3e51 Reviewed-on: https://code.wireshark.org/review/8764 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-04SSL: Add support for private key password when decryptingKevin Grigorenko4-3/+19
SSL traffic from tshark with -o ssl.keys_list. For example, as used in a new test also added in this commit: -o "ssl.keys_list: 127.0.0.1,9131,http,$TEST_KEYS_DIR/key.p12,WebAS" Change-Id: Ia6960fa4ae88182277f6d22d84ec9170ea74d54e Reviewed-on: https://code.wireshark.org/review/8746 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04[MSVC 2015] Try to fix warinings turned errors.Anders2-3/+3
Change-Id: Ife5aba55d6953fbd3874095f2e469a844ca8ef2e Reviewed-on: https://code.wireshark.org/review/8762 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04packet-pmproxy.c:94: warning: implicit conversion shortens 64-bit valueAnders1-1/+1
into a 32-bit value Change-Id: Ib741ad1c4f237ca921c01c86a521a238cdf25e8f Reviewed-on: https://code.wireshark.org/review/8761 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04[MSVC2015] TRy to fix Warnings turned errors.Anders6-55/+10
Change-Id: I1156e66daad84004f4f7acae0175fcbb475db71a Reviewed-on: https://code.wireshark.org/review/8760 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04Profinet: Add Fiber Optic Diagnosis Info.Birol Capa1-0/+28
This make reading fiber optic diagnosis data possible. Change-Id: I90b49443ffa1b69912d37cbf7a751328eec9d590 Reviewed-on: https://code.wireshark.org/review/8750 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-04P1: fix request for implicit conversion from 'gpointer' to 'struct ↵Alexis La Goutte2-2/+2
p1_address_ctx_t *' not permitted in C++ [-Wc++-compat] Change-Id: I43364dda21abe3281fbd15ad953232093bb1fffa Reviewed-on: https://code.wireshark.org/review/8756 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-04rtp/pm proxy: fix implicit conversion shortens 64-bit value into a 32-bit valueAlexis La Goutte2-3/+3
packet-pmproxy.c:93: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-pmproxy.c:94: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-pmproxy.c:95: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-rtpproxy.c:831: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: Ibf1491c1e56dfe6684fe2fe67edc1a721d5de56f Reviewed-on: https://code.wireshark.org/review/8753 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04ISAKMP: fix build about unused variableAlexis La Goutte1-1/+1
Change-Id: Id55eeb6d4c29088dec97b270aca61f8c5d777a46 Reviewed-on: https://code.wireshark.org/review/8752 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04Dissection support for pmproxyRyan Doyle5-2/+277
Implements dissection for the Performance Co-Pilot proxy protocol. Its a simple protocol that exchanges host and port information and then passes all traffic via the usual PCP protocol. Change-Id: I54fbf6b7755b7b1c60e0e1696ac9c4f0d98d8fe7 Reviewed-on: https://code.wireshark.org/review/8704 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04[RTPproxy] Simplify positive reply parsing and minor cleanupsPeter Lemenkov1-14/+33
* Merge both 'positive reply' and 'version ack' processing into one block. * Also use realsize where possible instead of recalculating packet's size again. * Add a bit more comments. * Remove some 'magic' numbers. Use actual string sizes instead. * Skip trailing zeroes inserted by some old SIP-servers. Change-Id: Ie66aa4d6e807a1f351b62d36333301fdec1550fa Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> Reviewed-on: https://code.wireshark.org/review/8738 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04Eliminate proto_tree_add_text from a few dissectors.Michael Mann7-371/+409
Change-Id: Ia6b62fae76ae76a2859ec47229e1c299bddb5a31 Reviewed-on: https://code.wireshark.org/review/8749 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>
2015-06-04WCCP: Fix up storing and decoding of IP addresses.Jeff Morriss1-69/+60
Try to decode as many IP addresses as we can, even if they don't fit in the table we store them in. Only add IP addresses in the table once. We could theoretically reallocate the table but the original code seems to assume the addresses should (in non-fuzzed captures) only show up once per PDU. This part of the change fixes the fuzz failure. Bug: 11153 Change-Id: I56b9854ac1342080c9f32699a3f97750fa335696 Reviewed-on: https://code.wireshark.org/review/8748 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04MIME Multipart: fix display of the last IMF fieldPascal Quantin1-0/+4
Regression was introduced in g23f0e16 Bug: 11249 Change-Id: I2822a4452d3cdf2e53e5f3f1f3034e758fec129b Reviewed-on: https://code.wireshark.org/review/8747 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>
2015-06-03Use the GPOINTER_TO UINT macro rather than trying to do the castsAnders1-1/+1
manually. This makes MSVC 2015 happy. Change-Id: I50ebcb5860863cd6e212bb0964998292a46075f5 Reviewed-on: https://code.wireshark.org/review/8744 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-03Update mobile network codes of South Korean mobile networks.Shinjo Park1-2/+5
Change-Id: I4f988da98846ebeeba47ace270f64911baaca0b7 Reviewed-on: https://code.wireshark.org/review/8745 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-03IS-IS (LSP) Add Shared Risk Link Group (SRLG) clv (138)Alexis La Goutte2-1/+96
Bug:11246 Change-Id: I303de72cda8e667dcd3ccd1af3f2989123718544 Reviewed-on: https://code.wireshark.org/review/8743 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-03Netscaler: Fix issue where packets were lost when selected packets were exportedanilkumar9111-5/+21
Only this issue with a netscaler trace file Bug: 11248 Change-Id: I2bc2cae5c988eeff7bdd08471bf421faafcd4e73 Reviewed-on: https://code.wireshark.org/review/8672 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-03openSAFETY: Fix false-positiveRoland Knall1-1/+4
- The starting offset for a consecutive frame search was off by 1 Change-Id: Ife77f9823e7e6d9a6601dba9c4cca74984e4ed40 Reviewed-on: https://code.wireshark.org/review/8741 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-03G_STRUCT_OFFSET gives warnings turned errors with MSVC2015,Anders2-2/+11
use offsetof if defined or define it ourselfs as done in other places in our code base. Change-Id: Ia1c72c9648336e93ba8c14d4bc0371d782835370 Reviewed-on: https://code.wireshark.org/review/8735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-03ISAKMP: Don't complain about zero-length config attributes in request ↵Martin Mathieson1-26/+30
messages - this is expected Change-Id: I1cedb7d84ca7e4c2af30405f5624a327fd796c86 Reviewed-on: https://code.wireshark.org/review/8739 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-03Fix OSX CMake warningsGraham Bloice1-0/+5
Set the CMake policy for CMP0042 to old Change-Id: I2b71e1d8d9b9b90ede11df1a7874a2360c3032c5 Reviewed-on: https://code.wireshark.org/review/8740 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>