aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-nwk.c
AgeCommit message (Collapse)AuthorFilesLines
2018-04-16glib: Get rid of GLIB_CHECK_VERSION as we now require 2.32.0Anders1-1/+0
Change-Id: Ie95cf37f9cd283545693e290340a7489cc989c95 Reviewed-on: https://code.wireshark.org/review/26970 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04ZigBee: Many-to-one route options info columnDana Sy1-0/+4
Change the column info so that it will display "many-to-one route request" if the many-to-one mask is found in the route options bitmap Change-Id: Ia55d7bb6110d05040b7e52cc63b2f1cc592998da Reviewed-on: https://code.wireshark.org/review/26725 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-14ZigBee: implemented a dissector for ZBOSS key dumpdsrsupport1-0/+19
Implemented dissecting of ZBOSS keys dump (debug stuff) and adding a key into NWK keys ring. Move adding key to keyring from dissect_zbee_aps_transport_key into separate function. Change-Id: If0e414765350ec5131d0f815edf70cc224aef732 Reviewed-on: https://code.wireshark.org/review/23524 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-07-20ZigBee: Add touchlink commissioning dissectors.Owen Kirby1-3/+13
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-03-14ZigBee NWK: Add zero length beacon checks to avoid assert.Robert Cragie1-0/+2
Add a zero length check on beacon to avoid assert when beacon payload is non existent. Change-Id: I016a97bda1590b8edc68db4f47e5c814e4eb8e0a Reviewed-on: https://code.wireshark.org/review/20550 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: 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-03-02Use glib-compatAndersBroman1-5/+1
Change-Id: I510af18d433c4db360243dda72260e59eb84355f Reviewed-on: https://code.wireshark.org/review/20336 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-08Fix ZigBee End Device Timeout enumerationChris Brandson1-1/+1
Value 1 incorrect. Remaining enumerations correct Change-Id: I31939fabded6c4eab13c5b61bbdd4f61b962f0e0 Reviewed-on: https://code.wireshark.org/review/19137 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-22Don't call proto_register_field_array() or expert_register_protocol() withAndersBroman1-3/+3
proto = -1 Change-Id: I60f899ad748b5d3e17f237552af7d2dbc8f27bd2 Reviewed-on: https://code.wireshark.org/review/17864 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-19fix endianess of rejoin source addressChris Brandson1-1/+1
Change-Id: I71e6e2f569524642a24778ceef81c03fdc0f54c5 Reviewed-on: https://code.wireshark.org/review/17149 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-08-17zbee (nwk): fix typo in Rejoin IE nameChris Brandson1-1/+1
Change-Id: I80184c66928b6704365e1538cf47c6036d4b053f Reviewed-on: https://code.wireshark.org/review/17090 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-18ZigBee dissector added support for the Power Negotiation bitChris Brandson1-0/+7
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-15ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee.dsrsupport1-1/+1
If decoded ZBOSS traffic dump, sure this is ZigBee, so bypass heuristic. If decoding air sniffer dump, try to go thru heuristic by checking for ext address src mode required for interpan. Change-Id: Iddf799400a4cf0fd73714f06b99e3d11c8cb2e60 Reviewed-on: https://code.wireshark.org/review/15921 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>
2016-06-15ZigBee: add support for inter-pan transmissions.dsrsupport1-160/+163
Added dissection of inter-pan nwk and aps stub to be used to decode ZLL commissioning cluster. Change-Id: I871016a93854f1caf2f14f2f84e5397de5f1e2ff Reviewed-on: https://code.wireshark.org/review/15918 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: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15zbee-nwk: don't THROW() an exception from a dissectorMartin Kaiser1-1/+1
we already have an expert info, so we can just return the number of bytes in the tvb Change-Id: I6199760316d7ef141877bc8f65012d36e4dd357b Reviewed-on: https://code.wireshark.org/review/15925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-06*_stdup_printf -> strdup for "single string only" formatting.Michael Mann1-2/+2
Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-04-16ZigBee support for NWK unknown command status and enhanced status message in R22Chris Brandson1-0/+14
Added support for the a new Network UNKNOWN_COMMAND status value for and the added payload to the Network Status frame to hold the Command Id that is not known. Change-Id: Ia0ff890ea17c18c98eb47c15f1074df30cb9d568 Reviewed-on: https://code.wireshark.org/review/14934 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-04-15802.15.4 fixed support for new ZigBee IEsChris Brandson1-56/+215
This is an update to change 14547. The processing of the ZigBee IEs have been removed from the IEEE dissector and a new dissector added to the ZigBee NWK module. In addition dissection has been simplified and enhanced. Change-Id: I1a2ee2d125b49443b90633163171e2712a8fdcdd Reviewed-on: https://code.wireshark.org/review/14898 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-04-11ZigBee R22 Added support for new Link Power Delta commandChris Brandson1-11/+88
The R22 version of the ZigBee PRO Core Spec adds a Link Power Delta command which is added by this update. Change-Id: Ib07cf81ef30b243be3b5e82bf9bef7459ee0c806 Reviewed-on: https://code.wireshark.org/review/14830 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> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann1-9/+4
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-2/+2
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27Zbee (nwk): fix 'zbee_nwk.multicast' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_UINT8 and FT_BOOLEAN Change-Id: I5947b0543e0b6270cbef69184360c19e2d25c8e0 Reviewed-on: https://code.wireshark.org/review/14205 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-0/+1
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris1-1/+1
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-1/+1
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 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-12-30ZigBee NWK: fix Info column for NWK Rejoin Resp.dsrsupport1-2/+4
Fixed ZigBee NWK Rejoin Response info column to display an address which parent gave to the rejoining child. Bug: 11940 Change-Id: I886b9fd6c7e99b097b297f351a84b95b3ffc5a94 Reviewed-on: https://code.wireshark.org/review/12911 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-12-29ZigBee NWK: add End Device Initiator field into NWK Frame Control according ↵dsrsupport1-0/+6
to ZigBee r21 Change-Id: I99d079145d371106257bb8f41979fd04b0d030d4 Reviewed-on: https://code.wireshark.org/review/12910 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-12-28ZigBee: Implement r21 NWK End Device Timeout Request/Response commandsdsrsupport1-1/+136
Change-Id: I4d05307d5c6bbfaacc68429bd675c1ecf14d1d5c Reviewed-on: https://code.wireshark.org/review/12866 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-12-25ZigBee NWK: fix Fix placement of NWK FCdsrsupport1-2/+2
NWK Frame Control tree bitmask was placed into the main tree. As a result, it was displayed at the same level as NWK packet. Fixed by changing tree to nwk_tree moving NWK FC into NWK packet. Bug: 11926 Change-Id: Iae8ce89098d81a5ab7fb3bd57660853c2f20957d Reviewed-on: https://code.wireshark.org/review/12858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-21Zbee(nwk): Changing comment format (javadoc=>Doxygen)Rishi Dev Singh1-300/+169
Change-Id: If56dfe7f52d965d0ebffcc36588b0c93234a1309 Reviewed-on: https://code.wireshark.org/review/12773 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-3/+3
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-22Use address functions instead of ADDRESS macros in asn1 and epanGerald Combs1-4/+4
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.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-10-01ZigBee: fix dissection of Link Status Address fieldPascal Quantin1-1/+1
Bug: 11564 Change-Id: I4320c794a0b6ba1693e2729eea424a0a43cf54d8 Reviewed-on: https://code.wireshark.org/review/10715 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-08-10Try to fix the build bou by copying tha cast made in glib.AndersBroman1-1/+1
Change-Id: I6da06b8e6ae272b940ef4ee47ce6b253bf9f3699 Reviewed-on: https://code.wireshark.org/review/9961 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10g_slist_free_full () does not exist until GLIB 2.28AndersBroman1-0/+5
Change-Id: I81df5b4dbe1916eca51cdb72199de7a90471bd07 Reviewed-on: https://code.wireshark.org/review/9960 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10zigbee: fix two memory leaksMartin Kaiser1-3/+8
==17992== 4 bytes in 1 blocks are definitely lost in loss record 68 of 4,102 ==17992== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==17992== by 0x9FB2F30: g_malloc (gmem.c:159) ==17992== by 0x9FC89E5: g_memdup (gstrfuncs.c:384) ==17992== by 0x703F977: dissect_zbee_aps (packet-zbee-aps.c:1300) ==17992== by 0x67B4F1E: call_dissector_through_handle (packet.c:618) ==17992== 8 bytes in 1 blocks are definitely lost in loss record 580 of 4,102 ==17992== at 0x4C272B8: calloc (vg_replace_malloc.c:566) ==17992== by 0x9FB2F88: g_malloc0 (gmem.c:189) ==17992== by 0x703F962: dissect_zbee_aps (packet-zbee-aps.c:1299) ==17992== by 0x67B4F1E: call_dissector_through_handle (packet.c:618) second version that uses glib memory routines and does not mix g_hash_table and wmem remove an obsolete comment and an unnecessary return; while at it Change-Id: I2e92db0613f01b6c3009e8ad82ceb65a87cba12e Reviewed-on: https://code.wireshark.org/review/9830 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-09zigbee: remove a numer of unnecessary if (tree) checksMartin Kaiser1-63/+31
Change-Id: Ifd0dcc220cfdd0809f2e7cf2fc54fc8bdeb987be Reviewed-on: https://code.wireshark.org/review/9947 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann1-3/+3
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann1-3/+3
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Call reassembly_table_destroy and move g_hash_table_destroyPeter Wu1-6/+10
This patch moves g_hash_table_destroy calls from the init routine to the cleanup routine. Besides that, the conditional check for the hash table has been removed, assuming that init is always paired with a cleanup call. If reassembly_table_init is found, a reassembly_table_destroy call is prepended to the cleanup function as well. Comments have been removed from the init function as well as these did not seem to have additional value ("destroy hash table" is clear from the context). The changes were automatically generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4d11f07180d9c115eb14bd860e9a47d82d3d1dcd Manually edited files (for assignment auditing): dvbci, ositp, sccp, tcp. Other files that needed special attention due to the use of register_postseq_cleanup_routine: - ipx: keep call, do not add another cleanup routine. - ncp: remove empty mncp_postseq_cleanup. mncp_hash_lookup is used even if a frame is visited before (see dissect_ncp_common), hence the hash table cannot be destroyed here. Do it in cleanup instead. - ndps: add cleanup routine to kill reassembly table, but do not destroy the hash table as it is already done in ndps_postseq_cleanup. Change-Id: I95a72b3df2978b2c13fefff6bd6821442193d0ed Reviewed-on: https://code.wireshark.org/review/9223 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-27Convert proto_tree_add_boolean to ↵Michael Mann1-17/+14
proto_tree_add_bitmask_[value|value_with_flags|list] Final part. While there change deprecated tvb_length-xxx() calls Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79 Reviewed-on: https://code.wireshark.org/review/8642 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-03-01Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and ↵Michael Mann1-2/+2
SET_ADDRESS calls for the same address. Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116 Reviewed-on: https://code.wireshark.org/review/7437 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-21Remove some dead initializersBill Meier1-10/+10
Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2 Reviewed-on: https://code.wireshark.org/review/6723 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-09Convert EUI64 address APIs to use wmem.Michael Mann1-1/+1
Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2 Reviewed-on: https://code.wireshark.org/review/6419 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-26Remove proto_tree_add_text from ZigBee dissectors.Michael Mann1-176/+156
Change-Id: I0488cb0ab33f2cc6dee227f1bfacec58eafc4190 Reviewed-on: https://code.wireshark.org/review/6055 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-25Deleting unnecessary #includes from dissectors.Martin Mathieson1-2/+0
Fifth batch (packet-rtp.c -> end). Will look at cleaning up and committing script afterwards. Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2 Reviewed-on: https://code.wireshark.org/review/6052 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-4/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-17Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and ↵Chris Brandson1-10/+10
moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector. Removed attrID and cmdID ZCL cluster functions. Bug in ZCL HVAC attribute registration. Fixed bug in ZCL command ID field registration. Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014 Fixed broken fragmented ZigBee packet collection and reassembly Use protocol fields for Thermostat schedule transitions. Added support for Key Establishment Cluster (CBKE) at SE 1.2a Updated Message cluster to SE 1.2a spec Added attribute reporting status which is common to all SE 1.2a clusters Added SE 1.2a tunnel cluster support ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance ZigBee security added key display for decrypted packets ZigBee Security Preferences fixed UAT type for Label so key label is editable again Added definition for Retail Service profile Added dissection for profile-wide (General Command Frame) commands when the profile is unknown Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad Reviewed-on: https://code.wireshark.org/review/5565 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>
2014-12-01Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.Michael Mann1-25/+15
Part 3 of many, but this concludes the strict conversion to proto_tree_add_bitmask. Patches to follow with use proto_tree_add_bitmask_xxx (some functions still need to be written) Change-Id: Ic2435667c6a7f1d40602124e5044954d2a296180 Reviewed-on: https://code.wireshark.org/review/5553 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29Add editor modelines; fix indentation as needed.Bill Meier1-0/+13
Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier <wmeier@newsguy.com>