aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zdp.c
AgeCommit message (Collapse)AuthorFilesLines
2016-06-23ZigBee updated ZDO support to comply with R22Chris Brandson1-5/+89
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-01ZigBee ZDO: fix parse of ZDO Node Descriptor Response.dsrsupport1-0/+6
Fix a bitmask for Stack compiliance revision. Add Network manager field. Bug: 12488 Change-Id: I0a0908f288997686b76899ee80d51c590599a32e Reviewed-on: https://code.wireshark.org/review/15681 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-05-23zigbee zdp: There are 32 bits in a guint32.Martin Kaiser1-2/+2
No need for obtuse math and lots of casting. Change-Id: I41bf7dd98700b1b58eae93d36bb55e2e7017b506 Reviewed-on: https://code.wireshark.org/review/15532 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>
2016-05-22Revert "zigbee zdp: remove some misleading casts"Martin Kaiser1-15/+15
It seems that the casts are required on OS X. This reverts commit d8ef04c8914e162139594cfe0aee3072bc513e70. Change-Id: I9644555552a6daab93334073a4fcf4f3f2522b59 Reviewed-on: https://code.wireshark.org/review/15539 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-22zigbee zdp: remove some misleading castsMartin Kaiser1-15/+15
sizeof() returns a size_t, which is unsigned when we assign the result of sizeof() to an unsigned lvalue like a guint, there's no point in casting to int Change-Id: I9644c72a22a6dadb9ecd4073a4fcbd1c93517b59 Reviewed-on: https://code.wireshark.org/review/15531 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-22zigbee zdp: remove some unnecessary NULL checksMartin Kaiser1-46/+40
Change-Id: I8219105ccf38db6592e2ba4c83d1ec1da73abc4f Reviewed-on: https://code.wireshark.org/review/15530 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-15802.15.4 added new ZigBee R22 status codesChris Brandson1-98/+101
Change-Id: I4708a3a08317c9799216d4045d0ccbea9dbe268f Reviewed-on: https://code.wireshark.org/review/14908 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann1-8/+2
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>
2015-12-26ZigBee: Implement ZDO Parent Annce according to r21dsrsupport1-0/+4
Change-Id: I208688c00e1cd7cb38c0d26a34ef8e49af3347e8 Reviewed-on: https://code.wireshark.org/review/12867 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-12-25ZigBee: Implement r21 Stack Compliance Revision in Node Descriptordsrsupport1-0/+6
According to r21, high 8 bytes of server flags contain stack compliance revision (21 for r21). Change-Id: Ifb84d74ed17f8d202d8aa92140ffcbe43abb39cc Reviewed-on: https://code.wireshark.org/review/12865 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-25ZigBee ZDO: Fix Mgmt_Leave fieldsdsrsupport1-2/+2
There were no masks for bitfields of Mgmt_Leave command. Fixed. ZBEE_ZDP_MGMT_LEAVE_* constants were wrongly copied from NWK LEAVE command. Fixed. Bug: 11927 Change-Id: Idac27b83740528678549824daa42e59c46c524ed Reviewed-on: https://code.wireshark.org/review/12859 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-23Zigbee(zdp): Changing Comment format.(javadocs=>Doxygen)Rishi Dev Singh1-248/+124
Change-Id: Ic55286739a35f43bde80cd96ea49e8b4bdf10fc9 Reviewed-on: https://code.wireshark.org/review/12842 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-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-1/+1
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-05-27Convert proto_tree_add_boolean to ↵Michael Mann1-90/+93
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>
2014-12-31Zbee ZDP: fix Copy-paste error (CID 1158598)Alexis La Goutte1-1/+1
Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc Reviewed-on: https://code.wireshark.org/review/6163 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-26Remove proto_tree_add_text from ZigBee dissectors.Michael Mann1-3/+166
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-1/+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-3/+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-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>
2014-09-10Replace deprecated tvb_length callsEvan Huus1-3/+3
And a few other misc. cleanups while in the neighbourhood. Change-Id: Ic0d6836dec9c36d31ea244a6adc74d4713565090 Reviewed-on: https://code.wireshark.org/review/4047 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-28convert to proto_tree_add_subtree[_format]Michael Mann1-28/+23
Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b Reviewed-on: https://code.wireshark.org/review/2676 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-5/+5
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-5/+5
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-1/+1
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-13Enhance ZigBee Routing TableAlexis La Goutte1-0/+32
Make field filterable and use value_string for status Based from capture available in bug 9855 Need to continue... lot of enhance is possible in ZigBee dissector... Change-Id: I0ac84e05a7b8b54e9879abbb7495034318188394 Reviewed-on: https://code.wireshark.org/review/631 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-26ZigBee Test Profile #2 and ZDP fixes. Bug 9584 ↵Michael Mann1-7/+34
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9584) From DSR Corporation svn path=/trunk/; revision=54466
2013-12-09Reject the packet if data is NULL.Chris Maynard1-1/+6
svn path=/trunk/; revision=53893
2013-12-04- Forward declaration of register functions.Anders Broman1-0/+3
svn path=/trunk/; revision=53789
2013-12-04Try to fix a bunch of [-Wmissing-prototypes]Anders Broman1-93/+4
svn path=/trunk/; revision=53788
2013-10-24Have ZigBee dissectors pass data through subdissector parameter instead of ↵Michael Mann1-50/+52
using struct _packet_info. svn path=/trunk/; revision=52827
2013-09-12In some cases add include emem.hJörg Mayer1-2/+3
In other cases emem -> wmem svn path=/trunk/; revision=51994
2013-07-01Define certain 'const char *...' arrays as static.Bill Meier1-1/+1
Reduces code memory usage and execution time. (See SVN #50271) svn path=/trunk/; revision=50292
2013-06-14Remove check_col() and the occasional tree.Michael Mann1-6/+2
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors. svn path=/trunk/; revision=49941
2013-03-19From beroset:Anders Broman1-2/+2
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48430
2013-01-25Clean up:Bill Meier1-119/+108
- Remove hf & ett decls not used externally from .h - For hf & ett vars not used externally: remove from .c if not used internally otherwise declare as static. svn path=/trunk/; revision=47284
2012-12-26Fix a bunch of warnings.Guy Harris1-57/+57
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45017
2012-08-10Use val_to_str_const() where appropriate;Bill Meier1-2/+2
Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-07-25Converted ZigBee dissectors display filter format from zbee.<protocol> to ↵Michael Mann1-86/+86
zbee_<protocol> Also corrected zbee_afp filters as they were incorrectly using zbee.app svn path=/trunk/; revision=43990
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2011-08-08Dissectors don't need to #include <gmodule.h>Bill Meier1-2/+1
Also: #include <stdlib.h> not req'd in some cases. svn path=/trunk/; revision=38409
2011-07-18Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.Bill Meier1-16/+16
svn path=/trunk/; revision=38082
2011-05-08Add FT_EUI64 Field TypeAlexis La Goutte1-5/+5
* Remove proto_tree_add_eui64 function from 802.15.4 Dissector * Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name * Update Documentation (README.dev) * Add new function in libwireshark.def * Support of encoding for tvb_eui64_to_str * Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector svn path=/trunk/; revision=37015
2011-03-23Fix bug: 'guint8 |=0x8000'.Bill Meier1-5/+7
Coverity 350 svn path=/trunk/; revision=36289
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-1/+1
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-10-10Define some fcns & vars as static ...Bill Meier1-1/+1
svn path=/trunk/; revision=34458
2010-04-06#include <string.h> not needed.Bill Meier1-1/+0
svn path=/trunk/; revision=32411
2010-01-13From Didier Gautheron:Anders Broman1-3/+1
check_col.diff Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394 svn path=/trunk/; revision=31519
2009-09-06Don't pass ep_alloc()'ed strings to col_set_str().Kovarththanan Rajaratnam1-1/+1
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3984 svn path=/trunk/; revision=29726