aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-06-26filter: rename shadow varDario Lombardo2-2/+2
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 Reviewed-on: https://code.wireshark.org/review/16102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26srt: rename shadow variableDario Lombardo2-8/+8
Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0 Reviewed-on: https://code.wireshark.org/review/16101 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26stats_tree: rename shadow variableDario Lombardo1-2/+2
Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c Reviewed-on: https://code.wireshark.org/review/16100 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26h248: rename shadow variable.Dario Lombardo5-5/+5
Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443 Reviewed-on: https://code.wireshark.org/review/16099 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-24print(.c): fix indentAlexis La Goutte1-86/+83
Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33 Reviewed-on: https://code.wireshark.org/review/16124 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-24Indicate how this should be done.Guy Harris1-0/+7
Assuming that it could, if registered as an "eth.trailer" heuristic dissector, get the length of the entire frame, that is. Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d Reviewed-on: https://code.wireshark.org/review/16121 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Fix "disable this protocol by default".Guy Harris3-9/+28
Allow a dissector to mark its protocol as "disabled by default", which means that the "enable all protocols" routine won't enable it. This is necessary in order to allow the disabling of protocols not to be unintentionally changed due to profile changes; see bug 9826. Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f Ping-Bug: 9826 Reviewed-on: https://code.wireshark.org/review/16109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23LTE RRC: fix display of info column when receiving a BR SIBPascal Quantin3-10/+54
Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0 Reviewed-on: https://code.wireshark.org/review/16098 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>
2016-06-23packet-nfs: add extent decoding for SCSI layoutsBenjamin Coddington1-0/+58
Decode extents sent within the response to a LAYOUTGET operation on SCSI layout types. Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1 Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/16097 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>
2016-06-23NASA provided LTP and DTN updates dz-msfc3-264/+671
Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d Reviewed-on: https://code.wireshark.org/review/14310 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>
2016-06-23Increase MAX_DISSECTOR_ADDR_TYPE.Jens Kilian1-1/+1
With the recent changes causing some address types to be registered by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE limit in a new dissector I'm currently writing. Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee Reviewed-on: https://code.wireshark.org/review/16091 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23bthci: add missing break (CID 1362832)Dario Lombardo1-0/+1
Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0 Reviewed-on: https://code.wireshark.org/review/16090 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-06-23Fix some of the brokenness in the PRP redundancy control trailer dissector.Guy Harris1-0/+14
IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE CAPTURE. THERE ARE NO EXCEPTIONS TO THIS RULE. Bug: 9826 Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9 Reviewed-on: https://code.wireshark.org/review/16092 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Add LACP "flag strings"Michael Mann1-25/+64
Merged the functionality of a Lua script from Sharkfest '16 presentation into the dissector. Also cleaned up some of the tfs values used by the dissector. Bug: 12550 Change-Id: I6b4c2f4d8a07cfb836265518d713a499df3e971c Reviewed-on: https://code.wireshark.org/review/16086 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>
2016-06-23ZigBee updated ZDO support to comply with R22Chris Brandson3-16/+207
Update ZDO support for R22 (and IEEE 802.15.4-2015) - Add support for the new IEEE Joining List request / response - Changed Network Update to support channel pages - Added Network Update Enhanced request - Added decoding of EU Sub-GHz Frequency Band Change-Id: I3a513a486f6d3784897fc8b783411c678e3f905e Reviewed-on: https://code.wireshark.org/review/16040 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23IPv6: Don't check payload length for ICMPv6 encapsulationJoão Valverde1-1/+1
Change-Id: I783df2ddc98da1c78020837a32005ea143321990 Reviewed-on: https://code.wireshark.org/review/16081 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-23Squelch some 64-bit-to-32-bit-shortening warnings.Guy Harris1-4/+8
Change-Id: I64f833abd11d3b2511c235bb353cb5fb7b813b7f Reviewed-on: https://code.wireshark.org/review/16085 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23HTTP: Split URI into path and query. Tokenize parameters.Uli Heilmeier1-3/+40
Split a HTTP URI into path and query. Tokenize the parameters of a query. Bug: 12514 Change-Id: I9892914eba9737c9751936ce62e63497aba61c61 Reviewed-on: https://code.wireshark.org/review/15971 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-22SSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+1
Change-Id: If084278acfeb82ae7c91aefff9035f156e8f4f15 Reviewed-on: https://code.wireshark.org/review/16079 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Kenny Root <kenny@the-b.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Add address_to_bytes API.Michael Mann18-19/+62
This will copy an address's "byte format" into a buffer. The original intended design is for export_pdu functionality, which tries to do this "manually" for many address types (and creates undesired dependencies) The default functionality if a "byte format function" isn't provided (currently the case for all address types) is a memcpy of the address data. Providing "address to byte" functions to aid export PDU functionality will be provided later. Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b Reviewed-on: https://code.wireshark.org/review/16070 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>
2016-06-22Move AT_VINES address type to VINES dissector.Michael Mann4-47/+40
proto.c still has to deal with FT_VINES, but maybe that can be refactored to the dissector too. Change-Id: Iee04eed3b75f91cb62bb7b625dd44baeeb9aebb3 Reviewed-on: https://code.wireshark.org/review/16069 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-22Move AT_USB to inside USB dissector.Michael Mann4-53/+50
This required some hacking in the conversation table handling, but still seemed worth it as USB address is not widely used. Maybe a "is_stringlike" property for address types... Change-Id: I628a15c17cb1f595bb292130867adbc5bea0f41a Reviewed-on: https://code.wireshark.org/review/16068 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>
2016-06-21The C standard requires <stdlib.h> for getenv() and abort().Guy Harris1-0/+1
You might be able to get away with not including it on some or all UN*Xes, but you can't do so on Windows with MSVC. Change-Id: Id2de70745e2a6e8dedc005a55030f3d3fcb54a69 Reviewed-on: https://code.wireshark.org/review/16064 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-21More helpful failure when registration fails.Joerg Mayer1-0/+7
Change-Id: I3c574c504cc9166d04b5b725a6a393767a58a280 Reviewed-on: https://code.wireshark.org/review/16063 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-21As with dissector_add_uint(), so with dissector_add_{string,guid}.Guy Harris1-7/+17
Improve the error message for a null disssector handle. Fix indentation while we're at it. Change-Id: I1cb2f8ac52e56fc98f6b3ad981018f571e5a7bf0 Reviewed-on: https://code.wireshark.org/review/16060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-21Slightly improve error message in case of initialization errors.Joerg Mayer1-3/+8
Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3 Reviewed-on: https://code.wireshark.org/review/16059 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-21tshark JSON and Elasticsearch output fixMartin Kacer2-38/+128
Fixed json and ek escape function Fixed -j protocol filter to do exact match Fixed -T json to correctly close json Added -j protocol filter also to pdml output Bug: 11754 Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea Reviewed-on: https://code.wireshark.org/review/16034 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: Guy Harris <guy@alum.mit.edu>
2016-06-21Add a couple of vendor defines.AndersBroman1-0/+3
Change-Id: I252b4f892a539c7fa585615ef636fc26de356bf7 Reviewed-on: https://code.wireshark.org/review/16055 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-21[H248-Q1950] Correct signal ids.AndersBroman1-4/+5
Change-Id: Iafb030313ed3b715a09146d131dfb4ffdcb7961a Reviewed-on: https://code.wireshark.org/review/16054 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-21bthci: Show unknown ocf as undecodedStig Bjørlykke1-1/+6
Don't show unknown ocf values as unexpected parameters. Change-Id: I08a6c8c20d6382a847f0a2969e4c523a2873dd6f Reviewed-on: https://code.wireshark.org/review/16048 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-06-21packetlogger: Add some info typesStig Bjørlykke1-0/+9
Add Kernel, Kernel Debug and Error info types. Change-Id: I04547a426b69adde5186e8315a08f4648c1e7837 Reviewed-on: https://code.wireshark.org/review/16047 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>
2016-06-21ceph: c_dissect_sockaddr doesn't need the "data" pointerJeff Layton1-15/+15
Change-Id: I8d4ca2e46a556e32e594610fd26c72840783601e Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-on: https://code.wireshark.org/review/16042 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>
2016-06-21Add support for Opencontrail virtual networkRudra Rugge1-1/+138
Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83 Reviewed-on: https://code.wireshark.org/review/15930 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>
2016-06-20[RNSAP]Update to V13.1.0 (2015-12)AndersBroman8-2840/+13229
Change-Id: I6cb7099ac691d68ddae7be59bf37130c8affad42 Reviewed-on: https://code.wireshark.org/review/13263 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-19Don't assume we have an array of GeoIP databases.Guy Harris1-1/+1
The attempt to open them might fail; if geoip_dat_arr is null, just return 0 as the number of databases, don't crash. Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c Reviewed-on: https://code.wireshark.org/review/16025 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-19[Automatic update for 2016-06-19]Gerald Combs2-23/+223
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57 Reviewed-on: https://code.wireshark.org/review/16014 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-19Revert "tap: change glib functions to wmem."Pascal Quantin8-56/+44
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985. It breaks the registration of codec, dissector and libwiretap plugins. Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de Reviewed-on: https://code.wireshark.org/review/16012 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-19Add modelinesJoerg Mayer1-0/+13
Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e Reviewed-on: https://code.wireshark.org/review/16011 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-19Calculate and print CWmin and CWmax in addition to ECWmin and ECWmaxJoerg Mayer1-3/+22
This also changes the summary presentation to make it more compact Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b Reviewed-on: https://code.wireshark.org/review/16000 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-19cmake: add PIDL dissector generation supportPeter Wu3-30/+171
The dissectors list is generated based on regex magic on pidl/Makefile. A dssetup.cnf file is added because all other protocols already have this file. The srvsvc and wkssvc protocols cannot be built for some reason, so just disable it (this mirrors the original Makefile). Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing compared to autotools. Tested with an out-of-tree and in-tree build with cmake (make and ninja): cmake -GNinja && ninja -v pidl-dissectors touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03 Reviewed-on: https://code.wireshark.org/review/15962 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>
2016-06-18DCE/RPC: fix array of pointers with NULLBinh Trinh16-20/+70
Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f Reviewed-on: https://code.wireshark.org/review/16004 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18ZigBee dissector added support for the Power Negotiation bitChris Brandson2-0/+8
An update to R22 adds the Power Negotiation bit to the Parent Information of the End Device Timeout Response Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1 Reviewed-on: https://code.wireshark.org/review/16001 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>
2016-06-18GTPv2: Use proto_tree_add_bitmaskMichael Mann1-14/+9
Change-Id: I236a3513237a7a977389438adaf381542281943d Reviewed-on: https://code.wireshark.org/review/15997 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-17MKA: tvbrange for all subtrees correctedSamiran Saha1-15/+16
* Incorrect tvbrabge was affecting highlight on selection. * AN & Confidentiality Offset dissection fixed. Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9 Reviewed-on: https://code.wireshark.org/review/15996 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17ssh: add RSA host key printingKenny Root1-3/+20
Adds a dissector for the ssh-rsa type of public key where the modulus and public exponent are extracted out. Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e Reviewed-on: https://code.wireshark.org/review/15975 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17ssh: add hostkey informationKenny Root1-6/+56
Adds a framework for hostkey to be printed out separately from the rest of the key exchange. This will allow for individual key information to be presented separately in subsequent changes. Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa Reviewed-on: https://code.wireshark.org/review/15974 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>
2016-06-17Diameter-3GPP: add AVP 21 RAT-Type decodingBinh Trinh1-0/+42
Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f Reviewed-on: https://code.wireshark.org/review/15993 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17Add an expert item to asure that aifsn is at least 2Joerg Mayer1-0/+7
Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb Reviewed-on: https://code.wireshark.org/review/15998 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-17tap: change glib functions to wmem.Dario Lombardo8-44/+56
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf Reviewed-on: https://code.wireshark.org/review/15270 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17GTPV2: add decoding of ECI into enodebid and cellidBinh Trinh1-1/+24
Change-Id: If46cc354e202ff9a126580bf742d747e42678f83 Reviewed-on: https://code.wireshark.org/review/15994 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>