osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/epan/dissectors/packet-ieee802154.c

5243 lines
223 KiB
C
Raw Normal View History

From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* packet-ieee802154.c
*
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
* Auxiliary Security Header support and
* option to force TI CC24xx FCS format
* By Jean-Francois Wauthy <jfw@info.fundp.ac.be>
* Copyright 2009 The University of Namur, Belgium
*
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
* IEEE 802.15.4 Dissectors for Wireshark
* By Owen Kirby <osk@exegin.com>
* Copyright 2007 Exegin Technologies Limited
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Update Free Software Foundation address. (COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*------------------------------------------------------------
*
* In IEEE 802.15.4 packets, all fields are little endian. And
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
* Each byte is transmitted least significant bit first (reflected
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
* bit ordering).
*------------------------------------------------------------
*
* IEEE 802.15.4 Packets have the following format:
* | FCF |Seq No| Addressing | Data | FCS |
* |2 bytes|1 byte|0 to 20 bytes|Length-(Overhead) bytes|2 Bytes|
*------------------------------------------------------------
*
* CRC16 is calculated using the x^16 + x^12 + x^5 + 1 polynomial
* as specified by ITU-T, and is calculated over the IEEE 802.15.4
* packet (excluding the FCS) as transmitted over the air. Note,
* that because the least significan bits are transmitted first, this
* will require reversing the bit-order in each byte. Also, unlike
* most CRC algorithms, IEEE 802.15.4 uses an initial and final value
* of 0x0000, instead of 0xffff (which is used by the CCITT).
*------------------------------------------------------------
*
* This dissector supports both link-layer IEEE 802.15.4 captures
* and IEEE 802.15.4 packets encapsulated within other layers.
* Additionally, support has been provided for various formats
* of the frame check sequence:
* - IEEE 802.15.4 compliant FCS.
* - ChipCon/Texas Instruments CC24xx style FCS.
*------------------------------------------------------------
*/
/* Include files */
#include "config.h"
#include <epan/packet.h>
Cleanup use of #includes in non-generated epan/dissector/*.c 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-20 21:23:59 +00:00
#include <epan/decode_as.h>
Add missing includes in order to remove exceptions.h from proto.h (next commit). svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
#include <epan/exceptions.h>
Second try to move crc routines to libwsutil. This time keep the tvb routines in epan. Now we can use common crc routines outside epan. svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
#include <epan/crc16-tvb.h>
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
#include <epan/expert.h>
#include <epan/addr_resolv.h>
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
#include <epan/address_types.h>
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
#include <epan/prefs.h>
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
#include <epan/uat.h>
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
#include <epan/strutil.h>
If it's used by dissectors, it belongs in to_str.h, not to_str-int.h. Assuming *any* of the routines that generate printable strings should be thought of as "for internal use by libwireshark routines only, not by dissectors", the ones that *are* used by dissectors obviously shouldn't be. The ability for dissectors to register address types certainly expands the list of routines they would use. Move everything used by dissectors from to_str-int.h into to_str.h, and have dissectors not include to_str-int.h. (Perhaps we should just get rid of to_str-int.h altogether.) Change-Id: I3c583351f038233c9bcd8f9216188f82630267fa Reviewed-on: https://code.wireshark.org/review/11149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-19 16:39:59 +00:00
#include <epan/to_str.h>
Move show_exception() and show_reported_bounds_error() to epan/show_exception.c, as it's used outside epan/dissectors/packet-frame.c. Update their callers to include <epan/show_exception.h> to get their declaration. Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if there's more stuff in the packet to dissect after the dissector call that threw the exception, doesn't mean you shouldn't go ahead and dissect that stuff. Use it in all those cases, including ones where BoundsError was inappropriately being caught (you want those passed up to the top level, so that the packet is reported as having been cut short in the capture process). Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that correspond to running past the end of the data for a tvbuff; use it rather than explicitly catching those exceptions individually, and rather than just catching all exceptions (the only place that DissectorError should be caught, for example, is at the top level, so dissector bugs show up in the protocol tree). Don't catch and then immediately rethrow exceptions without doing anything else; just let the exceptions go up to the final catcher. Use show_exception() to report non-fatal errors, rather than doing it yourself. If a dissector is called from Lua, catch all non-fatal errors and use show_exception() to report them rather than catching only ReportedBoundsError and adding a proto_malformed item. Don't catch exceptions when constructing a trailer tvbuff in packet-ieee8023.c - just construct it after the payload has been dissected, and let whatever exceptions that throws be handled at the top level. Avoid some TRY/CATCH/ENDTRY cases by using checks such as tvb_bytes_exist() before even looking in the tvbuff. svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
#include <epan/show_exception.h>
Move the proto data stuff out of frame_data.[ch]. 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-25 01:10:20 +00:00
#include <epan/proto_data.h>
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
#include <epan/etypes.h>
#include <epan/oui.h>
Cleanup use of #includes in non-generated epan/dissector/*.c 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-20 21:23:59 +00:00
#include <wsutil/pint.h>
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Use libgcrypt for cipher libraries. */
include the wsutil/wsgcrypt.h instead of including gcrypt.h directly svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
#include <wsutil/wsgcrypt.h>
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
#include "packet-ieee802154.h"
From Sascha Herrmann: Patch registering ieee802154 dissector to Linux SLL frames. svn path=/trunk/; revision=47649
2013-02-13 07:16:14 +00:00
#include "packet-sll.h"
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Fix [-Wmissing-prototypes] svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
void proto_register_ieee802154(void);
void proto_reg_handoff_ieee802154(void);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Dissection Options for dissect_ieee802154_common */
#define DISSECT_IEEE802154_OPTION_CC24xx 0x00000001 /* FCS field contains a TI CC24xx style FCS. */
#define DISSECT_IEEE802154_OPTION_LINUX 0x00000002 /* Addressing fields are padded DLT_IEEE802_15_4_LINUX, not implemented. */
packet-ieee802154: Correct DISSECT_IEEE802154_OPTION_ZBOSS from 0x03 to 0x04 Bug: 12984 Change-Id: Ie7d74a99807cfc77b0c444d79e21b64e1612ac90 Reviewed-on: https://code.wireshark.org/review/18088 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-10-05 23:24:08 +00:00
#define DISSECT_IEEE802154_OPTION_ZBOSS 0x00000004 /* ZBOSS traffic dump */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
/* ethertype for 802.15.4 tag - encapsulating an Ethernet packet */
static unsigned int ieee802154_ethertype = 0x809A;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
/* boolean value set if the FCS field is using the TI CC24xx format */
static gboolean ieee802154_cc24xx = FALSE;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* boolean value set if the FCS must be ok before payload is dissected */
Fix for bug 4076: Have the option to continue dissection of data even with failed FCS check. svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
static gboolean ieee802154_fcs_ok = TRUE;
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
static const char *ieee802154_user = "User";
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
static wmem_tree_t* mac_key_hash_handlers;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
* Address Hash Tables
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
*/
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
ieee802154_map_tab_t ieee802154_map = { NULL, NULL };
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
* Static Address Mapping UAT
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
*/
/* UAT entry structure. */
typedef struct {
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
guchar *eui64;
guint eui64_len;
guint addr16;
guint pan;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
} static_addr_t;
/* UAT variables */
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
static uat_t *static_addr_uat = NULL;
static static_addr_t *static_addrs = NULL;
static guint num_static_addrs = 0;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Sanity-checks a UAT record. */
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
static gboolean
UAT error string pointers should not be const pointers. UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 20:13:45 +00:00
addr_uat_update_cb(void *r, char **err)
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
{
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
static_addr_t *map = (static_addr_t *)r;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Ensure a valid short address */
if (map->addr16 >= IEEE802154_NO_ADDR16) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Invalid short address");
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return FALSE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
/* Ensure a valid PAN identifier. */
if (map->pan >= IEEE802154_BCAST_PAN) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Invalid PAN identifier");
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return FALSE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
/* Ensure a valid EUI-64 length */
if (map->eui64_len != sizeof(guint64)) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Invalid EUI-64 length");
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return FALSE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return TRUE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
} /* ieee802154_addr_uat_update_cb */
/* Field callbacks. */
UAT_HEX_CB_DEF(addr_uat, addr16, static_addr_t)
UAT_HEX_CB_DEF(addr_uat, pan, static_addr_t)
UAT_BUFFER_CB_DEF(addr_uat, eui64, static_addr_t, eui64, eui64_len)
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Decryption Keys UAT
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
*/
/* UAT variables */
static uat_t *ieee802154_key_uat = NULL;
static ieee802154_key_t *ieee802154_keys = NULL;
static guint num_ieee802154_keys = 0;
static void ieee802154_key_post_update_cb(void)
{
guint i;
GByteArray *bytes;
for (i = 0; i < num_ieee802154_keys; i++)
{
switch (ieee802154_keys[i].hash_type) {
case KEY_HASH_NONE:
case KEY_HASH_ZIP:
/* Get the IEEE 802.15.4 decryption key. */
bytes = g_byte_array_new();
if (hex_str_to_bytes(ieee802154_keys[i].pref_key, bytes, FALSE))
{
if (ieee802154_keys[i].hash_type == KEY_HASH_ZIP) {
char digest[32];
if (!ws_hmac_buffer(GCRY_MD_SHA256, digest, "ZigBeeIP", 8, bytes->data, IEEE802154_CIPHER_SIZE)) {
/* Copy upper hashed bytes to the key */
memcpy(ieee802154_keys[i].key, &digest[IEEE802154_CIPHER_SIZE], IEEE802154_CIPHER_SIZE);
/* Copy lower hashed bytes to the MLE key */
memcpy(ieee802154_keys[i].mle_key, digest, IEEE802154_CIPHER_SIZE);
} else {
/* Just copy the keys verbatim */
memcpy(ieee802154_keys[i].key, bytes->data, IEEE802154_CIPHER_SIZE);
memcpy(ieee802154_keys[i].mle_key, bytes->data, IEEE802154_CIPHER_SIZE);
}
} else {
/* Just copy the keys verbatim */
memcpy(ieee802154_keys[i].key, bytes->data, IEEE802154_CIPHER_SIZE);
memcpy(ieee802154_keys[i].mle_key, bytes->data, IEEE802154_CIPHER_SIZE);
}
}
g_byte_array_free(bytes, TRUE);
break;
case KEY_HASH_THREAD:
/* XXX - TODO? */
break;
}
}
}
static gboolean ieee802154_key_update_cb(void *r, char **err)
{
ieee802154_key_t* rec = (ieee802154_key_t*)r;
GByteArray *bytes;
switch (rec->hash_type) {
case KEY_HASH_NONE:
case KEY_HASH_ZIP:
bytes = g_byte_array_new();
if (hex_str_to_bytes(rec->pref_key, bytes, FALSE) == FALSE)
{
*err = g_strdup("Invalid key");
g_byte_array_free(bytes, TRUE);
return FALSE;
}
if (bytes->len < IEEE802154_CIPHER_SIZE)
{
*err = g_strdup_printf("Key must be at least %d bytes", IEEE802154_CIPHER_SIZE);
g_byte_array_free(bytes, TRUE);
return FALSE;
}
g_byte_array_free(bytes, TRUE);
break;
case KEY_HASH_THREAD:
/* XXX - TODO? */
break;
}
return TRUE;
}
static void* ieee802154_key_copy_cb(void* n, const void* o, size_t siz _U_) {
ieee802154_key_t* new_record = (ieee802154_key_t*)n;
const ieee802154_key_t* old_record = (const ieee802154_key_t*)o;
new_record->pref_key = g_strdup(old_record->pref_key);
MLE and Thread: Additional dissectors Additional dissectors for Mesh Link Establishment (MLE) and Thread CoAP TMF messages. MLE is also used in ZigBee IP. Change-Id: I5b9c224d7df48855b79ccac67dca7661a51d0a9b Bug: 13495 Reviewed-on: https://code.wireshark.org/review/20594 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 16:59:23 +00:00
new_record->key_index = old_record->key_index;
new_record->hash_type = old_record->hash_type;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
return new_record;
}
static void ieee802154_key_free_cb(void*r) {
ieee802154_key_t* rec = (ieee802154_key_t *)r;
g_free(rec->pref_key);
}
/* Field callbacks. */
UAT_CSTRING_CB_DEF(key_uat, pref_key, ieee802154_key_t)
UAT_DEC_CB_DEF(key_uat, key_index, ieee802154_key_t)
UAT_VS_DEF(key_uat, hash_type, ieee802154_key_t, ieee802154_key_hash, KEY_HASH_NONE, "No hash")
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/*-------------------------------------
* Dissector Function Prototypes
*-------------------------------------
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Dissection Routines. */
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
static int dissect_ieee802154_nonask_phy (tvbuff_t *, packet_info *, proto_tree *, void *);
static int dissect_ieee802154 (tvbuff_t *, packet_info *, proto_tree *, void *);
static int dissect_ieee802154_nofcs (tvbuff_t *, packet_info *, proto_tree *, void *);
static int dissect_ieee802154_cc24xx (tvbuff_t *, packet_info *, proto_tree *, void *);
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
static tvbuff_t *dissect_zboss_specific (tvbuff_t *, packet_info *, proto_tree *);
Mark a couple of variables volatile Remove two unused dissector handles Comment out a function declaration labeled as "TODO" svn path=/trunk/; revision=24571
2008-03-05 22:28:29 +00:00
/*static void dissect_ieee802154_linux (tvbuff_t *, packet_info *, proto_tree *); TODO: Implement Me. */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void dissect_ieee802154_common (tvbuff_t *, packet_info *, proto_tree *, guint);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Information Elements */
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int dissect_ieee802154_header_ie(tvbuff_t *, packet_info *, proto_tree *, guint, ieee802154_packet *);
static int dissect_ieee802154_payload_ie(tvbuff_t *, packet_info *, proto_tree *, guint, ieee802154_packet *);
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
static void dissect_802154_enhanced_beacon_filter(tvbuff_t *tvb, proto_tree *subtree, guint16 psie_remaining, gint *offset);
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static void dissect_802154_tsch_time_sync(tvbuff_t *, proto_tree *, int *, guint);
static void dissect_802154_tsch_timeslot(tvbuff_t *, proto_tree *, guint, guint16, gint*);
static void dissect_802154_tsch_slotframe_link(tvbuff_t *, proto_tree *, guint16, guint16, guint *);
static void dissect_802154_channel_hopping(tvbuff_t *, proto_tree *, guint16, guint *);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Sub-dissector helpers. */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static void dissect_ieee802154_fcf (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *, guint *);
static void dissect_ieee802154_command (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_assoc_req (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_assoc_rsp (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_disassoc (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_realign (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_gtsreq (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Decryption helpers. */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
static tvbuff_t *dissect_ieee802154_decrypt(tvbuff_t *, guint, packet_info *, ieee802154_packet *, ieee802154_payload_info_t*);
static gboolean ieee802154_set_mac_key(ieee802154_packet *packet, unsigned char *key, unsigned char *alt_key, ieee802154_key_t* uat_key);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Initialize Protocol and Registered fields */
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
static int proto_ieee802154_nonask_phy = -1;
static int hf_ieee802154_nonask_phy_preamble = -1;
static int hf_ieee802154_nonask_phy_sfd = -1;
static int hf_ieee802154_nonask_phy_length = -1;
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
static int hf_ieee802154_nonask_phr = -1;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int proto_ieee802154 = -1;
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
static int hf_ieee802154_frame_length = -1;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static int hf_ieee802154_fcf = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_frame_type = -1;
static int hf_ieee802154_security = -1;
static int hf_ieee802154_pending = -1;
static int hf_ieee802154_ack_request = -1;
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 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-12-11 01:06:04 +00:00
static int hf_ieee802154_pan_id_compression = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_seqno_suppression = -1;
static int hf_ieee802154_ie_present = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_src_addr_mode = -1;
static int hf_ieee802154_version = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_dst_addr_mode = -1;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static int hf_ieee802154_header_ies = -1;
static int hf_ieee802154_header_ie_tlv = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_header_ie_type = -1;
static int hf_ieee802154_header_ie_id = -1;
static int hf_ieee802154_header_ie_length = -1;
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int hf_ieee802154_ie_unknown_content = -1;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static int hf_ieee802154_hie_unsupported = -1;
static int hf_ieee802154_hie_time_correction = -1;
static int hf_ieee802154_hie_ht1 = -1;
static int hf_ieee802154_hie_ht2 = -1;
ieee802154: Time correction IE: Fix and add micro-second value Change-Id: I52a22e7cfd8c0d5c054435678c891a3e1d0505b2 Reviewed-on: https://code.wireshark.org/review/20547 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>
2017-03-07 13:32:22 +00:00
static int hf_ieee802154_nack = -1;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static int hf_ieee802154_hie_time_correction_time_sync_info = -1;
static int hf_ieee802154_hie_time_correction_value = -1;
IEEE 802.15.4: Support for CSL Header IE Change-Id: Ibda1f0757401566170459570e1138ac3dc3e5101 Reviewed-on: https://code.wireshark.org/review/22421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-27 15:07:53 +00:00
static int hf_ieee802154_hie_csl = -1;
static int hf_ieee802154_hie_csl_phase = -1;
static int hf_ieee802154_hie_csl_period = -1;
static int hf_ieee802154_hie_csl_rendezvous_time = -1;
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
static int hf_ieee802154_payload_ies = -1;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static int hf_ieee802154_payload_ie_tlv = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_payload_ie_type = -1;
static int hf_ieee802154_payload_ie_id = -1;
static int hf_ieee802154_payload_ie_length = -1;
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int hf_ieee802154_pie_unsupported = -1;
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
static int hf_ieee802154_pie_termination = -1;
static int hf_ieee802154_pie_vendor = -1;
static int hf_ieee802154_pie_ietf = -1;
static int hf_ieee802154_mlme = -1;
Added support for Payload IE Vendor OUI. IEEE has run out of Payload IE IDs so ZigBee and future IEs must use Vendor OUIs. Change-Id: I6eed4382d099364605649eb7577a5e2691e97dd3 Reviewed-on: https://code.wireshark.org/review/13971 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-02-16 17:40:12 +00:00
static int hf_ieee802154_payload_ie_vendor_oui = -1;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static int hf_ieee802154_timeslot_ie = -1;
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
static int hf_ieee802154_enhanced_beacon_filter_ie = -1;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
static int hf_ieee802154_mlme_ie_data = -1;
static int hf_ieee802154_psie_short = -1;
static int hf_ieee802154_psie_type_short = -1;
static int hf_ieee802154_psie_id_short = -1;
static int hf_ieee802154_psie_length_short = -1;
static int hf_ieee802154_psie_long = -1;
static int hf_ieee802154_psie_type_long = -1;
static int hf_ieee802154_psie_id_long = -1;
static int hf_ieee802154_psie_length_long = -1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
static int hf_ieee802154_tsch_sync = -1;
static int hf_ieee802154_tsch_asn = -1;
static int hf_ieee802154_tsch_join_metric = -1;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static int hf_ieee802154_tsch_slotframe = -1;
static int hf_ieee802154_tsch_slotframe_list = -1;
static int hf_ieee802154_tsch_link_info = -1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
static int hf_ieee802154_tsch_slotf_link_nb_slotf = -1;
static int hf_ieee802154_tsch_slotf_link_slotf_handle= -1;
static int hf_ieee802154_tsch_slotf_size = -1;
static int hf_ieee802154_tsch_slotf_link_nb_links = -1;
static int hf_ieee802154_tsch_slotf_link_timeslot = -1;
static int hf_ieee802154_tsch_slotf_link_channel_offset = -1;
static int hf_ieee802154_tsch_slotf_link_options = -1;
static int hf_ieee802154_tsch_channel_hopping = -1;
static int hf_ieee802154_tsch_hopping_sequence_id = -1;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
static int hf_ieee802154_psie_eb_filter = -1;
static int hf_ieee802154_psie_eb_filter_pjoin = -1;
static int hf_ieee802154_psie_eb_filter_lqi = -1;
static int hf_ieee802154_psie_eb_filter_lqi_min = -1;
static int hf_ieee802154_psie_eb_filter_percent = -1;
static int hf_ieee802154_psie_eb_filter_percent_prob = -1;
static int hf_ieee802154_psie_eb_filter_attr_id = -1;
static int hf_ieee802154_psie_eb_filter_attr_id_bitmap = -1;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
static int hf_ieee802154_p_ie_ietf_sub_id = -1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
static int hf_ieee802154_6top = -1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
static int hf_ieee802154_6top_version = -1;
static int hf_ieee802154_6top_type = -1;
static int hf_ieee802154_6top_flags_reserved = -1;
static int hf_ieee802154_6top_code = -1;
static int hf_ieee802154_6top_sfid = -1;
static int hf_ieee802154_6top_seqnum = -1;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
static int hf_ieee802154_6top_gen = -1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
static int hf_ieee802154_6top_metadata = -1;
static int hf_ieee802154_6top_cell_options = -1;
static int hf_ieee802154_6top_cell_option_tx = -1;
static int hf_ieee802154_6top_cell_option_rx = -1;
static int hf_ieee802154_6top_cell_option_shared = -1;
static int hf_ieee802154_6top_cell_option_reserved = -1;
static int hf_ieee802154_6top_num_cells = -1;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
static int hf_ieee802154_6top_cell_list = -1;
static int hf_ieee802154_6top_rel_cell_list = -1;
static int hf_ieee802154_6top_cand_cell_list = -1;
static int hf_ieee802154_6top_cell = -1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
static int hf_ieee802154_6top_reserved = -1;
static int hf_ieee802154_6top_offset = -1;
static int hf_ieee802154_6top_max_num_cells = -1;
static int hf_ieee802154_6top_slot_offset = -1;
static int hf_ieee802154_6top_channel_offset = -1;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
static int hf_ieee802154_6top_total_num_cells = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
static int hf_ieee802159_mpx = -1;
static int hf_ieee802159_mpx_transaction_control = -1;
static int hf_ieee802159_mpx_transfer_type = -1;
static int hf_ieee802159_mpx_transaction_id = -1;
static int hf_ieee802159_mpx_transaction_id_as_multiplex_id = -1;
static int hf_ieee802159_mpx_fragment_number = -1;
static int hf_ieee802159_mpx_total_frame_size = -1;
static int hf_ieee802159_mpx_multiplex_id = -1;
static int hf_ieee802159_mpx_kmp_id = -1;
static int hf_ieee802159_mpx_kmp_vendor_oui = -1;
static int hf_ieee802159_mpx_fragment = -1;
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
static int proto_zboss = -1;
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
static int hf_zboss_direction = -1;
static int hf_zboss_page = -1;
static int hf_zboss_channel = -1;
static int hf_zboss_trace_number = -1;
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_seqno = -1;
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
static int hf_ieee802154_dst_panID = -1;
static int hf_ieee802154_dst16 = -1;
static int hf_ieee802154_dst64 = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_src_panID = -1;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
static int hf_ieee802154_src16 = -1;
static int hf_ieee802154_src64 = -1;
static int hf_ieee802154_src64_origin = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_fcs = -1;
static int hf_ieee802154_rssi = -1;
static int hf_ieee802154_fcs_ok = -1;
Initialize some hf_... vars to -1; (Reduces the number of checkhf false positives) svn path=/trunk/; revision=47310
2013-01-26 21:42:36 +00:00
static int hf_ieee802154_correlation = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Registered fields for Command Packets */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_cmd_id = -1;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static int hf_ieee802154_cinfo_alt_coord = -1;
static int hf_ieee802154_cinfo_device_type = -1;
static int hf_ieee802154_cinfo_power_src = -1;
static int hf_ieee802154_cinfo_idle_rx = -1;
static int hf_ieee802154_cinfo_sec_capable = -1;
static int hf_ieee802154_cinfo_alloc_addr = -1;
static int hf_ieee802154_assoc_addr = -1;
static int hf_ieee802154_assoc_status = -1;
static int hf_ieee802154_disassoc_reason = -1;
static int hf_ieee802154_realign_pan = -1;
static int hf_ieee802154_realign_caddr = -1;
static int hf_ieee802154_realign_channel = -1;
static int hf_ieee802154_realign_addr = -1;
static int hf_ieee802154_realign_channel_page = -1;
static int hf_ieee802154_gtsreq_len = -1;
static int hf_ieee802154_gtsreq_dir = -1;
static int hf_ieee802154_gtsreq_type = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Registered fields for Beacon Packets */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static int hf_ieee802154_beacon_order = -1;
static int hf_ieee802154_superframe_order = -1;
static int hf_ieee802154_cap = -1;
static int hf_ieee802154_superframe_battery_ext = -1;
static int hf_ieee802154_superframe_coord = -1;
static int hf_ieee802154_assoc_permit = -1;
static int hf_ieee802154_gts_count = -1;
static int hf_ieee802154_gts_permit = -1;
static int hf_ieee802154_gts_direction = -1;
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
static int hf_ieee802154_gts_address = -1;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static int hf_ieee802154_pending16 = -1;
static int hf_ieee802154_pending64 = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Registered fields for Auxiliary Security Header */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
static int hf_ieee802154_aux_security_header = -1;
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
static int hf_ieee802154_aux_sec_security_control = -1;
static int hf_ieee802154_aux_sec_security_level = -1;
static int hf_ieee802154_aux_sec_key_id_mode = -1;
static int hf_ieee802154_aux_sec_frame_counter_suppression = -1;
static int hf_ieee802154_aux_sec_asn_in_nonce = -1;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static int hf_ieee802154_aux_sec_reserved = -1;
static int hf_ieee802154_aux_sec_frame_counter = -1;
static int hf_ieee802154_aux_sec_key_source = -1;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
static int hf_ieee802154_aux_sec_key_source_bytes = -1;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static int hf_ieee802154_aux_sec_key_index = -1;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
static int hf_ieee802154_mic = -1;
static int hf_ieee802154_key_number = -1;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* 802.15.4-2003 security */
static int hf_ieee802154_sec_frame_counter = -1;
static int hf_ieee802154_sec_key_sequence_counter = -1;
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Initialize Subtree Pointers */
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
static gint ett_ieee802154_nonask_phy = -1;
static gint ett_ieee802154_nonask_phy_phr = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static gint ett_ieee802154 = -1;
static gint ett_ieee802154_fcf = -1;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static gint ett_ieee802154_auxiliary_security = -1;
static gint ett_ieee802154_aux_sec_control = -1;
static gint ett_ieee802154_aux_sec_key_id = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static gint ett_ieee802154_fcs = -1;
static gint ett_ieee802154_cmd = -1;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static gint ett_ieee802154_superframe = -1;
static gint ett_ieee802154_gts = -1;
static gint ett_ieee802154_gts_direction = -1;
static gint ett_ieee802154_gts_descriptors = -1;
static gint ett_ieee802154_pendaddr = -1;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static gint ett_ieee802154_header_ies = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static gint ett_ieee802154_header_ie = -1;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static gint ett_ieee802154_header_ie_tlv = -1;
static gint ett_ieee802154_hie_unsupported = -1;
static gint ett_ieee802154_hie_time_correction = -1;
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static gint ett_ieee802154_hie_ht = -1;
IEEE 802.15.4: Support for CSL Header IE Change-Id: Ibda1f0757401566170459570e1138ac3dc3e5101 Reviewed-on: https://code.wireshark.org/review/22421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-27 15:07:53 +00:00
static gint ett_ieee802154_hie_csl = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static gint ett_ieee802154_payload_ie = -1;
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
static gint ett_ieee802154_payload_ie_tlv = -1;
static gint ett_ieee802154_pie_termination = -1;
static gint ett_ieee802154_pie_vendor = -1;
static gint ett_ieee802154_pie_ietf = -1;
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static gint ett_ieee802154_pie_unsupported = -1;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static gint ett_ieee802154_mlme = -1;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
static gint ett_ieee802154_mlme_payload = -1;
static gint ett_ieee802154_mlme_payload_data = -1;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static gint ett_ieee802154_tsch_timeslot = -1;
static gint ett_ieee802154_tsch_synch = -1;
static gint ett_ieee802154_channel_hopping = -1;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
static gint ett_ieee802154_psie_short = -1;
static gint ett_ieee802154_psie_short_bitmap= -1;
static gint ett_ieee802154_psie_long = -1;
static gint ett_ieee802154_psie_long_bitmap = -1;
static gint ett_ieee802154_psie_enh_beacon_flt = -1;
static gint ett_ieee802154_psie_enh_beacon_flt_bitmap = -1;
ieee802154: handle multiple slotframe descriptors properly Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 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-10-28 19:47:38 +00:00
static gint ett_ieee802154_psie_slotframe_link_slotframes = -1;
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
static gint ett_ieee802154_zigbee = -1;
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
static gint ett_ieee802154_zboss = -1;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
static gint ett_ieee802154_p_ie_6top = -1;
static gint ett_ieee802154_p_ie_6top_cell_options = -1;
static gint ett_ieee802154_p_ie_6top_cell_list = -1;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
static gint ett_ieee802154_p_ie_6top_cand_cell_list = -1;
static gint ett_ieee802154_p_ie_6top_rel_cell_list = -1;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
static gint ett_ieee802154_p_ie_6top_cell = -1;
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
static gint ett_ieee802159_mpx = -1;
static gint ett_ieee802159_mpx_transaction_control = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static expert_field ei_ieee802154_invalid_addressing = EI_INIT;
Fix expert_info errors found by new and improved checkhfs.pl. Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-04 03:45:10 +00:00
/* static expert_field ei_ieee802154_invalid_panid_compression = EI_INIT; */
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
static expert_field ei_ieee802154_invalid_panid_compression2 = EI_INIT;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static expert_field ei_ieee802154_fcs = EI_INIT;
static expert_field ei_ieee802154_decrypt_error = EI_INIT;
static expert_field ei_ieee802154_dst = EI_INIT;
static expert_field ei_ieee802154_src = EI_INIT;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static expert_field ei_ieee802154_frame_ver = EI_INIT;
Fix expert_info errors found by new and improved checkhfs.pl. Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-04 03:45:10 +00:00
/* static expert_field ei_ieee802154_frame_type = EI_INIT; */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static expert_field ei_ieee802154_seqno_suppression = EI_INIT;
ieee802154: Time correction IE: Fix and add micro-second value Change-Id: I52a22e7cfd8c0d5c054435678c891a3e1d0505b2 Reviewed-on: https://code.wireshark.org/review/20547 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>
2017-03-07 13:32:22 +00:00
static expert_field ei_ieee802154_time_correction_error = EI_INIT;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
static expert_field ei_ieee802154_6top_unsupported_type = EI_INIT;
static expert_field ei_ieee802154_6top_unsupported_return_code = EI_INIT;
static expert_field ei_ieee802154_6top_unsupported_command = EI_INIT;
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static expert_field ei_ieee802154_ie_unsupported_id = EI_INIT;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static expert_field ei_ieee802154_ie_unknown_extra_content = EI_INIT;
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
static expert_field ei_ieee802159_mpx_invalid_transfer_type = EI_INIT;
static expert_field ei_ieee802159_mpx_unsupported_kmp = EI_INIT;
static expert_field ei_ieee802159_mpx_unknown_kmp = EI_INIT;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
static int ieee802_15_4_short_address_type = -1;
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/*
* Dissector handles
* - beacon dissection is always heuristic.
* - the PANID table is for stateful dissectors only (ie: Decode-As)
* - otherwise, data dissectors fall back to the heuristic dissectors.
*/
static dissector_table_t panid_dissector_table;
static heur_dissector_list_t ieee802154_beacon_subdissector_list;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static heur_dissector_list_t ieee802154_heur_subdissector_list;
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/* For the IEs */
static dissector_table_t header_ie_dissector_table;
static dissector_table_t payload_ie_dissector_table;
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
static dissector_handle_t zigbee_beacon_handle;
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
static dissector_handle_t zigbee_ie_handle;
ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee. 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-15 16:45:50 +00:00
static dissector_handle_t zigbee_nwk_handle;
Dissectors don't need a journey of self discovery. They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 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-12-17 01:06:11 +00:00
static dissector_handle_t ieee802154_handle;
static dissector_handle_t ieee802154_nonask_phy_handle;
static dissector_handle_t ieee802154_nofcs_handle;
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
static dissector_table_t ethertype_table; // for the MPX-IE
static dissector_handle_t eapol_handle; // for the MPX-IE
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Versions */
static const value_string ieee802154_frame_versions[] = {
{ IEEE802154_VERSION_2003, "IEEE Std 802.15.4-2003" },
{ IEEE802154_VERSION_2006, "IEEE Std 802.15.4-2006" },
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
{ IEEE802154_VERSION_2015, "IEEE Std 802.15.4-2015" },
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_VERSION_RESERVED, "Reserved" },
{ 0, NULL }
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Name Strings */
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
static const value_string ieee802154_frame_types[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_FCF_BEACON, "Beacon" },
{ IEEE802154_FCF_DATA, "Data" },
{ IEEE802154_FCF_ACK, "Ack" },
{ IEEE802154_FCF_CMD, "Command" },
{ IEEE802154_FCF_RESERVED, "Reserved" },
{ IEEE802154_FCF_MULTIPURPOSE, "Multipurpose" },
{ IEEE802154_FCF_FRAGMENT, "Fragment or Frak" },
{ IEEE802154_FCF_EXTENDED, "Extended" },
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ 0, NULL }
};
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
static const value_string ieee802154_addr_modes[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_FCF_ADDR_NONE, "None" },
{ IEEE802154_FCF_ADDR_RESERVED, "Reserved" },
{ IEEE802154_FCF_ADDR_SHORT, "Short/16-bit" },
{ IEEE802154_FCF_ADDR_EXT, "Long/64-bit" },
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
{ 0, NULL }
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
static const value_string ieee802154_cmd_names[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_CMD_ASSOC_REQ, "Association Request" },
{ IEEE802154_CMD_ASSOC_RSP, "Association Response" },
{ IEEE802154_CMD_DISASSOC_NOTIFY, "Disassociation Notification" },
{ IEEE802154_CMD_DATA_RQ, "Data Request" },
{ IEEE802154_CMD_PANID_CONFLICT, "PAN ID Conflict" },
{ IEEE802154_CMD_ORPHAN_NOTIFY, "Orphan Notification" },
{ IEEE802154_CMD_BEACON_REQ, "Beacon Request" },
{ IEEE802154_CMD_COORD_REALIGN, "Coordinator Realignment" },
{ IEEE802154_CMD_GTS_REQ, "GTS Request" },
{ IEEE802154_CMD_TRLE_MGMT_REQ, "TRLE Management Request"},
{ IEEE802154_CMD_TRLE_MGMT_RSP, "TRLE Management Response"},
{ IEEE802154_CMD_DSME_ASSOC_REQ, "DSME Association Request"},
{ IEEE802154_CMD_DSME_ASSOC_RSP, "DSME Association Response"},
{ IEEE802154_CMD_DSME_GTS_REQ, "DSME GTS Request"},
{ IEEE802154_CMD_DSME_GTS_RSP, "DSME GTS Response"},
{ IEEE802154_CMD_DSME_GTS_NOTIFY, "DSME GTS Notify"},
{ IEEE802154_CMD_DSME_INFO_REQ, "DSME Information Request"},
ieee802154: fix fix spelling typo found by lintian Change-Id: I0d3d56447aab6f012338016875bc05a9eaf3a2be Reviewed-on: https://code.wireshark.org/review/18532 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-27 16:02:29 +00:00
{ IEEE802154_CMD_DSME_INFO_RSP, "DSME Information Response"},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_CMD_DSME_BEACON_ALLOC_NOTIFY, "DSME Beacon Allocation Notification"},
{ IEEE802154_CMD_DSME_BEACON_COLL_NOTIFY, "DSME Beacon Collision Notification"},
{ IEEE802154_CMD_DSME_LINK_REPORT, "DSME Link Report"},
{ IEEE802154_CMD_RIT_DATA_REQ, "RIT Data Request"},
{ IEEE802154_CMD_DBS_REQ, "DBS Request"},
{ IEEE802154_CMD_DBS_RSP, "DBS Response"},
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
{ 0, NULL }
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static const value_string ieee802154_sec_level_names[] = {
{ SECURITY_LEVEL_NONE, "No Security" },
{ SECURITY_LEVEL_MIC_32, "32-bit Message Integrity Code" },
{ SECURITY_LEVEL_MIC_64, "64-bit Message Integrity Code" },
{ SECURITY_LEVEL_MIC_128, "128-bit Message Integrity Code" },
{ SECURITY_LEVEL_ENC, "Encryption" },
{ SECURITY_LEVEL_ENC_MIC_32, "Encryption with 32-bit Message Integrity Code" },
{ SECURITY_LEVEL_ENC_MIC_64, "Encryption with 64-bit Message Integrity Code" },
{ SECURITY_LEVEL_ENC_MIC_128, "Encryption with 128-bit Message Integrity Code" },
{ 0, NULL }
};
static const value_string ieee802154_key_id_mode_names[] = {
{ KEY_ID_MODE_IMPLICIT, "Implicit Key" },
{ KEY_ID_MODE_KEY_INDEX, "Indexed Key using the Default Key Source" },
{ KEY_ID_MODE_KEY_EXPLICIT_4, "Explicit Key with 4-octet Key Source" },
{ KEY_ID_MODE_KEY_EXPLICIT_8, "Explicit Key with 8-octet Key Source" },
{ 0, NULL }
};
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static const true_false_string ieee802154_gts_direction_tfs = {
"Receive Only",
"Transmit Only"
};
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* The 802.15.4-2003 security suites for the security preferences (only AES-CCM suites are supported). */
Fix lintian found spelling error "identifer" -> "identifier" Change-Id: I78281ce097e36df546338a5dacb03a11bedd2b24 Reviewed-on: https://code.wireshark.org/review/18642 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-03 00:51:10 +00:00
/* NOTE: The equivalent 2006 security level identifier enumerations are used to simplify 2003 & 2006 integration! */
Make all enum_val_t's const. svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
static const enum_val_t ieee802154_2003_sec_suite_enums[] = {
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
{ "AES-CCM-128", "AES-128 Encryption, 128-bit Integrity Protection", SECURITY_LEVEL_ENC_MIC_128 },
{ "AES-CCM-64", "AES-128 Encryption, 64-bit Integrity Protection", SECURITY_LEVEL_ENC_MIC_64 },
{ "AES-CCM-32", "AES-128 Encryption, 32-bit Integrity Protection", SECURITY_LEVEL_ENC_MIC_32 },
{ NULL, NULL, 0 }
};
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Enumeration for key generation */
static const value_string ieee802154_key_hash_vals[] = {
{ KEY_HASH_NONE, "No hash"},
{ KEY_HASH_ZIP, "ZigBee IP hash" },
{ KEY_HASH_THREAD, "Thread hash" },
{ 0, NULL }
};
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static const value_string ieee802154_ie_types[] = {
{ 0, "Header" },
{ 1, "Payload" },
{ 0, NULL }
};
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
static const value_string ieee802154_psie_types[] = {
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ 0, "Short" },
{ 1, "Long" },
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ 0, NULL }
};
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static const value_string ieee802154_header_ie_names[] = {
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ IEEE802154_HEADER_IE_VENDOR_SPECIFIC, "Vendor Specific IE" },
{ IEEE802154_HEADER_IE_CSL, "CSL IE" },
{ IEEE802154_HEADER_IE_RIT, "RIT IE" },
{ IEEE802154_HEADER_IE_DSME_PAN, "DSME PAN descriptor IE" },
{ IEEE802154_HEADER_IE_RENDEZVOUS, "Rendezvous Time IE" },
{ IEEE802154_HEADER_IE_TIME_CORR, "Time Correction IE" },
{ IEEE802154_HEADER_IE_EXT_DSME_PAN, "Extended DSME PAN descriptor IE" },
{ IEEE802154_HEADER_IE_FSCD, "Fragment Sequence Context Description (FSCD) IE" },
{ IEEE802154_HEADER_IE_SMPL_SUPER_FRM, "Simplified Superframe Specification IE" },
{ IEEE802154_HEADER_IE_SMPL_GTS, "Simplified GTS Specification IE" },
{ IEEE802154_HEADER_IE_LECIM, "LECIM Capabilities IE" },
{ IEEE802154_HEADER_IE_TRLE, "TRLE Descriptor" },
{ IEEE802154_HEADER_IE_RCC_CAP, "RCC Capabilities IE" },
{ IEEE802154_HEADER_IE_RCCN, "RCCN Descriptor IE" },
{ IEEE802154_HEADER_IE_GLOBAL_TIME, "Global Time IE" },
{ IEEE802154_HEADER_IE_DA_IE, "DA IE" },
{ IEEE802154_HEADER_IE_HT1, "Header Termination 1 IE" },
{ IEEE802154_HEADER_IE_HT2, "Header Termination 2 IE" },
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ 0, NULL }
};
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static const true_false_string hf_ieee802154_nack_tfs = {
"Negative Acknowledgement",
"Acknowledgement"
};
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static const value_string ieee802154_payload_ie_names[] = {
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ IEEE802154_PAYLOAD_IE_ESDU, "ESDU IE" },
{ IEEE802154_PAYLOAD_IE_MLME, "MLME IE" },
{ IEEE802154_PAYLOAD_IE_VENDOR, "Vendor Specific IE" },
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
{ IEEE802154_PAYLOAD_IE_MPX, "MPX IE" },
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
{ IEEE802154_PAYLOAD_IE_IETF, "IETF IE" },
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
{ IEEE802154_PAYLOAD_IE_TERMINATION, "Payload Termination IE" },
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ 0, NULL }
};
static const value_string ieee802154_vendor_oui_names[] = {
{ IEEE802154_VENDOR_OUI_ZIGBEE, "ZigBee" },
{ 0, NULL }
};
static const value_string ieee802154_psie_names[] = {
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
{ IEEE802154_MLME_SUBIE_CHANNEL_HOPPING, "Channel Hopping IE" },
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ IEEE802154_MLME_SUBIE_TSCH_SYNCH, "TSCH Synchronization IE" },
{ IEEE802154_MLME_SUBIE_TSCH_SLOTFR_LINK, "TSCH Slotframe and Link IE" },
{ IEEE802154_MLME_SUBIE_TSCH_TIMESLOT, "TSCH Timeslot IE" },
{ IEEE802154_MLME_SUBIE_HOPPING_TIMING, "Hopping Timing IE" },
{ IEEE802154_MLME_SUBIE_ENHANCED_BEACON_FILTER, "Enhanced Beacon Filter IE" },
{ IEEE802154_MLME_SUBIE_MAC_METRICS, "MAC Metrics IE" },
{ IEEE802154_MLME_SUBIE_ALL_MAC_METRICS, "All MAC Metrics IE" },
{ IEEE802154_MLME_SUBIE_COEXISTENCE_SPEC, "Coexistence Specification IE" },
{ IEEE802154_MLME_SUBIE_SUN_DEVICE_CAPABILITIES, "SUN Device Capabilities IE" },
{ IEEE802154_MLME_SUBIE_SUN_FSK_GEN_PHY, "SUN FSK Generic PHY IE" },
{ IEEE802154_MLME_SUBIE_MODE_SWITCH_PARAMETER, "Mode Switch Parameter IE" },
{ IEEE802154_MLME_SUBIE_PHY_PARAMETER_CHANGE, "PHY Parameter Change IE" },
{ IEEE802154_MLME_SUBIE_O_QPSK_PHY_MODE, "O-QPSY PHY Mode IE" },
{ IEEE802154_MLME_SUBIE_PCA_ALLOCATION, "PCA Allocation IE" },
{ IEEE802154_MLME_SUBIE_DSSS_OPER_MODE, "LECIM DSSS Operating Mode IE"},
{ IEEE802154_MLME_SUBIE_FSK_OPER_MODE, "LECIM FSK Operating Mode IE" },
{ IEEE802154_MLME_SUBIE_TVWS_PHY_OPE_MODE, "TVWS PHY Operating Mode Description IE" },
{ IEEE802154_MLME_SUBIE_TVWS_DEVICE_CAPAB, "TVWS Device Capabilities IE" },
{ IEEE802154_MLME_SUBIE_TVWS_DEVICE_CATEG, "TVWS Device Category IE" },
{ IEEE802154_MLME_SUBIE_TVWS_DEVICE_IDENTIF, "TVWS Device Identification IE" },
{ IEEE802154_MLME_SUBIE_TVWS_DEVICE_LOCATION, "TVWS Device Location IE" },
{ IEEE802154_MLME_SUBIE_TVWS_CH_INFOR_QUERY, "TVWS Channel Information Query IE" },
{ IEEE802154_MLME_SUBIE_TVWS_CH_INFOR_SOURCE, "TVWS Channel Information Source IE" },
{ IEEE802154_MLME_SUBIE_CTM, "CTM IE" },
{ IEEE802154_MLME_SUBIE_TIMESTAMP, "Timestamp IE" },
{ IEEE802154_MLME_SUBIE_TIMESTAMP_DIFF, "Timestamp Difference IE"},
{ IEEE802154_MLME_SUBIE_TMCP_SPECIFICATION, "TMCTP Specification IE" },
{ IEEE802154_MLME_SUBIE_RCC_PHY_OPER_MODE, "RCC PHY Operating Mode IE" },
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
{ IEEE802154_IETF_SUBIE_6TOP, "6top IE" },
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ 0, NULL }
};
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
static const value_string zboss_page_names[] = {
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ 0, "2.4 GHz" },
{ 28, "863-868 MHz band"},
{ 29, "868-870, 870-876 MHz band" },
{ 30, "870-876 MHz band" },
{ 31, "915-921 MHz band" },
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
{ 0, NULL }
};
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
static const value_string zboss_direction_names[] = {
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ 0, "IN" },
{ 1, "OUT" },
{ 0, NULL }
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
};
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
static const value_string ietf_6top_types[] = {
{ IETF_6TOP_TYPE_REQUEST, "Request" },
{ IETF_6TOP_TYPE_RESPONSE, "Response" },
{ IETF_6TOP_TYPE_CONFIRMATION, "Confirmation" },
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
{ 0, NULL }
};
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
static const value_string ietf_6top_command_identifiers[] = {
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ IETF_6TOP_CMD_ADD, "ADD" },
{ IETF_6TOP_CMD_DELETE, "DELETE" },
{ IETF_6TOP_CMD_RELOCATE, "RELOCATE" },
{ IETF_6TOP_CMD_COUNT, "COUNT" },
{ IETF_6TOP_CMD_LIST, "LIST" },
{ IETF_6TOP_CMD_CLEAR, "CLEAR" },
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
{ 0, NULL }
};
static const value_string ietf_6top_return_codes[] = {
{ IETF_6TOP_RC_SUCCESS, "SUCCESS" },
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ IETF_6TOP_RC_ERROR, "ERROR" },
{ IETF_6TOP_RC_EOL, "EOL" },
{ IETF_6TOP_RC_RESET, "RESET" },
{ IETF_6TOP_RC_VER_ERR, "VER_ERR" },
{ IETF_6TOP_RC_SFID_ERR, "SFID_ERR" },
{ IETF_6TOP_RC_GEN_ERR, "GEN_ERR" },
{ IETF_6TOP_RC_BUSY, "BUSY" },
{ IETF_6TOP_RC_NORES, "NORES" },
{ IETF_6TOP_RC_CELLLIST_ERR, "CELLLIST_ERR" },
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
{ 0, NULL }
};
static const value_string ietf_6top_generation_numbers[] = {
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ 0, "Clear" },
{ 1, "Lollipop Counter Value" },
{ 2, "Lollipop Counter Value" },
{ 3, "Lollipop Counter Value" },
{ 4, "Lollipop Counter Value" },
{ 5, "Lollipop Counter Value" },
{ 6, "Lollipop Counter Value" },
{ 7, "Lollipop Counter Value" },
{ 8, "Lollipop Counter Value" },
{ 9, "Lollipop Counter Value" },
{ 10, "Reserved" },
{ 11, "Reserved" },
{ 12, "Reserved" },
{ 13, "Reserved" },
{ 14, "Reserved" },
{ 15, "Reserved" },
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
{ 0, NULL}
};
static const value_string ietf_6top_cell_options[] = {
{ 0, "ALL" },
{ 1, "TX" },
{ 2, "RX" },
{ 3, "TX|RX" },
{ 4, "SHARED" },
{ 5, "TX|SHARED" },
{ 6, "RX|SHARED" },
{ 7, "TX|RX|SHARED" },
{ 0, NULL}
};
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
static const value_string mpx_transfer_type_vals[] = {
{ IEEE802159_MPX_FULL_FRAME, "Full Frame" },
{ IEEE802159_MPX_FULL_FRAME_NO_MUXID, "Full frame with compressed Multiplex ID" },
{ IEEE802159_MPX_NON_LAST_FRAGMENT, "Non-last Fragment" },
{ IEEE802159_MPX_LAST_FRAGMENT, "Last Fragment" },
{ IEEE802159_MPX_ABORT, "Abort" },
{ 0, NULL }
};
static const value_string mpx_multiplex_id_vals[] = {
{ IEEE802159_MPX_MULTIPLEX_ID_KMP, "KMP" },
{ 0, NULL }
};
static const value_string mpx_kmp_id_vals[] = {
{ IEEE802159_MPX_KMP_ID_IEEE8021X, "IEEE 802.1X/MKA" },
{ IEEE802159_MPX_KMP_ID_HIP, "HIP" },
{ IEEE802159_MPX_KMP_ID_IKEV2, "IKEv2" },
{ IEEE802159_MPX_KMP_ID_PANA, "PANA" },
{ IEEE802159_MPX_KMP_ID_DRAGONFLY, "Dragonfly" },
{ IEEE802159_MPX_KMP_ID_IEEE80211_4WH, "IEEE 802.11/4WH" },
{ IEEE802159_MPX_KMP_ID_IEEE80211_GKH, "IEEE 802.11/GKH" },
{ IEEE802159_MPX_KMP_ID_ETSI_TS_102_887_2, "ETSI TS 102 887-2" },
{ IEEE802159_MPX_KMP_ID_VENDOR_SPECIFIC, "Vendor-specific" },
{ 0, NULL }
};
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static const int * header_short_format_nested_ie[] = {
&hf_ieee802154_psie_type_short,
&hf_ieee802154_psie_id_short,
&hf_ieee802154_psie_length_short,
NULL
};
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* Preferences for 2003 security */
static gint ieee802154_sec_suite = SECURITY_LEVEL_ENC_MIC_64;
static gboolean ieee802154_extend_auth = TRUE;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Macro to check addressing, and throw a warning flag if incorrect. */
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
#define IEEE802154_CMD_ADDR_CHECK(_pinfo_, _item_, _cmdid_, _x_) \
if (!(_x_)) \
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(_pinfo_, _item_, &ei_ieee802154_invalid_addressing, \
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
"Invalid Addressing for %s", \
Use val_to_str_const() where appropriate; 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-08-10 22:55:02 +00:00
val_to_str_const(_cmdid_, ieee802154_cmd_names, "Unknown Command"))
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* CRC definitions. IEEE 802.15.4 CRCs vary from CCITT by using an initial value of
* 0x0000, and no XOR out. IEEE802154_CRC_XOR is defined as 0xFFFF in order to un-XOR
* the output from the CCITT CRC routines in Wireshark.
*/
#define IEEE802154_CRC_SEED 0x0000
#define IEEE802154_CRC_XOROUT 0xFFFF
#define ieee802154_crc_tvb(tvb, offset) (crc16_ccitt_tvb_seed(tvb, offset, IEEE802154_CRC_SEED) ^ IEEE802154_CRC_XOROUT)
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 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-02-12 17:03:49 +00:00
static int ieee802_15_4_short_address_to_str(const address* addr, gchar *buf, int buf_len)
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
{
guint16 ieee_802_15_4_short_addr = pletoh16(addr->data);
if (ieee_802_15_4_short_addr == 0xffff)
{
g_strlcpy(buf, "Broadcast", buf_len);
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 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-02-12 17:03:49 +00:00
return 10;
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
}
*buf++ = '0';
*buf++ = 'x';
buf = word_to_hex(buf, ieee_802_15_4_short_addr);
*buf = '\0'; /* NULL terminate */
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 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-02-12 17:03:49 +00:00
return 7;
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
}
static int ieee802_15_4_short_address_str_len(const address* addr _U_)
{
return 11;
}
Add fixed length function for address types. This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c. Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file. Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4 Reviewed-on: https://code.wireshark.org/review/7038 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-02-09 01:36:03 +00:00
static int ieee802_15_4_short_address_len(void)
{
return 2;
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Dissector helper, parses and displays the frame control field.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields
* @param tree pointer to data tree wireshark uses to display packet.
* @param packet IEEE 802.15.4 packet information.
* @param offset offset into the tvb to find the FCF.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet, guint *offset)
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
guint16 fcf;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * fields[] = {
&hf_ieee802154_frame_type,
&hf_ieee802154_security,
&hf_ieee802154_pending,
&hf_ieee802154_ack_request,
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 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-12-11 01:06:04 +00:00
&hf_ieee802154_pan_id_compression,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
&hf_ieee802154_seqno_suppression,
&hf_ieee802154_ie_present,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
&hf_ieee802154_dst_addr_mode,
&hf_ieee802154_version,
&hf_ieee802154_src_addr_mode,
NULL
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get the FCF field. */
fcf = tvb_get_letohs(tvb, *offset);
/* Parse FCF Flags. */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
packet->frame_type = (fcf & IEEE802154_FCF_TYPE_MASK);
packet->security_enable = (fcf & IEEE802154_FCF_SEC_EN) >> 3;
packet->frame_pending = (fcf & IEEE802154_FCF_FRAME_PND) >> 4;
packet->ack_request = (fcf & IEEE802154_FCF_ACK_REQ) >> 5;
packet->pan_id_compression = (fcf & IEEE802154_FCF_PAN_ID_COMPRESSION) >> 6;
/* bit 7 reserved */
packet->seqno_suppression = (fcf & IEEE802154_FCF_SEQNO_SUPPRESSION) >> 8;
packet->ie_present = (fcf & IEEE802154_FCF_IE_PRESENT) >> 9;
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 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-12-11 01:06:04 +00:00
packet->dst_addr_mode = (fcf & IEEE802154_FCF_DADDR_MASK) >> 10;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
packet->version = (fcf & IEEE802154_FCF_VERSION) >> 12;
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 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-12-11 01:06:04 +00:00
packet->src_addr_mode = (fcf & IEEE802154_FCF_SADDR_MASK) >> 14;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
if ((packet->version == IEEE802154_VERSION_2015) && (packet->frame_type == IEEE802154_FCF_BEACON)) {
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
proto_item_append_text(tree, " Enhanced Beacon");
col_set_str(pinfo->cinfo, COL_INFO, "Enhanced Beacon");
}
else {
proto_item_append_text(tree, " %s", val_to_str_const(packet->frame_type, ieee802154_frame_types, "Reserved"));
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet->frame_type, ieee802154_frame_types, "Reserved"));
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask(tree, tvb, *offset, hf_ieee802154_fcf,
ett_ieee802154_fcf, fields, ENC_LITTLE_ENDIAN);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154_fcf */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
void register_ieee802154_mac_key_hash_handler(guint hash_identifier, ieee802154_set_mac_key_func key_func)
{
/* Ensure no duplication */
DISSECTOR_ASSERT(wmem_tree_lookup32(mac_key_hash_handlers, hash_identifier) == NULL);
wmem_tree_insert32(mac_key_hash_handlers, hash_identifier, (void*)key_func);
}
void dissect_ieee802154_aux_sec_header_and_key(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, ieee802154_packet *packet, guint *offset)
{
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
proto_tree *field_tree, *header_tree;
proto_item *ti, *hidden_item;
guint8 security_control;
guint aux_length = 1; /* Minimum length of the auxiliary header. */
static const int * security_fields[] = {
&hf_ieee802154_aux_sec_security_level,
&hf_ieee802154_aux_sec_key_id_mode,
&hf_ieee802154_aux_sec_frame_counter_suppression,
&hf_ieee802154_aux_sec_asn_in_nonce,
&hf_ieee802154_aux_sec_reserved,
NULL
};
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
/* Parse the security control field. */
security_control = tvb_get_guint8(tvb, *offset);
packet->security_level = (ieee802154_security_level)(security_control & IEEE802154_AUX_SEC_LEVEL_MASK);
packet->key_id_mode = (ieee802154_key_id_mode)((security_control & IEEE802154_AUX_KEY_ID_MODE_MASK) >> IEEE802154_AUX_KEY_ID_MODE_SHIFT);
if (packet->version == IEEE802154_VERSION_2015) {
packet->frame_counter_suppression = security_control & IEEE802154_AUX_FRAME_COUNTER_SUPPRESSION_MASK ? TRUE : FALSE;
}
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
/* Compute the length of the auxiliary header and create a subtree. */
if (!packet->frame_counter_suppression) aux_length += 4;
if (packet->key_id_mode != KEY_ID_MODE_IMPLICIT) aux_length++;
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_4) aux_length += 4;
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_8) aux_length += 8;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
ti = proto_tree_add_item(tree, hf_ieee802154_aux_security_header, tvb, *offset, aux_length, ENC_NA);
header_tree = proto_item_add_subtree(ti, ett_ieee802154_auxiliary_security);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
/* Security Control Field */
proto_tree_add_bitmask(header_tree, tvb, *offset, hf_ieee802154_aux_sec_security_control, ett_ieee802154_aux_sec_control, security_fields, ENC_NA);
(*offset)++;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
/* Frame Counter Field */
if (!packet->frame_counter_suppression) {
proto_tree_add_item_ret_uint(header_tree, hf_ieee802154_aux_sec_frame_counter, tvb, *offset, 4, ENC_LITTLE_ENDIAN, &packet->frame_counter);
(*offset) += 4;
}
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
/* Key identifier field(s). */
if (packet->key_id_mode != KEY_ID_MODE_IMPLICIT) {
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Create a subtree. */
field_tree = proto_tree_add_subtree(header_tree, tvb, *offset, 1,
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
ett_ieee802154_aux_sec_key_id, &ti, "Key Identifier Field"); /* Will fix length later. */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Add key source, if it exists. */
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_4) {
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
packet->key_source.addr32 = tvb_get_ntohl(tvb, *offset);
proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, *offset, 4, packet->key_source.addr32);
hidden_item = proto_tree_add_item(field_tree, hf_ieee802154_aux_sec_key_source_bytes, tvb, *offset, 4, ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_item_set_len(ti, 1 + 4);
(*offset) += 4;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
}
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_8) {
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
packet->key_source.addr64 = tvb_get_ntoh64(tvb, *offset);
proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, *offset, 8, packet->key_source.addr64);
hidden_item = proto_tree_add_item(field_tree, hf_ieee802154_aux_sec_key_source_bytes, tvb, *offset, 8, ENC_NA);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_item_set_len(ti, 1 + 8);
(*offset) += 8;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
}
/* Add key identifier. */
packet->key_index = tvb_get_guint8(tvb, *offset);
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
proto_tree_add_uint(field_tree, hf_ieee802154_aux_sec_key_index, tvb, *offset, 1, packet->key_index);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
(*offset)++;
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
}
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
}
tvbuff_t *dissect_ieee802154_payload(tvbuff_t * tvb, guint offset, packet_info * pinfo, proto_tree* key_tree,
ieee802154_packet * packet, ieee802154_payload_info_t* payload_info,
ieee802154_set_key_func set_key_func, ieee802154_payload_func payload_func)
{
proto_item* ti;
unsigned char key[IEEE802154_CIPHER_SIZE];
unsigned char alt_key[IEEE802154_CIPHER_SIZE];
tvbuff_t * payload_tvb = NULL;
/* Lookup the key. */
for (payload_info->key_number = 0; payload_info->key_number < num_ieee802154_keys; payload_info->key_number++) {
if (set_key_func(packet, key, alt_key, &ieee802154_keys[payload_info->key_number])) {
/* Try with the initial key */
payload_info->key = key;
payload_tvb = payload_func(tvb, offset, pinfo, packet, payload_info);
if (!((*payload_info->status == DECRYPT_PACKET_MIC_CHECK_FAILED) || (*payload_info->status == DECRYPT_PACKET_DECRYPT_FAILED))) {
break;
}
/* Try with the alternate key */
payload_info->key = alt_key;
payload_tvb = payload_func(tvb, offset, pinfo, packet, payload_info);
if (!((*payload_info->status == DECRYPT_PACKET_MIC_CHECK_FAILED) || (*payload_info->status == DECRYPT_PACKET_DECRYPT_FAILED))) {
break;
}
}
}
if (payload_info->key_number == num_ieee802154_keys) {
/* None of the stored keys seemed to work */
*payload_info->status = DECRYPT_PACKET_NO_KEY;
}
/* Store the key number used for retrieval */
ti = proto_tree_add_uint(key_tree, hf_ieee802154_key_number, tvb, 0, 0, payload_info->key_number);
PROTO_ITEM_SET_HIDDEN(ti);
return payload_tvb;
}
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/**
* Dissector for IEEE 802.15.4 non-ASK PHY packet with an FCS containing a 16-bit CRC value.
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields
* @param tree pointer to data tree wireshark uses to display packet.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
static int
dissect_ieee802154_nonask_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_tree *ieee802154_tree = NULL;
proto_item *proto_root = NULL;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
guint offset = 0;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
guint8 phr;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
tvbuff_t* mac;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
/* Create the protocol tree. */
if (tree) {
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
proto_root = proto_tree_add_protocol_format(tree, proto_ieee802154_nonask_phy, tvb, 0, tvb_captured_length(tvb), "IEEE 802.15.4 non-ASK PHY");
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
ieee802154_tree = proto_item_add_subtree(proto_root, ett_ieee802154_nonask_phy);
}
/* Add the protocol name. */
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4 non-ASK PHY");
Back out 34627 and friends again. svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
phr = tvb_get_guint8(tvb,offset+4+1);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
if (tree) {
guint loffset = offset;
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
static const int * phr_fields[] = {
&hf_ieee802154_nonask_phy_length,
NULL
};
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree_add_item(ieee802154_tree, hf_ieee802154_nonask_phy_preamble, tvb, loffset, 4, ENC_LITTLE_ENDIAN);
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
loffset +=4 ;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree_add_item(ieee802154_tree, hf_ieee802154_nonask_phy_sfd, tvb, loffset, 1, ENC_LITTLE_ENDIAN);
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
loffset +=1 ;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
proto_tree_add_bitmask(ieee802154_tree, tvb, loffset, hf_ieee802154_nonask_phr, ett_ieee802154_nonask_phy_phr,
phr_fields, ENC_NA);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
}
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
offset += 4+2*1;
mac = tvb_new_subset_length_caplen(tvb,offset,-1, phr & IEEE802154_PHY_LENGTH_MASK);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
/* Call the common dissector. */
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
dissect_ieee802154(mac, pinfo, ieee802154_tree, NULL);
return tvb_captured_length(tvb);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
} /* dissect_ieee802154_nonask_phy */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Dissector for IEEE 802.15.4 packet with an FCS containing a 16-bit CRC value.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields.
* @param tree pointer to data tree wireshark uses to display packet.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
static int
dissect_ieee802154(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
tvbuff_t *new_tvb = dissect_zboss_specific(tvb, pinfo, tree);
ZigBee MAC parse: fix Association request parse in case of FCS absence. If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case. Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c Reviewed-on: https://code.wireshark.org/review/16412 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>
2016-07-13 09:40:54 +00:00
guint options = 0;
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
ZigBee MAC parse: fix Association request parse in case of FCS absence. If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case. Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c Reviewed-on: https://code.wireshark.org/review/16412 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>
2016-07-13 09:40:54 +00:00
if (ieee802154_cc24xx)
{
options = DISSECT_IEEE802154_OPTION_CC24xx;
}
if (new_tvb != tvb)
{
/* ZBOSS traffic dump: always TI FCS, always ZigBee */
options = (DISSECT_IEEE802154_OPTION_CC24xx | DISSECT_IEEE802154_OPTION_ZBOSS);
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Call the common dissector. */
ZigBee MAC parse: fix Association request parse in case of FCS absence. If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case. Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c Reviewed-on: https://code.wireshark.org/review/16412 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>
2016-07-13 09:40:54 +00:00
dissect_ieee802154_common(new_tvb, pinfo, tree, options);
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
return tvb_captured_length(tvb);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154 */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Dissector for IEEE 802.15.4 packet with no FCS present.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields
* @param tree pointer to data tree wireshark uses to display packet.
* @return captured length.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
static int
dissect_ieee802154_nofcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * data _U_)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
tvbuff_t *new_tvb;
/* If there is no FCS present in the reported packet, then the length of
* the true IEEE 802.15.4 packet is actually 2 bytes longer. Re-create
* the buffer with an extended reported length so that the packet will
* be handled as though the FCS were truncated.
*
* Note, we can't just call tvb_set_reported_length(), because it includes
* checks to ensure that the new reported length is not longer than the old
* reported length (why?), and will throw an exception.
*/
Rename tvb_new_subset() to tvb_new_subset_length_caplen(). This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:18:49 +00:00
new_tvb = tvb_new_subset_length_caplen(tvb, 0, -1, tvb_reported_length(tvb)+IEEE802154_FCS_LEN);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Call the common dissector. */
dissect_ieee802154_common(new_tvb, pinfo, tree, 0);
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
return tvb_captured_length(tvb);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154_nofcs */
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
/**
* Dissector for IEEE 802.15.4 packet dump produced by ZBOSS
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields
* @param tree pointer to data tree wireshark uses to display packet.
* @return new tvb subset if this is really ZBOSS dump, else oririnal tvb.
*/
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
static tvbuff_t *
dissect_zboss_specific(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
{
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
proto_tree *zboss_tree;
proto_item *proto_root;
guint off = 0;
guint32 direction_byte, page_byte, channel;
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
if (tvb_captured_length(tvb) > 5)
{
if (tvb_get_guint8(tvb, off++) == 'Z'
&& tvb_get_guint8(tvb, off++) == 'B'
&& tvb_get_guint8(tvb, off++) == 'O'
&& tvb_get_guint8(tvb, off++) == 'S'
&& tvb_get_guint8(tvb, off++) == 'S')
{
/* Create the protocol tree. */
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
proto_root = proto_tree_add_protocol_format(tree, proto_zboss, tvb, 0, tvb_captured_length(tvb), "ZBOSS dump");
zboss_tree = proto_item_add_subtree(proto_root, ett_ieee802154_zboss);
proto_tree_add_item_ret_uint(zboss_tree, hf_zboss_direction, tvb, off, 1, ENC_NA, &direction_byte);
proto_item_append_text(proto_root, ", %s", direction_byte ? "OUT" : "IN");
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
proto_tree_add_item_ret_uint(zboss_tree, hf_zboss_page, tvb, off, 1, ENC_NA, &page_byte);
proto_item_append_text(proto_root, ", page %u", page_byte);
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
off++;
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
proto_tree_add_item_ret_uint(zboss_tree, hf_zboss_channel, tvb, off, 1, ENC_NA, &channel);
proto_item_append_text(proto_root, ", channel %u", channel);
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
off++;
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
proto_tree_add_item(zboss_tree, hf_zboss_trace_number, tvb, off, 4, ENC_LITTLE_ENDIAN);
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
off += 4;
Rename tvb_new_subset() to tvb_new_subset_length_caplen(). This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:18:49 +00:00
return tvb_new_subset_length_caplen(tvb, off, tvb_captured_length(tvb) - off, tvb_captured_length(tvb) - off);
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
}
}
return tvb;
} /* dissect_zboss_heur */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Dissector for IEEE 802.15.4 packet with a ChipCon/Texas
* Instruments compatible FCS. This is typically called by
* layers encapsulating an IEEE 802.15.4 packet.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields
* @param tree pointer to data tree wireshark uses to display packet.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
static int
dissect_ieee802154_cc24xx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * data _U_)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
/* Call the common dissector. */
dissect_ieee802154_common(tvb, pinfo, tree, DISSECT_IEEE802154_OPTION_CC24xx);
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 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-11-14 01:18:34 +00:00
return tvb_captured_length(tvb);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154_cc24xx */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* IEEE 802.15.4 packet dissection routine for Wireshark.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* This function extracts all the information first before displaying.
* If payload exists, that portion will be passed into another dissector
* for further processing.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* This is called after the individual dissect_ieee802154* functions
* have been called to determine what sort of FCS is present.
* The dissect_ieee802154* functions will set the parameters
* in the ieee802154_packet structure, and pass it to this one
* through the data parameter.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields
* @param tree pointer to data tree wireshark uses to display packet.
* @param options bitwise or of dissector options (see DISSECT_IEEE802154_OPTION_xxx).
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options)
{
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
tvbuff_t *volatile payload_tvb = NULL;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_tree *volatile ieee802154_tree = NULL;
proto_item *volatile proto_root = NULL;
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
proto_item *hidden_item;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_item *ti;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
proto_item *mic_item = NULL;
proto_tree *header_tree = NULL;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
guint offset = 0;
volatile gboolean fcs_ok = TRUE;
const char *saved_proto;
ws_decrypt_status status;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
gboolean dstPanPresent = FALSE;
gboolean srcPanPresent = FALSE;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
unsigned char rx_mic[IEEE802154_CIPHER_SIZE];
guint rx_mic_len = 0;
Ensure ieee802154_packet struct is initialized. A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be called with an incompletely-initialized structure, leading to valgrind errors. Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159 Closes-Bug: #9735 Reviewed-on: https://code.wireshark.org/review/418 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27 00:11:12 +00:00
ieee802154_packet *packet = wmem_new0(wmem_packet_scope(), ieee802154_packet);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
ieee802154_short_addr addr16;
ieee802154_hints_t *ieee_hints;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Missed update of one dissector_try_heuristic() when merging. ssed# asn1/s1ap/s1ap.diff Change-Id: I4bb473860bf116138fa82791aa0f4a952164476a Reviewed-on: https://code.wireshark.org/review/1724 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 15:47:30 +00:00
heur_dtbl_entry_t *hdtbl_entry;
Change the signature of dissector_try_heuristic() to return hdtbl_entry which can be used to call the found heuristic dissector on the next pass. Introduce call_heur_dissector_direct() to be used to call a heuristic dissector which accepted the frame on the first pass. Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582 Reviewed-on: https://code.wireshark.org/review/1697 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 10:54:20 +00:00
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
packet->short_table = ieee802154_map.short_table;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Allocate frame data with hints for upper layers */
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
if (!pinfo->fd->flags.visited) {
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
ieee_hints = wmem_new0(wmem_file_scope(), ieee802154_hints_t);
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
p_add_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0, ieee_hints);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else {
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
ieee_hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Save a pointer to the whole packet */
ieee_hints->packet = packet;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Create the protocol tree. */
if (tree) {
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
proto_root = proto_tree_add_protocol_format(tree, proto_ieee802154, tvb, 0, tvb_captured_length(tvb), "IEEE 802.15.4");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
ieee802154_tree = proto_item_add_subtree(proto_root, ett_ieee802154);
}
/* Add the protocol name. */
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
/* Add the packet length to the filter field */
Add the hidden wpan.frame_length to the IEEE 802.15.4 tree, not the top-level tree. svn path=/trunk/; revision=50541
2013-07-12 21:32:03 +00:00
hidden_item = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_frame_length, NULL, 0, 0, tvb_reported_length(tvb));
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
PROTO_ITEM_SET_HIDDEN(hidden_item);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Frame Control Field */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
dissect_ieee802154_fcf(tvb, pinfo, ieee802154_tree, packet, &offset);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Sequence Number */
if (packet->seqno_suppression) {
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
if (packet->version != IEEE802154_VERSION_2015) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
expert_add_info(pinfo, proto_root, &ei_ieee802154_seqno_suppression);
}
} else { /* IEEE 802.15.4 Sequence Number Suppression */
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
packet->seqno = tvb_get_guint8(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_seqno, tvb, offset, 1, packet->seqno);
/* For Ack packets display this in the root. */
if (packet->frame_type == IEEE802154_FCF_ACK) {
proto_item_append_text(proto_root, ", Sequence Number: %u", packet->seqno);
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
offset += 1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
* ADDRESSING FIELDS
*/
/* Clear out the addressing strings. */
Add free_address_wmem(), fix warnings [-Wcast-qual] Try to improve address API and also fix some constness warnings by not overloading the 'data' pointer to store malloc'ed buffers (use private pointer for that instead). Second try, now passing test suite. Change-Id: Idc101cd866b6d4f13500c9d59da5c7a38847fb7f Reviewed-on: https://code.wireshark.org/review/13946 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2015-11-26 04:44:52 +00:00
clear_address(&pinfo->net_dst);
clear_address(&pinfo->dl_dst);
clear_address(&pinfo->dst);
clear_address(&pinfo->net_src);
clear_address(&pinfo->dl_src);
clear_address(&pinfo->src);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_RESERVED) {
/* Invalid Destination Address Mode. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_dst);
return;
}
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_RESERVED) {
/* Invalid Source Address Mode. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_src);
return;
}
if (packet->version == IEEE802154_VERSION_RESERVED) {
/* Unknown Frame Version. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_frame_ver);
return;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
else if ((packet->version == IEEE802154_VERSION_2003) || /* For Frame Version 0b00 and */
(packet->version == IEEE802154_VERSION_2006)) { /* 0b01 effect defined in section 7.2.1.5 */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
if ((packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE) && /* if both destination and source */
(packet->src_addr_mode != IEEE802154_FCF_ADDR_NONE)) { /* addressing information is present */
if (packet->pan_id_compression == 1) { /* PAN IDs are identical */
dstPanPresent = TRUE;
srcPanPresent = FALSE; /* source PAN ID is omitted */
}
else { /* PAN IDs are different, both shall be included in the frame */
dstPanPresent = TRUE;
srcPanPresent = TRUE;
}
}
else {
if (packet->pan_id_compression == 1) { /* all remaining cases pan_id_compression must be zero */
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_addressing);
return;
}
else {
/* only either the destination or the source addressing information is present */
if ((packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE) && /* Present */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE)) { /* Not Present */
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
dstPanPresent = TRUE;
srcPanPresent = FALSE;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->src_addr_mode != IEEE802154_FCF_ADDR_NONE)) { /* Present */
dstPanPresent = FALSE;
srcPanPresent = TRUE;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE)) { /* Not Present */
dstPanPresent = FALSE;
srcPanPresent = FALSE;
}
else {
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_addressing);
return;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
}
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
else if (packet->version == IEEE802154_VERSION_2015) {
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* for Frame Version 0b10 PAN Id Compression only applies to these frame types */
if ((packet->frame_type == IEEE802154_FCF_BEACON) ||
(packet->frame_type == IEEE802154_FCF_DATA) ||
(packet->frame_type == IEEE802154_FCF_ACK) ||
(packet->frame_type == IEEE802154_FCF_CMD) ) {
/* Implements Table 7-6 of IEEE 802.15.4-2015
*
* Destination Address Source Address Destination PAN ID Source PAN ID PAN ID Compression
*-------------------------------------------------------------------------------------------------
* 1. Not Present Not Present Not Present Not Present 0
* 2. Not Present Not Present Present Not Present 1
* 3. Present Not Present Present Not Present 0
* 4. Present Not Present Not Present Not Present 1
*
* 5. Not Present Present Not Present Present 0
* 6. Not Present Present Not Present Not Present 1
*
* 7. Extended Extended Present Not Present 0
* 8. Extended Extended Not Present Not Present 1
*
* 9. Short Short Present Present 0
* 10. Short Extended Present Present 0
* 11. Extended Short Present Present 0
*
* 12. Short Extended Present Not Present 1
* 13. Extended Short Present Not Present 1
* 14. Short Short Present Not Present 1
*/
/* Row 1 */
if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->pan_id_compression == 0)) {
dstPanPresent = FALSE;
srcPanPresent = FALSE;
}
/* Row 2 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->pan_id_compression == 1)) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
dstPanPresent = TRUE;
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
srcPanPresent = FALSE;
}
/* Row 3 */
else if ((packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE) && /* Present */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->pan_id_compression == 0)) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
dstPanPresent = TRUE;
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
srcPanPresent = FALSE;
}
/* Row 4 */
else if ((packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE) && /* Present */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->pan_id_compression == 1)) {
dstPanPresent = FALSE;
srcPanPresent = FALSE;
}
/* Row 5 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->src_addr_mode != IEEE802154_FCF_ADDR_NONE) && /* Present */
(packet->pan_id_compression == 0)) {
dstPanPresent = FALSE;
srcPanPresent = TRUE;
}
/* Row 6 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) && /* Not Present */
(packet->src_addr_mode != IEEE802154_FCF_ADDR_NONE) && /* Present */
(packet->pan_id_compression == 1)) {
dstPanPresent = FALSE;
srcPanPresent = FALSE;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Row 7 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->pan_id_compression == 0)) {
dstPanPresent = TRUE;
srcPanPresent = FALSE;
}
/* Row 8 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->pan_id_compression == 1)) {
dstPanPresent = FALSE;
srcPanPresent = FALSE;
}
/* Row 9 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->pan_id_compression == 0)) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
dstPanPresent = TRUE;
srcPanPresent = TRUE;
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
}
/* Row 10 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->pan_id_compression == 0)) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
dstPanPresent = TRUE;
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
srcPanPresent = TRUE;
}
/* Row 11 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->pan_id_compression == 0)) {
dstPanPresent = TRUE;
srcPanPresent = TRUE;
}
/* Row 12 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->pan_id_compression == 1)) {
dstPanPresent = TRUE;
srcPanPresent = FALSE;
}
/* Row 13 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) && /* Extended */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->pan_id_compression == 1)) {
dstPanPresent = TRUE;
srcPanPresent = FALSE;
}
/* Row 14 */
else if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) && /* Short */
(packet->pan_id_compression == 1)) {
dstPanPresent = TRUE;
srcPanPresent = FALSE;
}
else {
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_panid_compression2);
return;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
From Owen Kirby: 6LoWPAN: Automatic context detection and draft-ietf-6lowpan-nd-19 updates. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7521 svn path=/trunk/; revision=44723
2012-09-01 11:54:16 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
else { /* Frame Type is neither Beacon, Data, Ack, nor Command: PAN ID Compression is not used */
dstPanPresent = FALSE; /* no PAN ID will */
srcPanPresent = FALSE; /* be present */
}
}
else {
/* Unknown Frame Version. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_frame_ver);
return;
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/*
* Addressing Fields
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Destination PAN Id */
if (dstPanPresent) {
packet->dst_pan = tvb_get_letohs(tvb, offset);
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
if (ieee802154_tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst_panID, tvb, offset, 2, packet->dst_pan);
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
offset += 2;
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Destination Address */
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
gchar* dst_addr;
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 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-01-20 22:22:40 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Get the address. */
packet->dst16 = tvb_get_letohs(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Provide address hints to higher layers that need it. */
if (ieee_hints) {
ieee_hints->dst16 = packet->dst16;
}
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 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-01-20 22:22:40 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
set_address_tvb(&pinfo->dl_dst, ieee802_15_4_short_address_type, 2, tvb, offset);
copy_address_shallow(&pinfo->dst, &pinfo->dl_dst);
dst_addr = address_to_str(wmem_packet_scope(), &pinfo->dst);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst16, tvb, offset, 2, packet->dst16);
proto_item_append_text(proto_root, ", Dst: %s", dst_addr);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", dst_addr);
offset += 2;
}
else if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) {
guint64 *p_addr = (guint64 *)wmem_new(pinfo->pool, guint64);
From Colin O'Flynn: Add a missing NULL pointer check. svn path=/trunk/; revision=34761
2010-11-03 17:52:11 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Get the address */
packet->dst64 = tvb_get_letoh64(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Copy and convert the address to network byte order. */
*p_addr = pntoh64(&(packet->dst64));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Display the destination address. */
/* XXX - OUI resolution doesn't happen when displaying resolved
* EUI64 addresses; that should probably be fixed in
* epan/addr_resolv.c.
*/
set_address(&pinfo->dl_dst, AT_EUI64, 8, p_addr);
copy_address_shallow(&pinfo->dst, &pinfo->dl_dst);
if (tree) {
proto_tree_add_item(ieee802154_tree, hf_ieee802154_dst64, tvb, offset, 8, ENC_LITTLE_ENDIAN);
proto_item_append_text(proto_root, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64));
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64));
offset += 8;
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Source PAN Id */
if (srcPanPresent) {
packet->src_pan = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src_panID, tvb, offset, 2, packet->src_pan);
offset += 2;
}
else {
if (dstPanPresent) {
packet->src_pan = packet->dst_pan;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
else {
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
packet->src_pan = IEEE802154_BCAST_PAN;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
}
if (ieee_hints) {
ieee_hints->src_pan = packet->src_pan;
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Source Address */
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
gchar* src_addr;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Get the address. */
packet->src16 = tvb_get_letohs(tvb, offset);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
if (!pinfo->fd->flags.visited) {
/* If we know our extended source address from previous packets,
* provide a pointer to it in a hint for upper layers */
addr16.addr = packet->src16;
addr16.pan = packet->src_pan;
if (ieee_hints) {
ieee_hints->src16 = packet->src16;
ieee_hints->map_rec = (ieee802154_map_rec *)
g_hash_table_lookup(ieee802154_map.short_table, &addr16);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
set_address_tvb(&pinfo->dl_src, ieee802_15_4_short_address_type, 2, tvb, offset);
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
src_addr = address_to_str(wmem_packet_scope(), &pinfo->src);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Add the addressing info to the tree. */
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src16, tvb, offset, 2, packet->src16);
proto_item_append_text(proto_root, ", Src: %s", src_addr);
if (ieee_hints && ieee_hints->map_rec) {
/* Display inferred source address info */
ti = proto_tree_add_eui64(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 0,
ieee_hints->map_rec->addr64);
PROTO_ITEM_SET_GENERATED(ti);
if ( ieee_hints->map_rec->start_fnum ) {
ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src64_origin, tvb, 0, 0,
ieee_hints->map_rec->start_fnum);
}
else {
ti = proto_tree_add_uint_format_value(ieee802154_tree, hf_ieee802154_src64_origin, tvb, 0, 0,
ieee_hints->map_rec->start_fnum, "Pre-configured");
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
PROTO_ITEM_SET_GENERATED(ti);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 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-01-20 22:22:40 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", Src: %s", src_addr);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
offset += 2;
}
else if (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) {
guint64 *p_addr = (guint64 *)wmem_new(pinfo->pool, guint64);
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 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-01-20 22:22:40 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Get the address. */
packet->src64 = tvb_get_letoh64(tvb, offset);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
/* Copy and convert the address to network byte order. */
*p_addr = pntoh64(&(packet->src64));
/* Display the source address. */
/* XXX - OUI resolution doesn't happen when displaying resolved
* EUI64 addresses; that should probably be fixed in
* epan/addr_resolv.c.
*/
set_address(&pinfo->dl_src, AT_EUI64, 8, p_addr);
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
if (tree) {
proto_tree_add_item(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 8, ENC_LITTLE_ENDIAN);
proto_item_append_text(proto_root, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64));
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64));
offset += 8;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Check, but don't display the FCS yet, otherwise the payload dissection
* may be out of place in the tree. But we want to know if the FCS is OK in
* case the CRC is bad (don't want to continue dissection to the NWK layer).
*/
if (tvb_bytes_exist(tvb, tvb_reported_length(tvb)-IEEE802154_FCS_LEN, IEEE802154_FCS_LEN)) {
/* The FCS is in the last two bytes of the packet. */
guint16 fcs = tvb_get_letohs(tvb, tvb_reported_length(tvb)-IEEE802154_FCS_LEN);
/* Check if we are expecting a CC2420-style FCS*/
if (options & DISSECT_IEEE802154_OPTION_CC24xx) {
fcs_ok = (fcs & IEEE802154_CC24xx_CRC_OK);
}
else {
Made FCS calculation and checking code work on GCC 4.3.1. Made FCS check actually mean something. svn path=/trunk/; revision=26125
2008-09-03 05:56:30 +00:00
guint16 fcs_calc = ieee802154_crc_tvb(tvb, tvb_reported_length(tvb)-IEEE802154_FCS_LEN);
fcs_ok = (fcs == fcs_calc);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
}
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Existence of the Auxiliary Security Header is controlled by the Security Enabled Field */
packet-ieee802154.c: Bugfix handling Auxilary Security Header for v2003 Bug: 4912 Change-Id: Ifc4922fecb1320d7992f8250a0fb2fa18723a514 Reviewed-on: https://code.wireshark.org/review/20659 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-03-21 16:08:21 +00:00
if ((packet->security_enable) && (packet->version != IEEE802154_VERSION_2003)) {
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
dissect_ieee802154_aux_sec_header_and_key(tvb, pinfo, ieee802154_tree, packet, &offset);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* NONPAYLOAD FIELDS
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/* All of the beacon fields, except the beacon payload are considered nonpayload. */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if ((packet->version == IEEE802154_VERSION_2003) || (packet->version == IEEE802154_VERSION_2006)) {
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
if (packet->frame_type == IEEE802154_FCF_BEACON) { /* Regular Beacon. Some are not present in frame version (Enhanced) Beacons */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
dissect_ieee802154_superframe(tvb, pinfo, ieee802154_tree, &offset); /* superframe spec */
dissect_ieee802154_gtsinfo(tvb, pinfo, ieee802154_tree, &offset); /* GTS information fields */
dissect_ieee802154_pendaddr(tvb, pinfo, ieee802154_tree, &offset); /* Pending address list */
}
ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15.4 packet as a command. In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut. As a result, all except MAC commands are garbaged. Added check for the frame type and parce/cut command id only for 802.15.4 commands. Bug: 11929 Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a Reviewed-on: https://code.wireshark.org/review/12860 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: Graham Bloice <graham.bloice@trihedral.com>
2015-12-25 11:04:08 +00:00
if (packet->frame_type == IEEE802154_FCF_CMD) {
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* In IEEE802.15.4-2003 and 2006 the command identifier is considered to be part of the header
ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15.4 packet as a command. In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut. As a result, all except MAC commands are garbaged. Added check for the frame type and parce/cut command id only for 802.15.4 commands. Bug: 11929 Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a Reviewed-on: https://code.wireshark.org/review/12860 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: Graham Bloice <graham.bloice@trihedral.com>
2015-12-25 11:04:08 +00:00
* and is thus not encrypted. For IEEE802.15.4-2012e and later the command id is considered to be
* part of the payload, is encrypted, and follows the payload IEs. Thus we only parse the command id
* here for 2006 and earlier frames. */
packet->command_id = tvb_get_guint8(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_cmd_id, tvb, offset, 1, packet->command_id);
}
offset++;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15.4 packet as a command. In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut. As a result, all except MAC commands are garbaged. Added check for the frame type and parce/cut command id only for 802.15.4 commands. Bug: 11929 Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a Reviewed-on: https://code.wireshark.org/review/12860 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: Graham Bloice <graham.bloice@trihedral.com>
2015-12-25 11:04:08 +00:00
/* Display the command identifier in the info column. */
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
else {
if (packet->ie_present) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
offset += dissect_ieee802154_header_ie(tvb, pinfo, ieee802154_tree, offset, packet);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
}
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* IEEE 802.15.4-2003 may have security information pre-pended to payload */
if (packet->security_enable && (packet->version == IEEE802154_VERSION_2003)) {
/* Store security suite preference in the 2006 security level identifier to simplify 2003 integration! */
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
packet->security_level = (ieee802154_security_level)ieee802154_sec_suite;
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* Frame Counter and Key Sequence Counter prepended to the payload of an encrypted frame */
if (IEEE802154_IS_ENCRYPTED(packet->security_level)) {
packet->frame_counter = tvb_get_letohl (tvb, offset);
Fix a bunch of warnings. 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-12-26 05:57:06 +00:00
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_sec_frame_counter, tvb, offset, (int)sizeof(guint32), packet->frame_counter);
offset += (int)sizeof(guint32);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
packet->key_sequence_counter = tvb_get_guint8 (tvb, offset);
Fix a bunch of warnings. 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-12-26 05:57:06 +00:00
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_sec_key_sequence_counter, tvb, offset, (int)sizeof(guint8), packet->key_sequence_counter);
offset += (int)sizeof(guint8);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
}
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Encrypted Payload. */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (packet->security_enable) {
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
ieee802154_payload_info_t payload_info;
payload_info.rx_mic = rx_mic;
payload_info.rx_mic_length = &rx_mic_len;
payload_info.status = &status;
payload_info.key = NULL; /* payload function will fill that in */
payload_tvb = dissect_ieee802154_payload(tvb, offset, pinfo, header_tree, packet, &payload_info,
ieee802154_set_mac_key, dissect_ieee802154_decrypt);
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Get the unencrypted data if decryption failed. */
if (!payload_tvb) {
IEEE 802.15.4: Fix IE/MIC handling of secured packets without payload Change-Id: Icdcb770723e3783013f525524c3fe745d5dd862d Reviewed-on: https://code.wireshark.org/review/22122 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-06-14 05:52:59 +00:00
/* Deal with possible truncation and the MIC and FCS fields at the end. */
gint reported_len = tvb_reported_length(tvb)-offset-rx_mic_len-IEEE802154_FCS_LEN;
gint captured_len = tvb_captured_length(tvb)-offset;
payload_tvb = tvb_new_subset_length_caplen(tvb, offset, MIN(captured_len, reported_len), reported_len);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
}
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Display the MIC. */
if (rx_mic_len) {
mic_item = proto_tree_add_bytes(header_tree, hf_ieee802154_mic, tvb, 0, rx_mic_len, rx_mic);
PROTO_ITEM_SET_GENERATED(mic_item);
}
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Display the reason for failure, and abort if the error was fatal. */
switch (status) {
case DECRYPT_PACKET_SUCCEEDED:
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_NOT_ENCRYPTED:
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* No problem */
proto_item_append_text(mic_item, " [correct (key no. %d)]", payload_info.key_number);
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
break;
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
case DECRYPT_FRAME_COUNTER_SUPPRESSION_UNSUPPORTED:
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "Decryption of 802.15.4-2015 with frame counter suppression is not supported");
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_TOO_SMALL:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "Packet was too small to include the CRC and MIC");
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_NO_EXT_SRC_ADDR:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "No extended source address - can't decrypt");
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_NO_KEY:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "No encryption key set - can't decrypt");
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_DECRYPT_FAILED:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "Decrypt failed");
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_MIC_CHECK_FAILED:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "MIC check failed");
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
proto_item_append_text(mic_item, " [incorrect]");
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/*
* Abort only if the payload was encrypted, in which case we
* probably didn't decrypt the packet right (eg: wrong key).
*/
if (IEEE802154_IS_ENCRYPTED(packet->security_level)) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
goto dissect_ieee802154_fcs;
}
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
break;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
}
/* Plaintext Payload. */
else {
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Deal with possible truncation and the FCS field at the end. */
gint reported_len = tvb_reported_length(tvb)-offset-IEEE802154_FCS_LEN;
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
gint captured_len = tvb_captured_length(tvb)-offset;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
if (reported_len < captured_len) captured_len = reported_len;
Rename tvb_new_subset() to tvb_new_subset_length_caplen(). This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:18:49 +00:00
payload_tvb = tvb_new_subset_length_caplen(tvb, offset, captured_len, reported_len);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ieee802154: avoid extra dissection on Payload IEs & Cmd ID Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 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-10-28 19:07:48 +00:00
offset = 0;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/* Presence of Payload IEs is defined by the termination of the Header IEs */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (packet->payload_ie_present) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
offset += dissect_ieee802154_payload_ie(payload_tvb, pinfo, ieee802154_tree, offset, packet);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
if ((packet->version == IEEE802154_VERSION_2015) && (packet->frame_type == IEEE802154_FCF_CMD)) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* In 802.15.4e and later the Command Id follows the Payload IEs. */
ieee802154: avoid extra dissection on Payload IEs & Cmd ID Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 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-10-28 19:07:48 +00:00
packet->command_id = tvb_get_guint8(payload_tvb, offset);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (tree) {
ieee802154: avoid extra dissection on Payload IEs & Cmd ID Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 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-10-28 19:07:48 +00:00
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_cmd_id, payload_tvb, offset, 1, packet->command_id);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
offset++;
/* Display the command identifier in the info column. */
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
if ((packet->version == IEEE802154_VERSION_2015) && (packet->command_id == IEEE802154_CMD_BEACON_REQ)) {
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "Enhanced Beacon Request");
}
else {
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
ieee802154: avoid extra dissection on Payload IEs & Cmd ID Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 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-10-28 19:07:48 +00:00
if (offset > 0) {
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
payload_tvb = tvb_new_subset_remaining(payload_tvb, offset);
offset = 0;
ieee802154: avoid extra dissection on Payload IEs & Cmd ID Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 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-10-28 19:07:48 +00:00
}
ZigBee MAC parse: fix Association request parse in case of FCS absence. If it is ok to parse packets with bas FSC, FCS may be even absent. Parse MAC command even if remaining buffer length is less that FCS size in such case. Change-Id: Ibbc9fed7ab87d0511f8c97db8e0e3bdf562cd15c Reviewed-on: https://code.wireshark.org/review/16412 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>
2016-07-13 09:40:54 +00:00
/* If it is ok to dissect bad FCS, FCS might be absent, so still dissect
* commands like Association request. */
if ((!ieee802154_fcs_ok
/* If either ZBOSS traffic dump or TI CC2{45}xx, FCS must be present. */
&& !(options & (DISSECT_IEEE802154_OPTION_ZBOSS | DISSECT_IEEE802154_OPTION_CC24xx)))
ieee802154: avoid extra dissection on Payload IEs & Cmd ID Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 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-10-28 19:07:48 +00:00
|| tvb_captured_length(payload_tvb) > 0) {
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
* Wrap the sub-dissection in a try/catch block in case the payload is
* broken. First we store the current protocol so we can fix it if an
* exception is thrown by the subdissectors.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*/
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
saved_proto = pinfo->current_proto;
/* Try to dissect the payload. */
TRY {
switch (packet->frame_type) {
case IEEE802154_FCF_BEACON:
if (!dissector_try_heuristic(ieee802154_beacon_subdissector_list, payload_tvb, pinfo, tree, &hdtbl_entry, packet)) {
/* Could not subdissect, call the data dissector instead. */
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
break;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_FCF_CMD:
dissect_ieee802154_command(payload_tvb, pinfo, ieee802154_tree, packet);
break;
case IEEE802154_FCF_DATA:
/* Sanity-check. */
if ((!fcs_ok && ieee802154_fcs_ok) || !tvb_reported_length(payload_tvb)) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
break;
}
ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee. 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-15 16:45:50 +00:00
if (options & DISSECT_IEEE802154_OPTION_ZBOSS) {
call_dissector_with_data(zigbee_nwk_handle, payload_tvb, pinfo, tree, packet);
break;
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Try the PANID dissector table for stateful dissection. */
if (dissector_try_uint_new(panid_dissector_table, packet->src_pan, payload_tvb, pinfo, tree, TRUE, packet)) {
break;
}
/* Try again with the destination PANID (if different) */
if (((packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) ||
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)) &&
(packet->dst_pan != packet->src_pan) &&
dissector_try_uint_new(panid_dissector_table, packet->src_pan, payload_tvb, pinfo, tree, TRUE, packet)) {
break;
}
/* Try heuristic dissection. */
if (dissector_try_heuristic(ieee802154_heur_subdissector_list, payload_tvb, pinfo, tree, &hdtbl_entry, packet)) break;
/* Fall-through to dump undissectable payloads. */
dissectors: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 Change-Id: Iba6238988ded675cba328ab512232d1919d93b4a Reviewed-on: https://code.wireshark.org/review/20415 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-05 18:38:59 +00:00
/* FALL THROUGH */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
default:
/* Could not subdissect, call the data dissector instead. */
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(payload_tvb, pinfo, tree);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
} /* switch */
}
CATCH_ALL {
/*
* Someone encountered an error while dissecting the payload. But
* we haven't yet finished processing all of our layer. Catch and
* display the exception, then fall-through to finish displaying
* the FCS (which we display last so the frame is ordered correctly
* in the tree).
*/
show_exception(payload_tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE);
pinfo->current_proto = saved_proto;
}
ENDTRY;
}
/*
* Frame Check Sequence (FCS)
*
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*/
dissect_ieee802154_fcs:
/* The FCS should be the last bytes of the reported packet. */
offset = tvb_reported_length(tvb)-IEEE802154_FCS_LEN;
/* Dissect the FCS only if it exists (captures which don't or can't get the
* FCS will simply truncate the packet to omit it, but should still set the
* reported length to cover the original packet length), so if the snapshot
* is too short for an FCS don't make a fuss.
*/
if (tvb_bytes_exist(tvb, offset, IEEE802154_FCS_LEN) && (tree)) {
proto_tree *field_tree;
guint16 fcs = tvb_get_letohs(tvb, offset);
/* Display the FCS depending on expected FCS format */
if ((options & DISSECT_IEEE802154_OPTION_CC24xx)) {
/* Create a subtree for the FCS. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree_format(ieee802154_tree, tvb, offset, 2, ett_ieee802154_fcs, NULL,
"Frame Check Sequence (TI CC24xx format): FCS %s", (fcs_ok) ? "OK" : "Bad");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Display FCS contents. */
Remove proto_item_append_text calls in favor of BASE_UNIT_STRING. Many proto_item_append_text calls were just adding a unit string to a field. There's a better way to do that now. Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78 Reviewed-on: https://code.wireshark.org/review/19289 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-15 18:01:27 +00:00
proto_tree_add_int(field_tree, hf_ieee802154_rssi, tvb, offset++, 1, (gint8) (fcs & IEEE802154_CC24xx_RSSI));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
proto_tree_add_boolean(field_tree, hf_ieee802154_fcs_ok, tvb, offset, 1, (gboolean) (fcs & IEEE802154_CC24xx_CRC_OK));
proto_tree_add_uint(field_tree, hf_ieee802154_correlation, tvb, offset, 1, (guint8) ((fcs & IEEE802154_CC24xx_CORRELATION) >> 8));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
else {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_fcs, tvb, offset, 2, fcs);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (fcs_ok) {
proto_item_append_text(ti, " (Correct)");
}
else {
ieee802154: Add missing parenthesis in incorrect FCS Change-Id: Iea1855c00dbceac340bc0f65f23fdb1cb74250ec Reviewed-on: https://code.wireshark.org/review/20883 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-03 19:38:45 +00:00
proto_item_append_text(ti, " (Incorrect, expected FCS=0x%04x)", ieee802154_crc_tvb(tvb, offset));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
/* To Help with filtering, add the fcs_ok field to the tree. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_boolean(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, offset, 2, fcs_ok);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
PROTO_ITEM_SET_HIDDEN(ti);
}
}
else if (tree) {
/* Even if the FCS isn't present, add the fcs_ok field to the tree to
* help with filter. Be sure not to make it visible though.
*/
If the FCS isn't present, don't indicate "FCS Valid: True". Instead, indicate "FCS Valid: Unknown". Note: Other changes should be made as well regarding the FCS as part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8859. svn path=/trunk/; revision=50546
2013-07-12 22:53:56 +00:00
ti = proto_tree_add_boolean_format_value(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, offset, 2, fcs_ok, "Unknown");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
PROTO_ITEM_SET_HIDDEN(ti);
}
/* If the CRC is invalid, make a note of it in the info column. */
if (!fcs_ok) {
* Prefer col_append_str instead of col_append_fstr for constant strings * Remove check_col guards svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
col_append_str(pinfo->cinfo, COL_INFO, ", Bad FCS");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) proto_item_append_text(proto_root, ", Bad FCS");
/* Flag packet as having a bad crc. */
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_add_info(pinfo, proto_root, &ei_ieee802154_fcs);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
} /* dissect_ieee802154_common */
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/*
* Information Elements Processing (IEs)
*/
/**
* Create a tree for a Payload IE incl. the TLV header and append the IE name to the parent item
*
* @param tvb the tv buffer
* @param tree the tree to append this item to
* @param hf field index
* @param ett tree index
* @param id the IE ID used to append the IE name to the parent item of tree
* @param new_item if != NULL, pointer to store the item created for this Payload IE
* @returns the tree created for the Payload IE
*/
static proto_tree*
create_payload_ie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett, guint16 id, proto_item** new_item)
{
proto_item *subitem;
proto_tree *subtree;
static const int * tlv_fields[] = {
&hf_ieee802154_payload_ie_type,
&hf_ieee802154_payload_ie_id,
&hf_ieee802154_payload_ie_length,
NULL
};
subitem = proto_tree_add_item(tree, hf, tvb, 0, tvb_reported_length(tvb), ENC_NA);
subtree = proto_item_add_subtree(subitem, ett);
proto_tree_add_bitmask_with_flags(subtree, tvb, 0, hf_ieee802154_payload_ie_tlv, ett_ieee802154_payload_ie_tlv,
tlv_fields, ENC_LITTLE_ENDIAN, BMT_NO_FLAGS);
const char *name = try_val_to_str(id, ieee802154_payload_ie_names);
if (name) {
proto_item_append_text(proto_tree_get_parent(tree), ", %s", name);
} else {
proto_item_append_text(proto_tree_get_parent(tree), ", Unknown IE 0x%02x", id);
proto_item_append_text(subitem, ": 0x%02x", id);
}
if (new_item) {
*new_item = subitem;
}
return subtree;
}
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the MLME Channel Hopping Payload IE
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
*
* Reference: IEEE 802.15.4-2015 - 7.4.4.31 Channel hopping IE
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param tree pointer to data tree wireshark uses to display packet.
* @param psie_remaining size of the Information Element.
* @param offset offset into the tvbuff to begin dissection.
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
*/
static void
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
dissect_802154_channel_hopping(tvbuff_t *tvb, proto_tree *tree, guint16 psie_remaining, guint *offset)
{
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_item *tsch_channel_hopping_data_item = NULL;
proto_tree *tsch_channel_hopping_data_tree = NULL;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static const int * fields_long[] = {
&hf_ieee802154_psie_type_long,
&hf_ieee802154_psie_id_long,
&hf_ieee802154_psie_length_long,
NULL
};
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
tsch_channel_hopping_data_item = proto_tree_add_item(tree, hf_ieee802154_tsch_channel_hopping, tvb, (*offset), 2 + psie_remaining, ENC_NA);
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
tsch_channel_hopping_data_tree = proto_item_add_subtree(tsch_channel_hopping_data_item, ett_ieee802154_mlme_payload);
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_tree_add_bitmask(tsch_channel_hopping_data_tree, tvb, *offset, hf_ieee802154_psie_long, ett_ieee802154_psie_long_bitmap, fields_long, ENC_LITTLE_ENDIAN);
*offset += 2;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(tsch_channel_hopping_data_tree, hf_ieee802154_tsch_hopping_sequence_id, tvb, (*offset), 1, ENC_LITTLE_ENDIAN);
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
if (psie_remaining > 1) {
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(tsch_channel_hopping_data_tree, hf_ieee802154_mlme_ie_data, tvb, *offset, psie_remaining, ENC_NA);
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
}
*offset += psie_remaining;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
} /* dissect_802154_channel_hopping */
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the Payload Information Element MLME TSCH Synchronization
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param tree pointer to data tree wireshark uses to display packet.
* @param offset offset into the tvbuff to begin dissection.
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
*/
static void
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
dissect_802154_tsch_time_sync(tvbuff_t *tvb, proto_tree *tree, int *offset, guint psie_remaining)
{
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_item *tsch_sync_data_item = NULL;
proto_tree *tsch_sync_data_tree = NULL;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
tsch_sync_data_item = proto_tree_add_item(tree, hf_ieee802154_tsch_sync, tvb, *offset, 2 + psie_remaining, ENC_NA);
tsch_sync_data_tree = proto_item_add_subtree(tsch_sync_data_item, ett_ieee802154_tsch_synch);
proto_tree_add_bitmask(tsch_sync_data_tree, tvb, *offset, hf_ieee802154_psie_short, ett_ieee802154_psie_short_bitmap, header_short_format_nested_ie, ENC_LITTLE_ENDIAN);
*offset += 2;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(tsch_sync_data_tree, hf_ieee802154_tsch_asn, tvb, (*offset), 5, ENC_LITTLE_ENDIAN);
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
*offset += 5;
proto_tree_add_item(tsch_sync_data_tree, hf_ieee802154_tsch_join_metric, tvb, (*offset), 1, ENC_LITTLE_ENDIAN);
*offset += 1;
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
}/* dissect_802154_tsch_time_sync*/
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the Payload Information Element MLME TSCH Slotframe and Link
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param tree pointer to data tree wireshark uses to display packet.
* @param psie_remaining size of the Information Element.
* @param offset offset into the tvbuff to begin dissection.
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
*/
static void
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
dissect_802154_tsch_slotframe_link(tvbuff_t *tvb, proto_tree *tree, guint16 psie_remaining, guint16 psie_id,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
guint *offset)
{
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
guint8 nb_slotframes;
guint8 nb_slotframes_aux;
guint8 nb_links;
guint8 nb_links_aux;
ieee802154: handle multiple slotframe descriptors properly Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 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-10-28 19:47:38 +00:00
guint8 slotframe_index;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_item *tsch_slotframe_item;
proto_tree *tsch_slotframe_tree;
proto_item *tsch_slotframe_list_item;
proto_tree *tsch_slotframe_list_tree;
proto_item *tsch_slotframe_data_item;
proto_tree *tsch_slotframe_data_tree;
tsch_slotframe_item = proto_tree_add_item(tree, hf_ieee802154_tsch_slotframe, tvb, *offset, 2+ psie_remaining, ENC_NA);
tsch_slotframe_tree = proto_item_add_subtree(tsch_slotframe_item, ett_ieee802154_psie_slotframe_link_slotframes);
proto_tree_add_bitmask(tsch_slotframe_tree, tvb, *offset, hf_ieee802154_psie_short, ett_ieee802154_psie_short_bitmap, header_short_format_nested_ie, ENC_LITTLE_ENDIAN);
proto_item_set_text(tsch_slotframe_tree, "%s", val_to_str_const(psie_id, ieee802154_psie_names, "Unknown IE"));
*offset += 2;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
nb_slotframes = tvb_get_guint8(tvb, *offset);
nb_slotframes_aux = nb_slotframes;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_tree_add_item(tsch_slotframe_tree, hf_ieee802154_tsch_slotf_link_nb_slotf, tvb, (*offset), 1, ENC_LITTLE_ENDIAN);
ieee802154: handle multiple slotframe descriptors properly Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 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-10-28 19:47:38 +00:00
*offset += 1;
slotframe_index = 1;
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
while (nb_slotframes_aux > 0) {
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
nb_links = tvb_get_guint8(tvb, *offset + 3);
nb_links_aux = nb_links;
tsch_slotframe_list_item = proto_tree_add_none_format(tsch_slotframe_tree, hf_ieee802154_tsch_slotframe_list, tvb, *offset, 4 + 5 * nb_links_aux, "Slotframes [%u]", slotframe_index);
tsch_slotframe_list_tree = proto_item_add_subtree(tsch_slotframe_list_item, ett_ieee802154_psie_slotframe_link_slotframes);
ieee802154: handle multiple slotframe descriptors properly Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 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-10-28 19:47:38 +00:00
slotframe_index += 1;
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_tree_add_item(tsch_slotframe_list_tree, hf_ieee802154_tsch_slotf_link_slotf_handle, tvb, (*offset), 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tsch_slotframe_list_tree, hf_ieee802154_tsch_slotf_size, tvb, (*offset) + 1, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tsch_slotframe_list_tree, hf_ieee802154_tsch_slotf_link_nb_links, tvb, (*offset) + 3, 1, ENC_LITTLE_ENDIAN);
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
nb_slotframes_aux -= 1;
ieee802154: handle multiple slotframe descriptors properly Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 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-10-28 19:47:38 +00:00
*offset += 4;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
while (nb_links_aux > 0) {
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
tsch_slotframe_data_item = proto_tree_add_item(tsch_slotframe_list_tree, hf_ieee802154_tsch_link_info, tvb, *offset, 5, ENC_NA);
tsch_slotframe_data_tree = proto_item_add_subtree(tsch_slotframe_data_item, ett_ieee802154_mlme_payload_data);
proto_tree_add_item(tsch_slotframe_data_tree, hf_ieee802154_tsch_slotf_link_timeslot, tvb, (*offset), 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tsch_slotframe_data_tree, hf_ieee802154_tsch_slotf_link_channel_offset, tvb, (*offset) + 2, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tsch_slotframe_data_tree, hf_ieee802154_tsch_slotf_link_options, tvb, (*offset) + 4, 1, ENC_LITTLE_ENDIAN);
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
nb_links_aux -= 1;
*offset += 5;
}
}
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
}/* dissect_802154_tsch_slotframe_link */
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the 6TOP Protocol contained within the Payload Information Elements.
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
*/
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int
dissect_ietf_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_)
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
{
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
const guint8 supported_6p_version = 0x00;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_tree *p_inf_elem_tree = create_payload_ie_tree(tvb, ies_tree, hf_ieee802154_pie_ietf, ett_ieee802154_pie_ietf,
IEEE802154_PAYLOAD_IE_IETF, NULL);
guint offset = 2;
guint pie_length = tvb_reported_length(tvb) - 2;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
guint8 subie;
guint8 version;
guint8 type;
guint8 code;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
guint8 num_cells;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
gboolean have_cell_list = FALSE;
int i;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
proto_item *sixtop_item = NULL;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
proto_tree *sixtop_tree = NULL;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
proto_item *cell_list_item = NULL;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
proto_tree *cell_list_tree = NULL;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
proto_item *cell_item = NULL;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
proto_tree *cell_tree = NULL;
proto_item *type_item = NULL;
proto_item *code_item = NULL;
const gchar *code_str = NULL;
static const int * cell_options[] = {
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
&hf_ieee802154_6top_cell_option_tx,
&hf_ieee802154_6top_cell_option_rx,
&hf_ieee802154_6top_cell_option_shared,
&hf_ieee802154_6top_cell_option_reserved,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL
};
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
if (pie_length < 5) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
return pie_length + 2;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
}
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
subie = tvb_get_guint8(tvb, offset);
version = tvb_get_guint8(tvb, offset + 1) & IETF_6TOP_VERSION;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
if (subie != IEEE802154_IETF_SUBIE_6TOP || version != supported_6p_version) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
return pie_length + 2;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
}
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
type = (tvb_get_guint8(tvb, offset + 1) & IETF_6TOP_TYPE) >> 4;
code = tvb_get_guint8(tvb, offset + 2);
proto_tree_add_item(p_inf_elem_tree, hf_ieee802154_p_ie_ietf_sub_id, tvb, offset, 1, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
sixtop_item = proto_tree_add_item(p_inf_elem_tree, hf_ieee802154_6top, tvb, offset, pie_length, ENC_NA);
sixtop_tree = proto_item_add_subtree(sixtop_item, ett_ieee802154_p_ie_6top);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_version, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN);
type_item = proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_type, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_flags_reserved, tvb, offset + 1, 1, ENC_LITTLE_ENDIAN);
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
code_item = proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_code, tvb, offset + 2, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_sfid, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_seqnum, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_gen, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "6top");
if (type == IETF_6TOP_TYPE_REQUEST) {
code_str = val_to_str_const(code, ietf_6top_command_identifiers,"Unknown");
col_add_fstr(pinfo->cinfo, COL_INFO, "6P %s Request", code_str);
} else {
code_str = val_to_str_const(code, ietf_6top_return_codes,"Unknown");
col_add_fstr(pinfo->cinfo, COL_INFO, "6P %s (%s)",
val_to_str_const(type, ietf_6top_types,"Unknown"), code_str);
}
proto_item_append_text(code_item, " (%s)", code_str);
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
offset += 5;
pie_length -= 5;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
if (type == IETF_6TOP_TYPE_REQUEST) {
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
switch (code) {
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
case IETF_6TOP_CMD_ADD:
case IETF_6TOP_CMD_DELETE:
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
case IETF_6TOP_CMD_RELOCATE:
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
if (pie_length < 4) {
break;
}
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_metadata, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_bitmask(sixtop_tree, tvb, offset + 2, hf_ieee802154_6top_cell_options, ett_ieee802154_p_ie_6top_cell_options, cell_options, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_num_cells, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
num_cells = tvb_get_guint8(tvb, offset + 3);
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
pie_length -= 4;
offset += 4;
if (pie_length > 0 && (pie_length % 4) == 0) {
have_cell_list = TRUE;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
}
break;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
case IETF_6TOP_CMD_COUNT:
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
if (pie_length < 3) {
break;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
}
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_metadata, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_bitmask(sixtop_tree, tvb, offset + 2, hf_ieee802154_6top_cell_options, ett_ieee802154_p_ie_6top_cell_options, cell_options, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
pie_length -= 3;
offset += 3;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
break;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
case IETF_6TOP_CMD_LIST:
if (pie_length != 8) {
break;
}
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_metadata, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_bitmask(sixtop_tree, tvb, offset + 2, hf_ieee802154_6top_cell_options, ett_ieee802154_p_ie_6top_cell_options, cell_options, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_reserved, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_offset, tvb, offset + 4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_max_num_cells, tvb, offset + 6, 2, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
pie_length -= 8;
offset += 8;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
break;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
case IETF_6TOP_CMD_CLEAR:
if (pie_length < 2) {
break;
}
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_metadata, tvb, offset, 2, ENC_LITTLE_ENDIAN);
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
pie_length -= 2;
offset += 2;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
break;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
default:
/* unsupported command */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
expert_add_info(pinfo, code_item, &ei_ieee802154_6top_unsupported_command);
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
break;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
}
} else if (type == IETF_6TOP_TYPE_RESPONSE || type == IETF_6TOP_TYPE_CONFIRMATION) {
switch(code) {
case IETF_6TOP_RC_SUCCESS:
if (pie_length > 0) {
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
if (pie_length == 2) {
proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_total_num_cells, tvb, offset, 2, ENC_LITTLE_ENDIAN);
pie_length -= 2;
offset += 2;
} else if (pie_length > 0 && (pie_length % 4) == 0) {
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
have_cell_list = TRUE;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
}
}
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
break;
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
case IETF_6TOP_RC_EOL:
if(pie_length > 0 && (pie_length % 4) == 0) {
have_cell_list = TRUE;
}
break;
case IETF_6TOP_RC_ERROR:
case IETF_6TOP_RC_RESET:
case IETF_6TOP_RC_VER_ERR:
case IETF_6TOP_RC_SFID_ERR:
case IETF_6TOP_RC_GEN_ERR:
case IETF_6TOP_RC_BUSY:
case IETF_6TOP_RC_NORES:
case IETF_6TOP_RC_CELLLIST_ERR:
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
/* They have no other field */
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
break;
default:
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
/* unsupported return code */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
expert_add_info(pinfo, code_item, &ei_ieee802154_6top_unsupported_return_code);
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
break;
}
} else {
/* unsupported type */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
expert_add_info(pinfo, type_item, &ei_ieee802154_6top_unsupported_type);
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
}
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
if (have_cell_list) {
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
if (type == IETF_6TOP_TYPE_REQUEST && code == IETF_6TOP_CMD_RELOCATE) {
cell_list_item = proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_rel_cell_list, tvb, offset, pie_length, ENC_NA);
cell_list_tree = proto_item_add_subtree(cell_list_item, ett_ieee802154_p_ie_6top_rel_cell_list);
/* num_cells is expected to be set properly */
for (i = 0; i < num_cells; offset += 4, i++) {
cell_item = proto_tree_add_item(cell_list_tree, hf_ieee802154_6top_cell, tvb, offset, 4, ENC_NA);
cell_tree = proto_item_add_subtree(cell_item, ett_ieee802154_p_ie_6top_cell);
proto_tree_add_item(cell_tree, hf_ieee802154_6top_slot_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cell_tree, hf_ieee802154_6top_channel_offset, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN);
}
pie_length -= num_cells * 4;
cell_list_item = proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_cand_cell_list, tvb, offset, pie_length, ENC_NA);
cell_list_tree = proto_item_add_subtree(cell_list_item, ett_ieee802154_p_ie_6top_cand_cell_list);
for (i = 0; pie_length > 0; pie_length -= 4, offset += 4, i++) {
cell_item = proto_tree_add_item(cell_list_tree, hf_ieee802154_6top_cell, tvb, offset, 4, ENC_NA);
cell_tree = proto_item_add_subtree(cell_item, ett_ieee802154_p_ie_6top_cell);
proto_tree_add_item(cell_tree, hf_ieee802154_6top_slot_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cell_tree, hf_ieee802154_6top_channel_offset, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN);
}
} else {
cell_list_item = proto_tree_add_item(sixtop_tree, hf_ieee802154_6top_cell_list, tvb, offset, pie_length, ENC_NA);
cell_list_tree = proto_item_add_subtree(cell_list_item, ett_ieee802154_p_ie_6top_cell_list);
for (i = 0; pie_length > 0; pie_length -= 4, offset += 4, i++) {
cell_item = proto_tree_add_item(cell_list_tree, hf_ieee802154_6top_cell, tvb, offset, 4, ENC_NA);
cell_tree = proto_item_add_subtree(cell_item, ett_ieee802154_p_ie_6top_cell);
proto_tree_add_item(cell_tree, hf_ieee802154_6top_slot_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cell_tree, hf_ieee802154_6top_channel_offset, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN);
}
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
}
}
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
return offset;
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
} /* dissect_ieee802154_6top */
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the Superframe specification sub-field within the beacon frame.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields (unused).
* @param tree pointer to command subtree.
* @param offset offset into the tvbuff to begin dissection.
*/
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
void
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
dissect_ieee802154_superframe(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
Use proto_tree_add_bitmask for groups of proto_tree_add_boolean. Part 2 of many Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec Reviewed-on: https://code.wireshark.org/review/5542 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-30 17:51:30 +00:00
static const int * superframe[] = {
&hf_ieee802154_beacon_order,
&hf_ieee802154_superframe_order,
&hf_ieee802154_cap,
&hf_ieee802154_superframe_battery_ext,
&hf_ieee802154_superframe_coord,
&hf_ieee802154_assoc_permit,
NULL
};
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
proto_tree_add_bitmask_text(tree, tvb, *offset, 2, "Superframe Specification: ", NULL , ett_ieee802154_superframe, superframe, ENC_LITTLE_ENDIAN, BMT_NO_INT|BMT_NO_TFS);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 2;
} /* dissect_ieee802154_superframe */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the GTS information fields within the beacon frame.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields (unused).
* @param tree pointer to command subtree.
* @param offset offset into the tvbuff to begin dissection.
*/
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
void
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
dissect_ieee802154_gtsinfo(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_tree *field_tree = NULL;
proto_tree *subtree = NULL;
proto_item *ti;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
guint8 gts_spec;
guint8 gts_count;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the GTS specification field */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
gts_spec = tvb_get_guint8(tvb, *offset);
gts_count = gts_spec & IEEE802154_GTS_COUNT_MASK;
if (tree) {
/* Add Subtree for GTS information. */
if (gts_count) {
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree(tree, tvb, *offset, 2 + (gts_count * 3), ett_ieee802154_gts, NULL, "GTS");
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
else {
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree(tree, tvb, *offset, 1, ett_ieee802154_gts, NULL, "GTS");
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
proto_tree_add_uint(field_tree, hf_ieee802154_gts_count, tvb, *offset, 1, gts_count);
proto_tree_add_boolean(field_tree, hf_ieee802154_gts_permit, tvb, *offset, 1, gts_spec & IEEE802154_GTS_PERMIT_MASK);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* If the GTS descriptor count is nonzero, then the GTS directions mask and descriptor list are present. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
if (gts_count) {
guint8 gts_directions = tvb_get_guint8(tvb, *offset);
guint gts_rx = 0;
int i;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Display the directions mask. */
if (tree) {
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *dir_tree;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Create a subtree. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
dir_tree = proto_tree_add_subtree(field_tree, tvb, *offset, 1, ett_ieee802154_gts_direction, &ti, "GTS Directions");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Add the directions to the subtree. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
for (i=0; i<gts_count; i++) {
gboolean dir = gts_directions & IEEE802154_GTS_DIRECTION_SLOT(i);
proto_tree_add_boolean_format(dir_tree, hf_ieee802154_gts_direction, tvb, *offset, 1, dir, "GTS Slot %i: %s", i+1, dir?"Receive Only":"Transmit Only");
if (dir) gts_rx++;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* for */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
proto_item_append_text(ti, ": %i Receive & %i Transmit", gts_rx, gts_count - gts_rx);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Create a subtree for the GTS descriptors. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(field_tree, tvb, *offset, gts_count * 3, ett_ieee802154_gts_descriptors, NULL, "GTS Descriptors");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the GTS descriptors. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
for (i=0; i<gts_count; i++) {
guint16 gts_addr = tvb_get_letohs(tvb, (*offset));
guint8 gts_slot = tvb_get_guint8(tvb, (*offset)+2);
guint8 gts_length = (gts_slot & IEEE802154_GTS_LENGTH_MASK) >> IEEE802154_GTS_LENGTH_SHIFT;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Selvamegala: GTS starting slot in the Beacon frame is not parsed correctly. As per the Spec, in the 3byte gts descriptor value bit 0- 15 refers Device Short address bit 16-19 – Starting slot bit 20-23 – GTS length. (I Dug out the onliner from the attached file) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8946 svn path=/trunk/; revision=51919
2013-09-10 06:32:41 +00:00
gts_slot = (gts_slot & IEEE802154_GTS_SLOT_MASK);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) {
/* Add address, slot, and time length fields. */
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
ti = proto_tree_add_uint(subtree, hf_ieee802154_gts_address, tvb, (*offset), 3, gts_addr);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
proto_item_append_text(ti, ", Slot: %i", gts_slot);
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
proto_item_append_text(ti, ", Length: %i", gts_length);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 3;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* for */
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* dissect_ieee802154_gtsinfo */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for the pending address list fields within the beacon frame.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields (unused).
* @param tree pointer to command subtree.
* @param offset into the tvbuff to begin dissection.
*/
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
void
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
dissect_ieee802154_pendaddr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
guint8 pend_spec;
guint8 pend_num16;
guint8 pend_num64;
int i;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Get the Pending Addresses specification fields */
pend_spec = tvb_get_guint8(tvb, *offset);
pend_num16 = pend_spec & IEEE802154_PENDADDR_SHORT_MASK;
pend_num64 = (pend_spec & IEEE802154_PENDADDR_LONG_MASK) >> IEEE802154_PENDADDR_LONG_SHIFT;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
/* Add Subtree for the addresses */
subtree = proto_tree_add_subtree_format(tree, tvb, *offset, 1 + 2*pend_num16 + 8*pend_num64,
ett_ieee802154_pendaddr, NULL, "Pending Addresses: %i Short and %i Long", pend_num16, pend_num64);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 1;
for (i=0; i<pend_num16; i++) {
guint16 addr = tvb_get_letohs(tvb, *offset);
proto_tree_add_uint(subtree, hf_ieee802154_pending16, tvb, *offset, 2, addr);
(*offset) += 2;
} /* for */
for (i=0; i<pend_num64; i++) {
Add FT_EUI64 Field Type * 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-05-08 10:23:53 +00:00
proto_tree_add_item(subtree, hf_ieee802154_pending64, tvb, *offset, 8, ENC_LITTLE_ENDIAN);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 8;
} /* for */
} /* dissect_ieee802154_pendaddr */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
/*
* Header IEs
*/
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* Create a tree for a Header IE incl. the TLV header and append the IE name to the parent item
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
* @param tvb the tv buffer
* @param tree the tree to append this item to
* @param hf field index
* @param ett tree index
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* @param id the IE ID used to append the IE name to the parent item of tree
* @param new_item if != NULL, pointer to store the item created for this Header IE
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
* @returns the tree created for the Header IE
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
*/
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static proto_tree*
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
create_header_ie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett, guint16 id, proto_item** new_item)
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
proto_item *subitem;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
proto_tree *subtree;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
static const int * tlv_fields[] = {
&hf_ieee802154_header_ie_type,
&hf_ieee802154_header_ie_id,
&hf_ieee802154_header_ie_length,
NULL
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
};
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
subitem = proto_tree_add_item(tree, hf, tvb, 0, tvb_reported_length(tvb), ENC_NA);
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
subtree = proto_item_add_subtree(subitem, ett);
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_tree_add_bitmask_with_flags(subtree, tvb, 0, hf_ieee802154_header_ie_tlv, ett_ieee802154_header_ie_tlv,
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
tlv_fields, ENC_LITTLE_ENDIAN, BMT_NO_FLAGS);
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
const char *name = try_val_to_str(id, ieee802154_header_ie_names);
if (name) {
proto_item_append_text(proto_tree_get_parent(tree), ", %s", name);
} else {
proto_item_append_text(proto_tree_get_parent(tree), ", Unknown IE 0x%02x", id);
proto_item_append_text(subitem, ": 0x%02x", id);
}
if (new_item) {
*new_item = subitem;
}
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
return subtree;
}
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/*
* The dissectors for the individual Header IEs
* They are called via call_dissector with the tvb including the IE header and data as ieee802154_packet
*/
/**
* Dissect the CSL IE (7.4.2.3)
*/
static int
dissect_hie_csl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
{
proto_tree *subtree = create_header_ie_tree(tvb, tree, hf_ieee802154_hie_csl, ett_ieee802154_hie_csl, IEEE802154_HEADER_IE_CSL, NULL);
proto_tree_add_item(subtree, hf_ieee802154_hie_csl_phase, tvb, 2, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(subtree, hf_ieee802154_hie_csl_period, tvb, 4, 2, ENC_LITTLE_ENDIAN);
if (tvb_reported_length(tvb) >= 8) {
proto_tree_add_item(subtree, hf_ieee802154_hie_csl_rendezvous_time, tvb, 6, 2, ENC_LITTLE_ENDIAN);
return 2 + 6;
}
return 2 + 4;
}
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
/**
* Dissect the Time Correction Header IE (7.4.2.7)
*
* This field is constructed by taking a signed 16-bit 2's compliment time
* correction in the range of -2048 us to 2047 us, AND'ing it with 0xfff, and
* OR'ing again with 0x8000 to indicate a negative acknowledgment.
*/
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int
dissect_hie_time_correction(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_)
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{
static const int * fields[] = {
&hf_ieee802154_hie_time_correction_value,
&hf_ieee802154_nack,
NULL
};
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_item *subitem;
proto_tree *tree = create_header_ie_tree(tvb, ies_tree, hf_ieee802154_hie_time_correction, ett_ieee802154_hie_time_correction,
IEEE802154_HEADER_IE_TIME_CORR, &subitem);
guint16 time_sync_value = tvb_get_letohs(tvb, 2);
proto_tree_add_bitmask_with_flags(tree, tvb, 2, hf_ieee802154_hie_time_correction_time_sync_info, ett_ieee802154_header_ie,
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
fields, ENC_LITTLE_ENDIAN, BMT_NO_FLAGS);
if (time_sync_value & ~(0x8fff)) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
expert_add_info(pinfo, subitem, &ei_ieee802154_time_correction_error);
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
}
if (time_sync_value & 0x8000) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_item_append_text(proto_tree_get_parent(ies_tree), ": NACK");
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
return 2 + 2;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
}
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
/**
* Subdissector for Header IEs (Information Elements)
*
* Since the header is never encrypted and the payload may be encrypted,
* we dissect header and payload IEs separately.
* The termination of the Header IE tells us whether there are any
* payload IEs to follow.
*
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* @param tvb the tv buffer
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
* @param pinfo pointer to packet information fields.
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* @param tree the tree to append this item to
* @param orig_offset offset into the tvbuff to begin dissection.
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
* @param packet IEEE 802.15.4 packet information.
*/
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int
dissect_ieee802154_header_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint orig_offset, ieee802154_packet *packet)
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
// GCC emits a spurious -Wclobbered if offset is used as function parameter (even with volatile)
volatile guint offset = orig_offset;
proto_item *ies_item = proto_tree_add_item(tree, hf_ieee802154_header_ies, tvb, offset, -1, ENC_NA);
proto_tree *ies_tree = proto_item_add_subtree(ies_item, ett_ieee802154_header_ie);
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
do {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
volatile int consumed = 0;
guint16 ie_header = tvb_get_letohs(tvb, offset);
guint16 id = (guint16) ((ie_header & IEEE802154_HEADER_IE_ID_MASK) >> 7);
guint16 length = (guint16) (ie_header & IEEE802154_HEADER_IE_LENGTH_MASK);
tvbuff_t *ie_tvb = tvb_new_subset_length(tvb, offset, 2 + length);
if (id == IEEE802154_HEADER_IE_HT1 || id == IEEE802154_HEADER_IE_HT2) {
create_header_ie_tree(ie_tvb, ies_tree, id == IEEE802154_HEADER_IE_HT1 ? hf_ieee802154_hie_ht1 : hf_ieee802154_hie_ht2,
ett_ieee802154_hie_ht, id, NULL);
consumed = 2;
} else {
TRY {
consumed = dissector_try_uint_new(header_ie_dissector_table, id, ie_tvb, pinfo, ies_tree, FALSE, packet);
if (consumed == 0) {
proto_item *subitem;
proto_tree *subtree = create_header_ie_tree(ie_tvb, ies_tree, hf_ieee802154_hie_unsupported,
ett_ieee802154_hie_unsupported, id, &subitem);
proto_tree_add_item(subtree, hf_ieee802154_ie_unknown_content, ie_tvb, 2, length, ENC_NA);
consumed = 2 + length;
expert_add_info(pinfo, subitem, &ei_ieee802154_ie_unsupported_id);
}
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
CATCH_ALL {
show_exception(tvb, pinfo, ies_tree, EXCEPT_CODE, GET_MESSAGE);
consumed = 2 + length;
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
ENDTRY;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
if (consumed < 2 + length) {
proto_tree_add_item(ies_tree, hf_ieee802154_ie_unknown_content, ie_tvb, consumed, 2 + length - consumed, ENC_NA);
expert_add_info(pinfo, ies_item, &ei_ieee802154_ie_unknown_extra_content);
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
offset += 2 + length;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
if (id == IEEE802154_HEADER_IE_HT1 || id == IEEE802154_HEADER_IE_HT2) {
packet->payload_ie_present = id == IEEE802154_HEADER_IE_HT1;
break;
}
} while ((tvb_reported_length_remaining(tvb, offset) > IEEE802154_MIC_LENGTH(packet->security_level) + IEEE802154_FCS_LEN + 1));
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_item_set_len(ies_item, offset - orig_offset);
return offset - orig_offset;
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for MAC Layer Management Entitiy (MLME) Payload Sub IEs
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
*
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
* Reference: IEEE 802.15.4-2015: 7.4.3.2 MLME IE
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields (unused).
* @param tree pointer to command subtree.
* @param offset offset into the tvbuff to begin dissection.
*/
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
static int
dissect_ieee802154_payload_mlme_sub_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset)
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{
guint16 psie_ie;
guint16 psie_id;
guint psie_remaining = 0;
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
int orig_offset = offset;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
psie_ie = tvb_get_letohs(tvb, offset);
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
if (psie_ie & IEEE802154_PSIE_TYPE_MASK) {
/* long format: Table 7-17-Sub-ID allocation for long format */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
psie_id = (guint16) ((psie_ie & IEEE802154_PSIE_ID_MASK_LONG) >> 11);
psie_remaining = (guint) (psie_ie & IEEE802154_PSIE_LENGTH_MASK_LONG);
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
}
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
else {
/* short format: Table 7-16-Sub-ID allocation for short format */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
psie_id = (guint16) ((psie_ie & IEEE802154_PSIE_ID_MASK_SHORT) >> 8);
psie_remaining = (guint) (psie_ie & IEEE802154_PSIE_LENGTH_MASK_SHORT);
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
}
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
switch (psie_id) {
case IEEE802154_MLME_SUBIE_TSCH_SYNCH:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.2 TSCH Synchronization IE
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
dissect_802154_tsch_time_sync(tvb, tree, &offset, psie_remaining);
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
break;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TSCH_SLOTFR_LINK:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.3 TSCH Slotframe and Link IE
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
dissect_802154_tsch_slotframe_link(tvb, tree, psie_remaining, psie_id, &offset);
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
break;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TSCH_TIMESLOT:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.4 TSCH Timeslot IE
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
dissect_802154_tsch_timeslot(tvb, tree, psie_remaining, psie_id, &offset);
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
break;
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
case IEEE802154_MLME_SUBIE_ENHANCED_BEACON_FILTER:
// 7.4.4.6 Enhanced Beacon Filter IE
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
dissect_802154_enhanced_beacon_filter(tvb, tree, psie_remaining, &offset);
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
break;
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
case IEEE802154_MLME_SUBIE_CHANNEL_HOPPING:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.31 Channel hopping IE
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
dissect_802154_channel_hopping(tvb, tree, psie_remaining, &offset);
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
break;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_HOPPING_TIMING:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.5 Hopping timing IE
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
// TODO
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_MAC_METRICS:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.7 MAC Metrics IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_ALL_MAC_METRICS:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.8 All MAC Metrics IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_COEXISTENCE_SPEC:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.9 Coexistence Specification IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_SUN_DEVICE_CAPABILITIES:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.10 SUN Device Capabilities IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_SUN_FSK_GEN_PHY:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.11 SUN FSK Generic PHY IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_MODE_SWITCH_PARAMETER:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.12 Mode Switch Parameter IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_PHY_PARAMETER_CHANGE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.13 PHY Parameter Change IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_O_QPSK_PHY_MODE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.14 O-QPSK PHY Mode IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_PCA_ALLOCATION:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.15 PCA Allocation IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_DSSS_OPER_MODE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.16 LECIM DSSS Operating Mode IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_FSK_OPER_MODE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.17 LECIM FSK Operating Mode IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_PHY_OPE_MODE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.18 TVWS PHY Operating Mode Description IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_DEVICE_CAPAB:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.19 TVWS Device Capabilities IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_DEVICE_CATEG:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.20 TVWS Device Category IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_DEVICE_IDENTIF:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.21 TVWS Device Identification IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_DEVICE_LOCATION:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.22 TVWS Device Location IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_CH_INFOR_QUERY:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.23 TVWS Channel Information Query IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TVWS_CH_INFOR_SOURCE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.24 TVWS Channel Information Source IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_CTM:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.25 CTM IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TIMESTAMP:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.26 Timestamp IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TIMESTAMP_DIFF:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.27 Timestamp Difference IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_TMCP_SPECIFICATION:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.28 TMCTP Specification IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
case IEEE802154_MLME_SUBIE_RCC_PHY_OPER_MODE:
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
// 7.4.4.29 RCC PHY Operating Mode IE
// TODO
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
default:
IEEE 802.15.4: add a missing offset increment in dissect_ieee802154_payload_mlme_sub_ie() Bug: 13751 Change-Id: I33d9d51ba36ddb2caeee25612b613bc799c76339 Reviewed-on: https://code.wireshark.org/review/21875 Reviewed-by: Rémy Léone <remy.leone@gmail.com> 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>
2017-06-01 14:58:29 +00:00
offset += 2;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
if (psie_remaining) {
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_tree_add_item(tree, hf_ieee802154_mlme_ie_data, tvb, offset, psie_remaining, ENC_NA);
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
expert_add_info(pinfo, tree, &ei_ieee802154_ie_unsupported_id);
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
offset += psie_remaining;
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
}
break;
}
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
return (offset - orig_offset);
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
}
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for MAC Layer Management Entitiy (MLME) Payload Sub IEs
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
*
* Reference: IEEE 802.15.4-2015 - 7.4.4.4 TSCH Timeslot IE
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
*/
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
static void
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
dissect_802154_tsch_timeslot(tvbuff_t *tvb, proto_tree *tree, guint psie_remaining, guint16 psie_id, int *offset)
{
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_tree * timeslot_tree;
proto_item * timeslot_item;
timeslot_item = proto_tree_add_item(tree, hf_ieee802154_timeslot_ie, tvb, *offset, 2 + psie_remaining, ENC_NA);
timeslot_tree = proto_item_add_subtree(timeslot_item, ett_ieee802154_tsch_timeslot);
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
proto_tree_add_bitmask(timeslot_tree, tvb, *offset, hf_ieee802154_payload_ie_tlv, ett_ieee802154_psie_short_bitmap,
header_short_format_nested_ie, ENC_LITTLE_ENDIAN);
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
proto_item_set_text(timeslot_tree, "%s", val_to_str_const(psie_id, ieee802154_psie_names, "Unknown IE"));
*offset += 2;
if (psie_remaining) {
proto_tree_add_item(timeslot_tree, hf_ieee802154_mlme_ie_data, tvb, *offset, psie_remaining, ENC_NA);
*offset += psie_remaining;
}
}
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
static void
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
dissect_802154_enhanced_beacon_filter(tvbuff_t *tvb, proto_tree *tree, guint16 psie_remaining, gint *offset)
{
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
guint8 filter;
guint8 attr_len;
guint32 attr_bitmap = 0;
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
proto_item *item;
proto_tree *subtree;
static const int * fields_eb_filter[] = {
&hf_ieee802154_psie_eb_filter_pjoin,
&hf_ieee802154_psie_eb_filter_lqi,
&hf_ieee802154_psie_eb_filter_percent,
&hf_ieee802154_psie_eb_filter_attr_id,
/* reserved 5-7 */
NULL
};
item = proto_tree_add_item(tree, hf_ieee802154_enhanced_beacon_filter_ie, tvb, *offset, 2 + psie_remaining, ENC_NA);
subtree = proto_item_add_subtree(item, ett_ieee802154_tsch_synch);
proto_tree_add_bitmask(subtree, tvb, *offset, hf_ieee802154_psie_short, ett_ieee802154_psie_short_bitmap, header_short_format_nested_ie, ENC_LITTLE_ENDIAN);
*offset += 2;
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
filter = tvb_get_guint8(tvb, *offset);
proto_tree_add_bitmask(subtree, tvb, (const guint) *offset, hf_ieee802154_psie_eb_filter,
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
ett_ieee802154_psie_enh_beacon_flt_bitmap, fields_eb_filter,
ENC_NA);
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
*offset += 1;
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
if (filter & IEEE802154_MLME_PSIE_EB_FLT_LQI) {
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
proto_tree_add_item(subtree, hf_ieee802154_psie_eb_filter_lqi_min, tvb, *offset, 1, ENC_NA);
*offset += 1;
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
}
if (filter & IEEE802154_MLME_PSIE_EB_FLT_PERCENT) {
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
proto_tree_add_item(subtree, hf_ieee802154_psie_eb_filter_percent_prob, tvb, *offset, 1, ENC_NA);
*offset += 1;
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
}
attr_len = (guint8) ((filter & IEEE802154_MLME_PSIE_EB_FLT_ATTR_LEN) >> 3);
if (attr_len) {
/* just display in hex until we know how to decode */
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
proto_tree_add_item(subtree, hf_ieee802154_psie_eb_filter_attr_id_bitmap, tvb, *offset, attr_len, attr_bitmap);
*offset += attr_len;
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
}
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/**
* Subdissector for MLME IEs
*/
static int
dissect_pie_mlme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_)
{
proto_tree *tree = create_payload_ie_tree(tvb, ies_tree, hf_ieee802154_mlme, ett_ieee802154_mlme,
IEEE802154_PAYLOAD_IE_MLME, NULL);
guint offset = 2;
while (tvb_reported_length_remaining(tvb, offset) > 1) {
offset += dissect_ieee802154_payload_mlme_sub_ie(tvb, pinfo, tree, offset);
}
return offset;
}
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
/**
* Subdissector for MPX IEs (IEEE 802.15.9)
*/
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int
dissect_mpx_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_)
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
{
static const int * fields[] = {
&hf_ieee802159_mpx_transaction_id,
&hf_ieee802159_mpx_transfer_type,
NULL
};
static const int * fields_compressed_multiplex_id[] = {
&hf_ieee802159_mpx_transaction_id_as_multiplex_id,
&hf_ieee802159_mpx_transfer_type,
NULL
};
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_tree *tree = create_payload_ie_tree(tvb, ies_tree, hf_ieee802159_mpx, ett_ieee802159_mpx, IEEE802154_PAYLOAD_IE_MPX, NULL);
guint offset = 2;
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
guint8 transaction_control = tvb_get_guint8(tvb, offset);
guint8 transfer_type = (guint8) (transaction_control & IEEE802159_MPX_TRANSFER_TYPE_MASK);
guint8 transaction_id = (guint8) ((transaction_control & IEEE802159_MPX_TRANSACTION_ID_MASK) >> IEEE802159_MPX_TRANSACTION_ID_SHIFT);
gint32 multiplex_id = -1;
guint8 fragment_number;
if (transfer_type == IEEE802159_MPX_FULL_FRAME_NO_MUXID) {
proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_ieee802159_mpx_transaction_control, ett_ieee802159_mpx_transaction_control,
fields_compressed_multiplex_id, ENC_LITTLE_ENDIAN, BMT_NO_FLAGS);
multiplex_id = transaction_id;
} else {
proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_ieee802159_mpx_transaction_control, ett_ieee802159_mpx_transaction_control,
fields, ENC_LITTLE_ENDIAN, BMT_NO_FLAGS);
}
offset += 1;
switch (transfer_type) { // cf. IEEE 802.15.9 Table 18 - Summary of different MPX IE formats
case IEEE802159_MPX_FULL_FRAME:
proto_tree_add_item(tree, hf_ieee802159_mpx_multiplex_id, tvb, offset, 2, ENC_LITTLE_ENDIAN);
multiplex_id = tvb_get_letohs(tvb, offset);
offset += 2;
break;
case IEEE802159_MPX_FULL_FRAME_NO_MUXID:
break; // nothing to do
case IEEE802159_MPX_NON_LAST_FRAGMENT:
fragment_number = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_ieee802159_mpx_fragment_number, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
if (fragment_number == 0) {
proto_tree_add_item(tree, hf_ieee802159_mpx_total_frame_size, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
multiplex_id = tvb_get_letohs(tvb, offset);
proto_tree_add_item(tree, hf_ieee802159_mpx_multiplex_id, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
}
break;
case IEEE802159_MPX_LAST_FRAGMENT:
proto_tree_add_item(tree, hf_ieee802159_mpx_fragment_number, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
break;
case IEEE802159_MPX_ABORT:
if (tvb_reported_length_remaining(tvb, offset) == 2) {
proto_tree_add_item(tree, hf_ieee802159_mpx_total_frame_size, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
}
return offset;
default: // reserved values -> warning and return
expert_add_info(pinfo, proto_tree_get_parent(tree), &ei_ieee802159_mpx_invalid_transfer_type);
return offset;
}
// TODO: reassembly
dissector_handle_t dissector = NULL;
if (multiplex_id == IEEE802159_MPX_MULTIPLEX_ID_KMP) {
guint8 kmp_id = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_ieee802159_mpx_kmp_id, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
switch (kmp_id) {
case IEEE802159_MPX_KMP_ID_IEEE8021X:
IEEE 802.15.4: MPX dissect IEEE 802.11 4WH/GKH with EAPOL dissector Change-Id: I8972a9a9efef31ab77571f333fb040569fb7de9a Reviewed-on: https://code.wireshark.org/review/22622 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-07-14 13:27:51 +00:00
case IEEE802159_MPX_KMP_ID_IEEE80211_4WH:
case IEEE802159_MPX_KMP_ID_IEEE80211_GKH:
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
dissector = eapol_handle;
break;
// TODO
case IEEE802159_MPX_KMP_ID_HIP:
case IEEE802159_MPX_KMP_ID_IKEV2:
case IEEE802159_MPX_KMP_ID_PANA:
case IEEE802159_MPX_KMP_ID_DRAGONFLY:
case IEEE802159_MPX_KMP_ID_ETSI_TS_102_887_2:
expert_add_info(pinfo, proto_tree_get_parent(tree), &ei_ieee802159_mpx_unsupported_kmp);
break;
case IEEE802159_MPX_KMP_ID_VENDOR_SPECIFIC:
proto_tree_add_item(tree, hf_ieee802159_mpx_kmp_vendor_oui, tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
break;
// Unknown
default:
expert_add_info(pinfo, proto_tree_get_parent(tree), &ei_ieee802159_mpx_unknown_kmp);
}
}
if (transfer_type == IEEE802159_MPX_FULL_FRAME || transfer_type == IEEE802159_MPX_FULL_FRAME_NO_MUXID) {
tvbuff_t * payload = tvb_new_subset_remaining(tvb, offset);
if (multiplex_id > 1500) {
dissector = dissector_get_uint_handle(ethertype_table, (guint)multiplex_id);
}
if (dissector) {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
call_dissector(dissector, payload, pinfo, proto_tree_get_root(tree)); // exceptions are caught in our caller
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
} else {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
call_data_dissector(payload, pinfo, proto_tree_get_root(tree));
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
}
} else {
proto_tree_add_item(tree, hf_ieee802159_mpx_fragment, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
}
offset = tvb_reported_length(tvb);
return offset;
}
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
/**
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* Subdissector for Vendor Specific Payload IEs (Information Elements)
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
*/
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
static int
dissect_pie_vendor(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_)
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
{
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
proto_tree *tree = create_payload_ie_tree(tvb, ies_tree, hf_ieee802154_pie_vendor, ett_ieee802154_pie_vendor,
IEEE802154_PAYLOAD_IE_VENDOR, NULL);
guint offset = 2;
guint pie_length = tvb_reported_length(tvb) - 2;
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
tvbuff_t *next_tvb;
guint32 vendor_oui;
vendor_oui = tvb_get_letoh24(tvb, offset);
proto_item_append_text(tree, ", Vendor OUI: %06X (%s)", vendor_oui,
val_to_str_const(vendor_oui, ieee802154_vendor_oui_names, "unknown"));
proto_tree_add_uint_format_value(tree, hf_ieee802154_payload_ie_vendor_oui, tvb, offset, 3,
vendor_oui, "%06X (%s)", vendor_oui, val_to_str_const(vendor_oui, ieee802154_vendor_oui_names, "unknown"));
offset += 3; /* adjust for vendor OUI */
pie_length -= 3;
next_tvb = tvb_new_subset_length(tvb, offset, pie_length);
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
switch (vendor_oui) {
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
case IEEE802154_VENDOR_OUI_ZIGBEE:
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
call_dissector_with_data(zigbee_ie_handle, next_tvb, pinfo, tree, &pie_length);
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
break;
default:
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
call_data_dissector(next_tvb, pinfo, tree);
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
break;
}
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
return tvb_reported_length(tvb);
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
}
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Subdissector for Payload IEs (Information Elements)
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* @param tvb the tv buffer
* @param pinfo pointer to packet information fields.
* @param tree the tree to append this item to
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
* @param orig_offset offset into the tvbuff to begin dissection.
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
* @param packet IEEE 802.15.4 packet information.
*/
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
static int
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
dissect_ieee802154_payload_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint orig_offset, ieee802154_packet *packet)
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
// GCC emits a spurious -Wclobbered if offset is used as function parameter (even with volatile)
volatile guint offset = orig_offset;
proto_item *ies_item = proto_tree_add_item(tree, hf_ieee802154_payload_ies, tvb, offset, -1, ENC_NA);
proto_tree *ies_tree = proto_item_add_subtree(ies_item, ett_ieee802154_payload_ie);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
do {
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
volatile int consumed = 0;
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
guint16 ie_header = tvb_get_letohs(tvb, offset);
guint16 id = (guint16) ((ie_header & IEEE802154_PAYLOAD_IE_ID_MASK) >> 11);
guint16 length = (guint16) (ie_header & IEEE802154_PAYLOAD_IE_LENGTH_MASK);
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
tvbuff_t *ie_tvb = tvb_new_subset_length(tvb, offset, 2 + length);
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
if (id == IEEE802154_PAYLOAD_IE_TERMINATION) {
create_payload_ie_tree(ie_tvb, ies_tree, hf_ieee802154_pie_termination, ett_ieee802154_pie_termination, id, NULL);
consumed = 2;
} else {
TRY {
consumed = dissector_try_uint_new(payload_ie_dissector_table, id, ie_tvb, pinfo, ies_tree, FALSE, packet);
if (consumed == 0) {
proto_item *subitem;
proto_tree *subtree = create_payload_ie_tree(ie_tvb, ies_tree, hf_ieee802154_pie_unsupported,
ett_ieee802154_pie_unsupported, id, &subitem);
proto_tree_add_item(subtree, hf_ieee802154_ie_unknown_content, ie_tvb, 2, length, ENC_NA);
consumed = 2 + length;
expert_add_info(pinfo, subitem, &ei_ieee802154_ie_unsupported_id);
}
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
CATCH_ALL {
show_exception(tvb, pinfo, ies_tree, EXCEPT_CODE, GET_MESSAGE);
consumed = 2 + length;
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
ENDTRY;
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
}
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
if (consumed < 2 + length) {
proto_tree_add_item(ies_tree, hf_ieee802154_ie_unknown_content, ie_tvb, consumed, 2 + length - consumed, ENC_NA);
expert_add_info(pinfo, ies_item, &ei_ieee802154_ie_unknown_extra_content);
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
}
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
offset += 2 + length;
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
if (id == IEEE802154_PAYLOAD_IE_TERMINATION) {
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
} while (tvb_reported_length_remaining(tvb, offset) > 1);
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
proto_item_set_len(ies_item, offset - orig_offset);
return offset - orig_offset;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
ieee802154: fix parameter '...' not found in the function declaration / '...' command used in a comment that is not attached to a function declaration [-Wdocumentation] Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2 Reviewed-on: https://code.wireshark.org/review/12871 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26 13:57:31 +00:00
static const true_false_string tfs_cinfo_device_type = { "FFD", "RFD" };
static const true_false_string tfs_cinfo_power_src = { "AC/Mains Power", "Battery" };
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Command subdissector routine for the Association request command.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields.
* @param tree pointer to protocol tree.
* @param packet IEEE 802.15.4 packet information.
*/
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_assoc_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
ZigBee MAC and ZDO dissectors: put useful information into column description for Association req and ZDo Node Desc Resp. I added that information to column description because I always need it when analyzing logs. For Association request it is joining device type (FFD or RFD), for Node Descriptor Response this is stack version (r21 or legacy). Change-Id: Ic7ca237b1f4b598f9354b406f105c2befe45140d Reviewed-on: https://code.wireshark.org/review/17534 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-09-06 14:56:15 +00:00
guint8 cap;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * capability[] = {
&hf_ieee802154_cinfo_alt_coord,
&hf_ieee802154_cinfo_device_type,
&hf_ieee802154_cinfo_power_src,
&hf_ieee802154_cinfo_idle_rx,
&hf_ieee802154_cinfo_sec_capable,
&hf_ieee802154_cinfo_alloc_addr,
NULL
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
ZigBee MAC and ZDO dissectors: put useful information into column description for Association req and ZDo Node Desc Resp. I added that information to column description because I always need it when analyzing logs. For Association request it is joining device type (FFD or RFD), for Node Descriptor Response this is stack version (r21 or legacy). Change-Id: Ic7ca237b1f4b598f9354b406f105c2befe45140d Reviewed-on: https://code.wireshark.org/review/17534 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-09-06 14:56:15 +00:00
cap = tvb_get_guint8(tvb, 0);
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", (cap & IEEE802154_CMD_CINFO_DEVICE_TYPE) ? tfs_cinfo_device_type.true_string : tfs_cinfo_device_type.false_string);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Get and display capability info. */
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask_list(subtree, tvb, 0, 1, capability, ENC_NA);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
if (tvb_reported_length(tvb) > 1) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(tvb_new_subset_remaining(tvb, 1), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_assoc_req */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Command subdissector routine for the Association response command.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields.
* @param tree pointer to protocol tree.
* @param packet IEEE 802.15.4 packet information.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_assoc_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_item *ti;
guint16 short_addr;
guint8 status;
guint offset = 0;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, offset, 3, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the short address. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
short_addr = tvb_get_letohs(tvb, offset);
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_assoc_addr, tvb, offset, 2, short_addr);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the status. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
status = tvb_get_guint8(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_uint(subtree, hf_ieee802154_assoc_status, tvb, offset, 1, status);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (status == IEEE802154_CMD_ASRSP_AS_SUCCESS) proto_item_append_text(ti, " (Association Successful)");
else if (status == IEEE802154_CMD_ASRSP_PAN_FULL) proto_item_append_text(ti, " (PAN Full)");
else if (status == IEEE802154_CMD_ASRSP_PAN_DENIED) proto_item_append_text(ti, " (Association Denied)");
else proto_item_append_text(ti, " (Reserved)");
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Update the info column. */
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
if (status == IEEE802154_CMD_ASRSP_AS_SUCCESS) {
/* Association was successful. */
if (packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", PAN: 0x%04x", packet->dst_pan);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
if (short_addr != IEEE802154_NO_ADDR16) {
col_append_fstr(pinfo->cinfo, COL_INFO, " Addr: 0x%04x", short_addr);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
}
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
else {
/* Association was unsuccessful. */
From didier gautheron: remove redundant or use faster col_xxx functions - when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
col_append_str(pinfo->cinfo, COL_INFO, ", Unsuccessful");
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Update the address table. */
if ((status == IEEE802154_CMD_ASRSP_AS_SUCCESS) && (short_addr != IEEE802154_NO_ADDR16)) {
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
ieee802154_addr_update(&ieee802154_map, short_addr, packet->dst_pan, packet->dst64,
Add the packet number to the packet_info structure, and use it. 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-24 03:40:51 +00:00
pinfo->current_proto, pinfo->num);
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
if (tvb_captured_length(tvb) > offset) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_assoc_rsp */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Command subdissector routine for the Disassociate command.
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields.
* @param tree pointer to protocol tree.
* @param packet IEEE 802.15.4 packet information.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_disassoc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_item *ti;
guint8 reason;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Get and display the disassociation reason. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
reason = tvb_get_guint8(tvb, 0);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_uint(subtree, hf_ieee802154_disassoc_reason, tvb, 0, 1, reason);
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
switch (reason) {
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
case 0x01:
proto_item_append_text(ti, " (Coordinator requests device to leave)");
break;
case 0x02:
proto_item_append_text(ti, " (Device wishes to leave)");
break;
default:
proto_item_append_text(ti, " (Reserved)");
break;
} /* switch */
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
if (!pinfo->fd->flags.visited) {
/* Update the address tables */
if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT ) {
Add the packet number to the packet_info structure, and use it. 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-24 03:40:51 +00:00
ieee802154_long_addr_invalidate(packet->dst64, pinfo->num);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT ) {
Add the packet number to the packet_info structure, and use it. 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-24 03:40:51 +00:00
ieee802154_short_addr_invalidate(packet->dst16, packet->dst_pan, pinfo->num);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
if (tvb_captured_length(tvb) > 1) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(tvb_new_subset_remaining(tvb, 1), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_disassoc */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Command subdissector routine for the Coordinator Realignment command.
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields.
* @param tree pointer to protocol tree.
* @param packet IEEE 802.15.4 packet information.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_realign(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d Reviewed-on: https://code.wireshark.org/review/6718 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 16:38:33 +00:00
proto_item *subitem;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
guint16 pan_id;
guint16 coord_addr;
guint8 channel;
guint16 short_addr;
guint offset = 0;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d Reviewed-on: https://code.wireshark.org/review/6718 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 16:38:33 +00:00
subtree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_ieee802154_cmd, &subitem,
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the command PAN ID. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
pan_id = tvb_get_letohs(tvb, offset);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_realign_pan, tvb, offset, 2, pan_id);
col_append_fstr(pinfo->cinfo, COL_INFO, ", PAN: 0x%04x", pan_id);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the coordinator address. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
coord_addr = tvb_get_letohs(tvb, offset);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_realign_caddr, tvb, offset, 2, coord_addr);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Coordinator: 0x%04x", coord_addr);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the channel. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
channel = tvb_get_guint8(tvb, offset);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_realign_channel, tvb, offset, 1, channel);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Channel: %u", channel);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the short address. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
short_addr = tvb_get_letohs(tvb, offset);
Back out 34627 and friends again. svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
if (tree) proto_tree_add_uint(subtree, hf_ieee802154_realign_addr, tvb, offset, 2, short_addr);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
&& (short_addr != IEEE802154_NO_ADDR16)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Addr: 0x%04x", short_addr);
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Update the address table. */
if ((short_addr != IEEE802154_NO_ADDR16) && (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)) {
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
ieee802154_addr_update(&ieee802154_map, short_addr, packet->dst_pan, packet->dst64,
Add the packet number to the packet_info structure, and use it. 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-24 03:40:51 +00:00
pinfo->current_proto, pinfo->num);
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the channel page, if it exists. Added in IEEE802.15.4-2006 */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
if (tvb_bytes_exist(tvb, offset, 1)) {
guint8 channel_page = tvb_get_guint8(tvb, offset);
Back out 34627 and friends again. svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
if (tree) proto_tree_add_uint(subtree, hf_ieee802154_realign_channel_page, tvb, offset, 1, channel_page);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
}
/* Fix the length of the command subtree. */
if (tree) {
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d Reviewed-on: https://code.wireshark.org/review/6718 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 16:38:33 +00:00
proto_item_set_len(subitem, offset);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
if (tvb_captured_length(tvb) > offset) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, tree);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* dissect_ieee802154_realign */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
ieee802154: fix parameter '...' not found in the function declaration / '...' command used in a comment that is not attached to a function declaration [-Wdocumentation] Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2 Reviewed-on: https://code.wireshark.org/review/12871 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26 13:57:31 +00:00
static const true_false_string tfs_gtsreq_dir = { "Receive", "Transmit" };
static const true_false_string tfs_gtsreq_type= { "Allocate GTS", "Deallocate GTS" };
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Command subdissector routine for the GTS request command.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Assumes that COL_INFO will be set to the command name,
* command name will already be appended to the command subtree
* and protocol root. In addition, assumes that the command ID
* has already been parsed.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields (unused).
* @param tree pointer to protocol tree.
* @param packet IEEE 802.15.4 packet information (unused).
*/
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_gtsreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * characteristics[] = {
&hf_ieee802154_gtsreq_len,
&hf_ieee802154_gtsreq_dir,
&hf_ieee802154_gtsreq_type,
NULL
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask_list(subtree, tvb, 0, 1, characteristics, ENC_NA);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
if (tvb_reported_length(tvb) > 1) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(tvb_new_subset_remaining(tvb, 1), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_gtsreq */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Subdissector routine all commands.
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param tvb pointer to buffer containing raw packet.
* @param pinfo pointer to packet information fields (unused).
* @param tree pointer to protocol tree.
* @param packet IEEE 802.15.4 packet information (unused).
*/
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
static void
dissect_ieee802154_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
{
switch (packet->command_id) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_ASSOC_REQ:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE));
dissect_ieee802154_assoc_req(tvb, pinfo, tree, packet);
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_ASSOC_RSP:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT));
dissect_ieee802154_assoc_rsp(tvb, pinfo, tree, packet);
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_DISASSOC_NOTIFY:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT));
dissect_ieee802154_disassoc(tvb, pinfo, tree, packet);
return;
case IEEE802154_CMD_DATA_RQ:
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id, packet->src_addr_mode != IEEE802154_FCF_ADDR_NONE);
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_PANID_CONFLICT:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT));
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_ORPHAN_NOTIFY:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) &&
(packet->dst16 == IEEE802154_BCAST_ADDR) &&
(packet->src_pan == IEEE802154_BCAST_PAN) &&
(packet->dst_pan == IEEE802154_BCAST_PAN));
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_BEACON_REQ:
if ((packet->version == IEEE802154_VERSION_2003) || (packet->version == IEEE802154_VERSION_2006)) {
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) &&
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) &&
(packet->dst16 == IEEE802154_BCAST_ADDR) &&
(packet->dst_pan == IEEE802154_BCAST_PAN));
}
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_COORD_REALIGN:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_pan == IEEE802154_BCAST_PAN) &&
(packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE));
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
/* If directed to a 16-bit address, check that it is being broadcast. */
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id, packet->dst16 == IEEE802154_BCAST_ADDR);
}
dissect_ieee802154_realign(tvb, pinfo, tree, packet);
return;
case IEEE802154_CMD_GTS_REQ:
/* Check that the addressing is correct for this command type. */
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) &&
(packet->src16 != IEEE802154_BCAST_ADDR) &&
(packet->src16 != IEEE802154_NO_ADDR16));
dissect_ieee802154_gtsreq(tvb, pinfo, tree, packet);
return;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_TRLE_MGMT_REQ:
case IEEE802154_CMD_TRLE_MGMT_RSP:
case IEEE802154_CMD_DSME_ASSOC_REQ:
case IEEE802154_CMD_DSME_ASSOC_RSP:
case IEEE802154_CMD_DSME_GTS_REQ:
case IEEE802154_CMD_DSME_GTS_RSP:
case IEEE802154_CMD_DSME_GTS_NOTIFY:
case IEEE802154_CMD_DSME_INFO_REQ:
case IEEE802154_CMD_DSME_INFO_RSP:
case IEEE802154_CMD_DSME_BEACON_ALLOC_NOTIFY:
case IEEE802154_CMD_DSME_BEACON_COLL_NOTIFY:
case IEEE802154_CMD_DSME_LINK_REPORT:
case IEEE802154_CMD_RIT_DATA_REQ:
case IEEE802154_CMD_DBS_REQ:
case IEEE802154_CMD_DBS_RSP:
/* TODO add support for these commands, for now
* if anything remains other than the FCS, dump it */
if (tvb_captured_length_remaining(tvb, 0) > 2) {
Create call_data_dissector() to call data dissector. 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-20 00:33:14 +00:00
call_data_dissector(tvb, pinfo, tree);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
return;
} /* switch */
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
} /* dissect_ieee802154_command */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* IEEE 802.15.4 decryption algorithm. Tries to find the
* appropriate key from the information in the IEEE 802.15.4
* packet structure and dissector config.
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* This function implements the security proceedures for the
* 2006 version of the spec only. IEEE 802.15.4-2003 is
* unsupported.
* @param tvb IEEE 802.15.4 packet.
* @param pinfo Packet info structure.
* @param offset Offset where the ciphertext 'c' starts.
* @param packet IEEE 802.15.4 packet information.
* @return decrypted payload.
*/
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static tvbuff_t *
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
dissect_ieee802154_decrypt(tvbuff_t *tvb,
guint offset,
packet_info *pinfo,
ieee802154_packet *packet,
ieee802154_payload_info_t* payload_info)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
tvbuff_t *ptext_tvb;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
gboolean have_mic = FALSE;
guint64 srcAddr;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
unsigned char tmp[IEEE802154_CIPHER_SIZE];
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
guint M;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
gint captured_len;
gint reported_len;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
ieee802154_hints_t *ieee_hints;
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
/* 802.15.4-2015 TSCH mode with frame counter suppression is not supported yet */
if (packet->frame_counter_suppression) {
*payload_info->status = DECRYPT_FRAME_COUNTER_SUPPRESSION_UNSUPPORTED;
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
return NULL;
}
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
ieee_hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
/* Get the captured and on-the-wire length of the payload. */
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
M = IEEE802154_MIC_LENGTH(packet->security_level);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
*payload_info->rx_mic_length = M;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
reported_len = tvb_reported_length_remaining(tvb, offset) - IEEE802154_FCS_LEN - M;
if (reported_len < 0) {
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
*payload_info->status = DECRYPT_PACKET_TOO_SMALL;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
return NULL;
}
/* Check of the payload is truncated. */
if (tvb_bytes_exist(tvb, offset, reported_len)) {
captured_len = reported_len;
}
else {
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
captured_len = tvb_captured_length_remaining(tvb, offset);
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
}
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Check if the MIC is present in the captured data. */
have_mic = tvb_bytes_exist(tvb, offset + reported_len, M);
if (have_mic) {
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
tvb_memcpy(tvb, payload_info->rx_mic, offset + reported_len, M);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* Key Lookup - Need to find the appropriate key.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if ((packet->key_index == IEEE802154_THR_WELL_KNOWN_KEY_INDEX) &&
(packet->key_source.addr32 == IEEE802154_THR_WELL_KNOWN_KEY_SRC))
{
/* Use the well-known extended address */
srcAddr = IEEE802154_THR_WELL_KNOWN_EXT_ADDR;
} else {
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) {
/* The source EUI-64 is included in the headers. */
srcAddr = packet->src64;
}
else if (ieee_hints && ieee_hints->map_rec && ieee_hints->map_rec->addr64) {
/* Use the hint */
srcAddr = ieee_hints->map_rec->addr64;
}
else {
/* Lookup failed. */
*payload_info->status = DECRYPT_PACKET_NO_EXT_SRC_ADDR;
return NULL;
}
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* CCM* - CTR mode payload encryption
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/* Create the CCM* initial block for decryption (Adata=0, M=0, counter=0). */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if (packet->version == IEEE802154_VERSION_2003)
ccm_init_block(tmp, FALSE, 0, srcAddr, packet->frame_counter, packet->key_sequence_counter, 0);
else
ccm_init_block(tmp, FALSE, 0, srcAddr, packet->frame_counter, packet->security_level, 0);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Decrypt the ciphertext, and place the plaintext in a new tvb. */
if (IEEE802154_IS_ENCRYPTED(packet->security_level) && captured_len) {
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
guint8 *text;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/*
* Make a copy of the ciphertext in heap memory.
*
* We will decrypt the message in-place and then use the buffer as the
* real data for the new tvb.
*/
Do not mix wmem and glib allocators Change-Id: I0e845668a1b9dbec93ea920a8585ecfe60f001d1 Reviewed-on: https://code.wireshark.org/review/15044 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-04-21 17:12:26 +00:00
text = (guint8 *)tvb_memdup(pinfo->pool, tvb, offset, captured_len);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Perform CTR-mode transformation. */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if (!ccm_ctr_encrypt(payload_info->key, tmp, payload_info->rx_mic, text, captured_len)) {
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
g_free(text);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
*payload_info->status = DECRYPT_PACKET_DECRYPT_FAILED;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
return NULL;
}
/* Create a tvbuff for the plaintext. */
Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff(). svn path=/trunk/; revision=40173
2011-12-13 04:01:33 +00:00
ptext_tvb = tvb_new_child_real_data(tvb, text, captured_len, reported_len);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
add_new_data_source(pinfo, ptext_tvb, "Decrypted IEEE 802.15.4 payload");
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
*payload_info->status = DECRYPT_PACKET_SUCCEEDED;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
}
/* There is no ciphertext. Wrap the plaintext in a new tvb. */
else {
/* Decrypt the MIC (if present). */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if ((have_mic) && (!ccm_ctr_encrypt(payload_info->key, tmp, payload_info->rx_mic, NULL, 0))) {
*payload_info->status = DECRYPT_PACKET_DECRYPT_FAILED;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
return NULL;
}
/* Create a tvbuff for the plaintext. This might result in a zero-length tvbuff. */
Rename tvb_new_subset() to tvb_new_subset_length_caplen(). This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:18:49 +00:00
ptext_tvb = tvb_new_subset_length_caplen(tvb, offset, captured_len, reported_len);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
*payload_info->status = DECRYPT_PACKET_SUCCEEDED;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* CCM* - CBC-mode message authentication
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/* We can only verify the message if the MIC wasn't truncated. */
if (have_mic) {
unsigned char dec_mic[16];
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
guint l_m = captured_len;
guint l_a = offset;
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
/* Adjust the lengths of the plaintext and additional data if unencrypted. */
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
if (!IEEE802154_IS_ENCRYPTED(packet->security_level)) {
l_a += l_m;
l_m = 0;
}
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
else if ((packet->version == IEEE802154_VERSION_2003) && !ieee802154_extend_auth)
Add missing '*/' to the end of a comment: Fixes gcc compile error. svn path=/trunk/; revision=40005
2011-11-25 22:08:25 +00:00
l_a -= 5; /* Exclude Frame Counter (4 bytes) and Key Sequence Counter (1 byte) from authentication data */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create the CCM* initial block for authentication (Adata!=0, M!=0, counter=l(m)). */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if (packet->version == IEEE802154_VERSION_2003)
ccm_init_block(tmp, TRUE, M, srcAddr, packet->frame_counter, packet->key_sequence_counter, l_m);
else
ccm_init_block(tmp, TRUE, M, srcAddr, packet->frame_counter, packet->security_level, l_m);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Compute CBC-MAC authentication tag. */
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/*
* And yes, despite the warning in tvbuff.h, I think tvb_get_ptr is the
* right function here since either A) the payload wasn't encrypted, in
* which case l_m is zero, or B) the payload was encrypted, and the tvb
* already points to contiguous memory, since we just allocated it in
* decryption phase.
*/
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if (!ccm_cbc_mac(payload_info->key, tmp, (const gchar *)tvb_memdup(wmem_packet_scope(), tvb, 0, l_a), l_a, tvb_get_ptr(ptext_tvb, 0, l_m), l_m, dec_mic)) {
*payload_info->status = DECRYPT_PACKET_MIC_CHECK_FAILED;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
/* Compare the received MIC with the one we generated. */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
else if (memcmp(payload_info->rx_mic, dec_mic, M) != 0) {
*payload_info->status = DECRYPT_PACKET_MIC_CHECK_FAILED;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
}
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Done! */
return ptext_tvb;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* dissect_ieee802154_decrypt */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Creates the CCM* initial block value for IEEE 802.15.4.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param block Output pointer for the initial block.
* @param adata TRUE if additional auth data is present
* @param M CCM* parameter M.
* @param addr Source extended address.
* @param frame_counter Packet frame counter
* @param level Security level or key_sequence_counter for 802.15.4-2003
* @param ctr_val Value in the last L bytes of the block.
*/
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
void
ccm_init_block(gchar *block, gboolean adata, gint M, guint64 addr, guint32 frame_counter, guint8 level, gint ctr_val)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
gint i = 0;
/* Flags: Reserved(0) || Adata || (M-2)/2 || (L-1) */
block[i] = (0x2 - 1); /* (L-1) */
if (M > 0) block[i] |= (((M-2)/2) << 3); /* (M-2)/2 */
if (adata) block[i] |= (1 << 6); /* Adata */
i++;
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* 2003 CCM Nonce: Source Address || Frame Counter || Key Sequence Counter */
/* 2006 CCM* Nonce: Source Address || Frame Counter || Security Level */
Squelch some compiler complaints. svn path=/trunk/; revision=32572
2010-04-27 07:41:28 +00:00
block[i++] = (guint8)((addr >> 56) & 0xff);
block[i++] = (guint8)((addr >> 48) & 0xff);
block[i++] = (guint8)((addr >> 40) & 0xff);
block[i++] = (guint8)((addr >> 32) & 0xff);
block[i++] = (guint8)((addr >> 24) & 0xff);
block[i++] = (guint8)((addr >> 16) & 0xff);
block[i++] = (guint8)((addr >> 8) & 0xff);
block[i++] = (guint8)((addr >> 0) & 0xff);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
block[i++] = (guint8)((frame_counter >> 24) & 0xff);
block[i++] = (guint8)((frame_counter >> 16) & 0xff);
block[i++] = (guint8)((frame_counter >> 8) & 0xff);
block[i++] = (guint8)((frame_counter >> 0) & 0xff);
block[i++] = level;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Plaintext length. */
Squelch some compiler complaints. svn path=/trunk/; revision=32572
2010-04-27 07:41:28 +00:00
block[i++] = (guint8)((ctr_val >> 8) & 0xff);
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40994
2012-02-12 18:05:02 +00:00
block[i] = (guint8)((ctr_val >> 0) & 0xff);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* ccm_init_block */
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
/**
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
* Perform an in-place CTR-mode encryption/decryption.
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param key Encryption Key.
* @param iv Counter initial value.
* @param mic MIC to encrypt/decrypt.
* @param data Buffer to encrypt/decrypt.
* @param length Length of the buffer.
* @return TRUE on SUCCESS, FALSE on error.
*/
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
gboolean
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
ccm_ctr_encrypt(const gchar *key, const gchar *iv, gchar *mic, gchar *data, gint length)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
gcry_cipher_hd_t cipher_hd;
/* Open the cipher. */
if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CTR, 0)) {
return FALSE;
}
/* Set the key and initial value. */
if (gcry_cipher_setkey(cipher_hd, key, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
if (gcry_cipher_setctr(cipher_hd, iv, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Decrypt the MIC. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, NULL, 0)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Decrypt the payload. */
if (gcry_cipher_encrypt(cipher_hd, data, length, NULL, 0)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Done with the cipher. */
gcry_cipher_close(cipher_hd);
return TRUE;
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
} /* ccm_ctr_encrypt */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Generate a CBC-MAC of the decrypted payload and additional authentication headers.
* @param key Encryption Key.
* @param iv Counter initial value.
* @param a Additional auth headers.
* @param a_len Length of the additional headers.
* @param m Plaintext message.
* @param m_len Length of plaintext message.
* @param mic Output for CBC-MAC.
* @return TRUE on SUCCESS, FALSE on error.
*/
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
gboolean
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
ccm_cbc_mac(const gchar *key, const gchar *iv, const gchar *a, gint a_len, const gchar *m, gint m_len, gchar *mic)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
gcry_cipher_hd_t cipher_hd;
guint i = 0;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
unsigned char block[IEEE802154_CIPHER_SIZE];
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Open the cipher. */
if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, GCRY_CIPHER_CBC_MAC)) return FALSE;
/* Set the key. */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
if (gcry_cipher_setkey(cipher_hd, key, IEEE802154_CIPHER_SIZE)) {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Process the initial value. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, iv, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Encode L(a) */
i = 0;
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
/* XXX: GINT_MAX is not defined so #if ... will always be false */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
#if (GINT_MAX >= (1LL << 32))
if (a_len >= (1LL << 32)) {
block[i++] = 0xff;
block[i++] = 0xff;
block[i++] = (a_len >> 56) & 0xff;
block[i++] = (a_len >> 48) & 0xff;
block[i++] = (a_len >> 40) & 0xff;
block[i++] = (a_len >> 32) & 0xff;
block[i++] = (a_len >> 24) & 0xff;
block[i++] = (a_len >> 16) & 0xff;
block[i++] = (a_len >> 8) & 0xff;
block[i++] = (a_len >> 0) & 0xff;
}
else
#endif
if (a_len >= ((1 << 16) - (1 << 8))) {
block[i++] = 0xff;
block[i++] = 0xfe;
block[i++] = (a_len >> 24) & 0xff;
block[i++] = (a_len >> 16) & 0xff;
block[i++] = (a_len >> 8) & 0xff;
block[i++] = (a_len >> 0) & 0xff;
}
else {
block[i++] = (a_len >> 8) & 0xff;
block[i++] = (a_len >> 0) & 0xff;
}
/* Append a to get the first block of input (pad if we encounter the end of a). */
while ((i < sizeof(block)) && (a_len-- > 0)) block[i++] = *a++;
while (i < sizeof(block)) block[i++] = 0;
/* Process the first block of AuthData. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, block, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Transform and process the remainder of a. */
while (a_len > 0) {
/* Copy and pad. */
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
if ((guint)a_len >= sizeof(block)) memcpy(block, a, sizeof(block));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
else {memcpy(block, a, a_len); memset(block+a_len, 0, sizeof(block)-a_len);}
/* Adjust pointers. */
a += sizeof(block);
Fix a bunch of warnings. 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-12-26 05:57:06 +00:00
a_len -= (int)sizeof(block);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Execute the CBC-MAC algorithm. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, block, sizeof(block))) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
} /* while */
/* Process the message, m. */
while (m_len > 0) {
/* Copy and pad. */
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
if ((guint)m_len >= sizeof(block)) memcpy(block, m, sizeof(block));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
else {memcpy(block, m, m_len); memset(block+m_len, 0, sizeof(block)-m_len);}
/* Adjust pointers. */
m += sizeof(block);
Fix a bunch of warnings. 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-12-26 05:57:06 +00:00
m_len -= (int)sizeof(block);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Execute the CBC-MAC algorithm. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, block, sizeof(block))) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
}
/* Done with the cipher. */
gcry_cipher_close(cipher_hd);
return TRUE;
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
} /* ccm_cbc_mac */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Key hash function. */
guint ieee802154_short_addr_hash(gconstpointer key)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (((const ieee802154_short_addr *)key)->addr) | (((const ieee802154_short_addr *)key)->pan << 16);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
/* Key equal function. */
gboolean ieee802154_short_addr_equal(gconstpointer a, gconstpointer b)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (((const ieee802154_short_addr *)a)->pan == ((const ieee802154_short_addr *)b)->pan) &&
(((const ieee802154_short_addr *)a)->addr == ((const ieee802154_short_addr *)b)->addr);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them. svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
/* Key hash function. */
guint ieee802154_long_addr_hash(gconstpointer key)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (guint)(((const ieee802154_long_addr *)key)->addr) & 0xFFFFFFFF;
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them. svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
}
/* Key equal function. */
gboolean ieee802154_long_addr_equal(gconstpointer a, gconstpointer b)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (((const ieee802154_long_addr *)a)->addr == ((const ieee802154_long_addr *)b)->addr);
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them. svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
}
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Set MAC key function. */
static gboolean ieee802154_set_mac_key(ieee802154_packet *packet, unsigned char *key, unsigned char *alt_key, ieee802154_key_t* uat_key)
{
ieee802154_set_mac_key_func func = (ieee802154_set_mac_key_func)wmem_tree_lookup32(mac_key_hash_handlers, uat_key->hash_type);
if (func != NULL)
return func(packet, key, alt_key, uat_key);
/* Right now, KEY_HASH_NONE and KEY_HASH_ZIP are not registered because they
work with this "default" behavior */
if (packet->key_index == uat_key->key_index)
{
memcpy(key, uat_key->key, IEEE802154_CIPHER_SIZE);
return TRUE;
}
return FALSE;
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Creates a record that maps the given short address and pan to a long (extended) address.
* @param short_addr 16-bit short address
* @param pan 16-bit PAN id
* @param long_addr 64-bit long (extended) address
* @param proto pointer to name of current protocol
* @param fnum Frame number this mapping became valid
* @return TRUE Record was updated, FALSE Couldn't find it
*/
Fix Visual C++ code analysis warnings. svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
ieee802154_map_rec *ieee802154_addr_update(ieee802154_map_tab_t *au_ieee802154_map,
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
guint16 short_addr, guint16 pan, guint64 long_addr, const char *proto, guint fnum)
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
ieee802154_short_addr addr16;
ieee802154_map_rec *p_map_rec;
gpointer old_key;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Look up short address hash */
addr16.pan = pan;
addr16.addr = short_addr;
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
p_map_rec = (ieee802154_map_rec *)g_hash_table_lookup(au_ieee802154_map->short_table, &addr16);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Update mapping record */
if (p_map_rec) {
/* record already exists */
if ( p_map_rec->addr64 == long_addr ) {
/* no change */
return p_map_rec;
}
else {
/* mark current mapping record invalid */
p_map_rec->end_fnum = fnum;
}
}
/* create a new mapping record */
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
p_map_rec = wmem_new(wmem_file_scope(), ieee802154_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
p_map_rec->proto = proto;
p_map_rec->start_fnum = fnum;
p_map_rec->end_fnum = 0;
p_map_rec->addr64 = long_addr;
/* link new mapping record to addr hash tables */
Fix Visual C++ code analysis warnings. svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
if ( g_hash_table_lookup_extended(au_ieee802154_map->short_table, &addr16, &old_key, NULL) ) {
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* update short addr hash table, reusing pointer to old key */
_lookup_extended takes a pointer to the key-pointer since it has to set the old key pointer value. _insert just takes the key-pointer, not a pointer to it. Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a struct (when it in fact points to a pointer to struct) and leads to incorrect behaviour and uninitialized/out-of-bounds memory accesses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 svn path=/trunk/; revision=52036
2013-09-14 13:15:31 +00:00
g_hash_table_insert(au_ieee802154_map->short_table, old_key, p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else {
/* create new hash entry */
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
g_hash_table_insert(au_ieee802154_map->short_table, wmem_memdup(wmem_file_scope(), &addr16, sizeof(addr16)), p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
Fix Visual C++ code analysis warnings. svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
if ( g_hash_table_lookup_extended(au_ieee802154_map->long_table, &long_addr, &old_key, NULL) ) {
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* update long addr hash table, reusing pointer to old key */
_lookup_extended takes a pointer to the key-pointer since it has to set the old key pointer value. _insert just takes the key-pointer, not a pointer to it. Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a struct (when it in fact points to a pointer to struct) and leads to incorrect behaviour and uninitialized/out-of-bounds memory accesses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 svn path=/trunk/; revision=52036
2013-09-14 13:15:31 +00:00
g_hash_table_insert(au_ieee802154_map->long_table, old_key, p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else {
/* create new hash entry */
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
g_hash_table_insert(au_ieee802154_map->long_table, wmem_memdup(wmem_file_scope(), &long_addr, sizeof(long_addr)), p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
return p_map_rec;
} /* ieee802154_addr_update */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* Marks a mapping record associated with device with short_addr
* as invalid at a certain frame number, typically when a
* disassociation occurs.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param short_addr 16-bit short address
* @param pan 16-bit PAN id
* @param fnum Frame number when mapping became invalid
* @return TRUE Record was updated, FALSE Couldn't find it
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
gboolean ieee802154_short_addr_invalidate(guint16 short_addr, guint16 pan, guint fnum)
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
ieee802154_short_addr addr16;
ieee802154_map_rec *map_rec;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
addr16.pan = pan;
addr16.addr = short_addr;
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
map_rec = (ieee802154_map_rec *)g_hash_table_lookup(ieee802154_map.short_table, &addr16);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
if ( map_rec ) {
/* indicates this mapping is invalid at frame fnum */
map_rec->end_fnum = fnum;
return TRUE;
}
return FALSE;
} /* ieee802154_short_addr_invalidate */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Mark a mapping record associated with device with long_addr
* as invalid at a certain frame number, typically when a
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
* disassociation occurs.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
* @param long_addr 16-bit short address
* @param fnum Frame number when mapping became invalid
* @return TRUE If record was updated, FALSE otherwise
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
gboolean ieee802154_long_addr_invalidate(guint64 long_addr, guint fnum)
{
ieee802154_map_rec *map_rec;
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
map_rec = (ieee802154_map_rec *)g_hash_table_lookup(ieee802154_map.long_table, &long_addr);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
if ( map_rec ) {
/* indicates this mapping is invalid at frame fnum */
map_rec->end_fnum = fnum;
return TRUE;
}
return FALSE;
} /* ieee802154_long_addr_invalidate */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Init routine for the IEEE 802.15.4 dissector. Creates hash
* tables for mapping between 16-bit to 64-bit addresses and
* populates them with static address pairs from a UAT
* preference table.
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
*/
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
static void
proto_init_ieee802154(void)
{
guint i;
ieee802154_map.short_table = g_hash_table_new(ieee802154_short_addr_hash, ieee802154_short_addr_equal);
ieee802154_map.long_table = g_hash_table_new(ieee802154_long_addr_hash, ieee802154_long_addr_equal);
Split more init routines into init/cleanup functions This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28 13:15:07 +00:00
/* Reload the hash table from the static address UAT. */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
for (i=0; (i<num_static_addrs) && (static_addrs); i++) {
ieee802154_addr_update(&ieee802154_map,(guint16)static_addrs[i].addr16, (guint16)static_addrs[i].pan,
pntoh64(static_addrs[i].eui64), ieee802154_user, IEEE802154_USER_MAPPING);
} /* for */
} /* proto_init_ieee802154 */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Cleanup for the IEEE 802.15.4 dissector.
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
*/
Split more init routines into init/cleanup functions This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28 13:15:07 +00:00
static void
proto_cleanup_ieee802154(void)
{
g_hash_table_destroy(ieee802154_map.short_table);
g_hash_table_destroy(ieee802154_map.long_table);
}
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/* Returns the prompt string for the Decode-As dialog. */
static void ieee802154_da_prompt(packet_info *pinfo _U_, gchar* result)
{
ieee802154_hints_t *hints;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0);
Qt: Fix DecodeAs Previously DecodeAs neither save its changes nor changes dissector tables. Do that and redissect packets to refresh view. Bug: 10553 Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15 Reviewed-on: https://code.wireshark.org/review/7676 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-08 13:59:32 +00:00
if (hints)
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "IEEE 802.15.4 PAN 0x%04x as", hints->src_pan);
else
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "IEEE 802.15.4 PAN Unknown");
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
} /* iee802154_da_prompt */
/* Returns the value to index the panid decode table with (source PAN)*/
static gpointer ieee802154_da_value(packet_info *pinfo _U_)
{
ieee802154_hints_t *hints;
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0);
Qt: Fix DecodeAs Previously DecodeAs neither save its changes nor changes dissector tables. Do that and redissect packets to refresh view. Bug: 10553 Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15 Reviewed-on: https://code.wireshark.org/review/7676 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-08 13:59:32 +00:00
if (hints)
return GUINT_TO_POINTER((guint)(hints->src_pan));
else
return NULL;
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
} /* iee802154_da_value */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* IEEE 802.15.4 protocol registration routine.
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
void proto_register_ieee802154(void)
{
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Protocol fields */
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
static hf_register_info hf_phy[] = {
/* PHY level */
{ &hf_ieee802154_nonask_phy_preamble,
{ "Preamble", "wpan-nonask-phy.preamble", FT_UINT32, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
{ &hf_ieee802154_nonask_phy_sfd,
{ "Start of Frame Delimiter", "wpan-nonask-phy.sfd", FT_UINT8, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
{ &hf_ieee802154_nonask_phy_length,
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
{ "Frame Length", "wpan-nonask-phy.frame_length", FT_UINT8, BASE_HEX, NULL,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
IEEE802154_PHY_LENGTH_MASK, NULL, HFILL }},
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
{ &hf_ieee802154_nonask_phr,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "PHR", "wpan-nonask-phy.phr", FT_UINT8, BASE_HEX, NULL,
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
0x0, NULL, HFILL }},
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static hf_register_info hf[] = {
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_frame_length,
{ "Frame Length", "wpan.frame_length", FT_UINT8, BASE_DEC, NULL, 0x0,
"Frame Length as reported from lower layer", HFILL }},
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ &hf_ieee802154_fcf,
{ "Frame Control Field", "wpan.fcf", FT_UINT16, BASE_HEX, NULL,
0x0, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_frame_type,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Frame Type", "wpan.frame_type", FT_UINT16, BASE_HEX, VALS(ieee802154_frame_types),
IEEE802154_FCF_TYPE_MASK, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_security,
{ "Security Enabled", "wpan.security", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_SEC_EN,
"Whether security operations are performed at the MAC layer or not.", HFILL }},
{ &hf_ieee802154_pending,
{ "Frame Pending", "wpan.pending", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_FRAME_PND,
"Indication of additional packets waiting to be transferred from the source device.", HFILL }},
{ &hf_ieee802154_ack_request,
{ "Acknowledge Request", "wpan.ack_request", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_ACK_REQ,
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 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-12-11 01:06:04 +00:00
"Whether the sender of this packet requests acknowledgment or not.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 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-12-11 01:06:04 +00:00
{ &hf_ieee802154_pan_id_compression,
{ "PAN ID Compression", "wpan.pan_id_compression", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_PAN_ID_COMPRESSION,
"Whether this packet contains the PAN ID or not.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &hf_ieee802154_seqno_suppression,
{ "Sequence Number Suppression", "wpan.seqno_suppression", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_SEQNO_SUPPRESSION,
"Whether this packet contains the Sequence Number or not.", HFILL }},
{ &hf_ieee802154_ie_present,
{ "Information Elements Present", "wpan.ie_present", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_IE_PRESENT,
"Whether this packet contains the Information Elements or not.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_seqno,
{ "Sequence Number", "wpan.seq_no", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_dst_addr_mode,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Destination Addressing Mode", "wpan.dst_addr_mode", FT_UINT16, BASE_HEX, VALS(ieee802154_addr_modes),
IEEE802154_FCF_DADDR_MASK, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_src_addr_mode,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Source Addressing Mode", "wpan.src_addr_mode", FT_UINT16, BASE_HEX, VALS(ieee802154_addr_modes),
IEEE802154_FCF_SADDR_MASK, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_version,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ "Frame Version", "wpan.version", FT_UINT16, BASE_DEC, VALS(ieee802154_frame_versions),
IEEE802154_FCF_VERSION, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_dst_panID,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ "Destination PAN", "wpan.dst_pan", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_dst16,
{ "Destination", "wpan.dst16", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_dst64,
{ "Destination", "wpan.dst64", FT_EUI64, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_src_panID,
{ "Source PAN", "wpan.src_pan", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ &hf_ieee802154_src16,
{ "Source", "wpan.src16", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_src64,
Add FT_EUI64 Field Type * 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-05-08 10:23:53 +00:00
{ "Extended Source", "wpan.src64", FT_EUI64, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ &hf_ieee802154_src64_origin,
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ "Origin", "wpan.src64.origin", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_fcs,
{ "FCS", "wpan.fcs", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_rssi,
Fix typo in unit_name_string units_decibels name. Change-Id: Ib17ca3a613648667d0f99fa7412d074a205840a9 Reviewed-on: https://code.wireshark.org/review/19300 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-12-16 07:54:56 +00:00
{ "RSSI", "wpan.rssi", FT_INT8, BASE_DEC|BASE_UNIT_STRING, &units_decibels, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Received Signal Strength", HFILL }},
{ &hf_ieee802154_fcs_ok,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
{ "FCS Valid", "wpan.fcs_ok", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_correlation,
{ "LQI Correlation Value", "wpan.correlation", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/* Information Elements */
{ &hf_ieee802154_ie_unknown_content,
{ "Unknown Content", "wpan.ie.unknown_content", FT_BYTES, SEP_SPACE, NULL, 0x0,
NULL, HFILL }},
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
/* Header IE */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ &hf_ieee802154_header_ies,
{ "Header IEs", "wpan.header_ie", FT_NONE, BASE_NONE, NULL,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
0x0, NULL, HFILL }},
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ &hf_ieee802154_header_ie_tlv,
{ "IE Header", "wpan.header_ie_tlv", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &hf_ieee802154_header_ie_type,
{ "Type", "wpan.header_ie.type", FT_UINT16, BASE_DEC, VALS(ieee802154_ie_types),
IEEE802154_HEADER_IE_TYPE_MASK, NULL, HFILL }},
{ &hf_ieee802154_header_ie_id,
{ "Id", "wpan.header_ie.id", FT_UINT16, BASE_HEX, VALS(ieee802154_header_ie_names),
IEEE802154_HEADER_IE_ID_MASK, NULL, HFILL }},
{ &hf_ieee802154_header_ie_length,
{ "Length", "wpan.header_ie.length", FT_UINT16, BASE_DEC, NULL,
IEEE802154_HEADER_IE_LENGTH_MASK, NULL, HFILL }},
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
/* Individual Header IEs */
{ &hf_ieee802154_hie_unsupported,
{ "Unsupported Header IE", "wpan.header_ie.unsupported", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_hie_ht1,
{ "Header Termination 1 IE (Payload IEs follow)", "wpan.header_ie.ht1", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_hie_ht2,
{ "Header Termination 2 IE (Payload follows)", "wpan.header_ie.ht2", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Refactor header ie dissection - Change title of IE subtree - extract dissect_802154_enhanced_beacon_filter - Adding reference to the IEEE 802.15.4 standard - fix Typo - Explicit case of header termination Change-Id: Ia18d8d0345e2bac5ef16057e7c3cf08e4341060a Reviewed-on: https://code.wireshark.org/review/21187 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-04-11 08:37:13 +00:00
ieee802154: Time correction IE: Fix and add micro-second value Change-Id: I52a22e7cfd8c0d5c054435678c891a3e1d0505b2 Reviewed-on: https://code.wireshark.org/review/20547 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>
2017-03-07 13:32:22 +00:00
/* Time correction IE */
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ &hf_ieee802154_hie_time_correction,
{ "Time Correction IE", "wpan.header_ie.time_correction", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ &hf_ieee802154_hie_time_correction_time_sync_info,
{ "Time Sync Info", "wpan.header_ie.time_correction.time_sync_info", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
ieee802154: Time correction IE: Fix and add micro-second value Change-Id: I52a22e7cfd8c0d5c054435678c891a3e1d0505b2 Reviewed-on: https://code.wireshark.org/review/20547 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>
2017-03-07 13:32:22 +00:00
{ &hf_ieee802154_nack,
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ "Nack", "wpan.nack", FT_BOOLEAN, 16, TFS(&hf_ieee802154_nack_tfs), 0x8000,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ &hf_ieee802154_hie_time_correction_value,
{ "Time Correction", "wpan.header_ie.time_correction.value", FT_INT16, BASE_DEC|BASE_UNIT_STRING, &units_microseconds, 0x0FFF,
"Time correction in microseconds", HFILL }},
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
IEEE 802.15.4: Support for CSL Header IE Change-Id: Ibda1f0757401566170459570e1138ac3dc3e5101 Reviewed-on: https://code.wireshark.org/review/22421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-27 15:07:53 +00:00
/* CSL IE */
{ &hf_ieee802154_hie_csl,
{ "CSL IE", "wpan.header_ie.csl", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_hie_csl_phase,
{ "Phase", "wpan.header_ie.csl.phase", FT_INT16, BASE_DEC, NULL, 0x0,
"CSL Phase in units of 10 symbols", HFILL }},
{ &hf_ieee802154_hie_csl_period,
{ "Period", "wpan.header_ie.csl.period", FT_INT16, BASE_DEC, NULL, 0x0,
"CSL Period in units of 10 symbols", HFILL }},
{ &hf_ieee802154_hie_csl_rendezvous_time,
{ "Rendezvous Time", "wpan.header_ie.csl.rendezvous_time", FT_INT16, BASE_DEC, NULL, 0x0,
"CSL Rendezvous Time in units of 10 symbols", HFILL }},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Payload IEs */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
{ &hf_ieee802154_payload_ies,
{ "Payload IEs", "wpan.payload_ie", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 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>
2017-06-08 12:44:49 +00:00
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
{ &hf_ieee802154_payload_ie_tlv,
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
{ "IE Header", "wpan.payload_ie_tlv", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &hf_ieee802154_payload_ie_type,
{ "Type", "wpan.payload_ie.type", FT_UINT16, BASE_DEC, VALS(ieee802154_ie_types),
IEEE802154_PAYLOAD_IE_TYPE_MASK, NULL, HFILL }},
{ &hf_ieee802154_payload_ie_id,
{ "Id", "wpan.payload_ie.id", FT_UINT16, BASE_HEX, VALS(ieee802154_payload_ie_names),
IEEE802154_PAYLOAD_IE_ID_MASK, NULL, HFILL }},
{ &hf_ieee802154_payload_ie_length,
{ "Length", "wpan.payload_ie.length", FT_UINT16, BASE_DEC, NULL,
IEEE802154_PAYLOAD_IE_LENGTH_MASK, NULL, HFILL }},
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
/* Individual Payload IEs */
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
{ &hf_ieee802154_pie_unsupported,
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
{ "Unknown Payload IE", "wpan.payload_ie.unknown", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_pie_termination,
{ "Payload Termination IE", "wpan.payload_ie.termination", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_pie_vendor,
{ "Vendor Specific IE", "wpan.payload_ie.vendor", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_mlme,
{ "MLME IE", "wpan.mlme", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_ieee802154_timeslot_ie,
{ "Timeslot IE", "wpan.timeslot", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_ieee802154_enhanced_beacon_filter_ie,
{ "Enhanced Beacon Filter IE", "wpan.enhanced_beacon_filter", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ &hf_ieee802154_psie_short,
{ "Payload Sub IE (short)", "wpan.payload_sub_ie.short", FT_UINT16, BASE_HEX, NULL,
0x0, NULL, HFILL }},
{ &hf_ieee802154_psie_type_short,
{ "Type", "wpan.payload_sub_ie.type_short", FT_UINT16, BASE_DEC, VALS(ieee802154_psie_types),
IEEE802154_PSIE_TYPE_MASK, NULL, HFILL }},
{ &hf_ieee802154_psie_id_short,
{ "Sub Id (Short)", "wpan.payload_sub_ie.id_short", FT_UINT16, BASE_HEX, VALS(ieee802154_psie_names),
IEEE802154_PSIE_ID_MASK_SHORT, NULL, HFILL }},
{ &hf_ieee802154_psie_length_short,
{ "Length", "wpan.payload_sub_ie.length_short", FT_UINT16, BASE_DEC, NULL,
IEEE802154_PSIE_LENGTH_MASK_SHORT, NULL, HFILL }},
{ &hf_ieee802154_psie_long,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Payload Sub IE (long)", "wpan.payload_sub_ie.long", FT_UINT16, BASE_HEX, NULL,
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
0x0, NULL, HFILL }},
{ &hf_ieee802154_psie_type_long,
{ "Type", "wpan.payload_sub_ie.type_long", FT_UINT16, BASE_DEC, VALS(ieee802154_psie_types),
IEEE802154_PSIE_TYPE_MASK, NULL, HFILL }},
{ &hf_ieee802154_psie_id_long,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
{ "Sub Id (Long)", "wpan.payload_sub_ie.id_long", FT_UINT16, BASE_HEX, VALS(ieee802154_psie_names),
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
IEEE802154_PSIE_ID_MASK_LONG, NULL, HFILL }},
{ &hf_ieee802154_psie_length_long,
{ "Length", "wpan.payload_sub_ie.length_long", FT_UINT16, BASE_DEC, NULL,
IEEE802154_PSIE_LENGTH_MASK_LONG, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter,
{ "Enhanced Beacon Filter", "wpan.payload_sub_ie.eb_filter", FT_UINT8, BASE_HEX, NULL,
0, NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_sync,
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
{ "Time Synchronization IE", "wpan.tsch.time_sync", FT_NONE, BASE_NONE, NULL, 0x0,
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
NULL, HFILL }},
{ &hf_ieee802154_tsch_asn,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Absolute Slot Number", "wpan.tsch.asn", FT_UINT40, BASE_DEC, NULL, 0x0,
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
NULL, HFILL }},
{ &hf_ieee802154_tsch_join_metric,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Join Metric", "wpan.tsch.join_metric", FT_UINT8, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_channel_hopping,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Channel Hopping IE", "wpan.channel_hopping", FT_NONE, BASE_NONE, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
{ &hf_ieee802154_tsch_slotframe,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Slotframe IE", "wpan.tsch.slotframe", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
{ &hf_ieee802154_tsch_slotframe_list,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Slotframe info list", "wpan.tsch.slotframe_list", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
{ &hf_ieee802154_tsch_link_info,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Link Information", "wpan.tsch.link_info", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_link_nb_slotf,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Number of Slotframes", "wpan.tsch.slotframe_num", FT_UINT8, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_link_slotf_handle,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Slotframe handle", "wpan.tsch.slotframe_handle", FT_UINT8, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_size,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Slotframe size", "wpan.tsch.slotframe_size", FT_UINT16, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_link_nb_links,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Number of Links", "wpan.tsch.nb_links", FT_UINT8, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_link_timeslot,
{ "Timeslot", "wpan.tsch.timeslot", FT_UINT16, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_link_channel_offset,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Channel Offset", "wpan.tsch.channel_offset", FT_UINT16, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_slotf_link_options,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Link Options", "wpan.tsch.link_options", FT_UINT8, BASE_DEC, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_tsch_hopping_sequence_id,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Hopping Sequence ID", "wpan.tsch.hopping_sequence_id", FT_UINT8, BASE_HEX, NULL, 0x0,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
NULL, HFILL }},
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ &hf_ieee802154_psie_eb_filter_pjoin,
{ "Permit Join Filter", "wpan.payload_sub_ie.eb_filter.pjoin", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled),
IEEE802154_MLME_PSIE_EB_FLT_PJOIN, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter_lqi,
{ "LQI Filter", "wpan.payload_sub_ie.eb_filter.lqi", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled),
IEEE802154_MLME_PSIE_EB_FLT_LQI, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter_lqi_min,
{ "Minimum LQI", "wpan.payload_sub_ie.eb_filter.lqi_minimum", FT_UINT8, BASE_DEC, NULL,
0x0, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter_percent,
{ "Probability to Respond", "wpan.payload_sub_ie.eb_filter.contains_prob", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled),
IEEE802154_MLME_PSIE_EB_FLT_PERCENT, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter_percent_prob,
{ "Response Probability Percentage", "wpan.payload_sub_ie.eb_filter.prob", FT_UINT8, BASE_DEC, NULL,
0x0, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter_attr_id,
{ "Requested Attribute Length", "wpan.payload_sub_ie.eb_filter.attr_id", FT_UINT8, BASE_DEC, NULL,
IEEE802154_MLME_PSIE_EB_FLT_ATTR_LEN, NULL, HFILL }},
{ &hf_ieee802154_psie_eb_filter_attr_id_bitmap,
{ "Attribute ID Bitmap", "wpan.payload_sub_ie.eb_filter.attr_id_bits", FT_UINT24, BASE_HEX, NULL,
0x0, NULL, HFILL }},
Added support for Payload IE Vendor OUI. IEEE has run out of Payload IE IDs so ZigBee and future IEs must use Vendor OUIs. Change-Id: I6eed4382d099364605649eb7577a5e2691e97dd3 Reviewed-on: https://code.wireshark.org/review/13971 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-02-16 17:40:12 +00:00
{ &hf_ieee802154_payload_ie_vendor_oui,
{ "Vendor OUI", "wpan.payload_ie.vendor_oui", FT_UINT24, BASE_HEX, NULL,
0x0, NULL, HFILL }},
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
{ &hf_ieee802154_mlme_ie_data,
{ "Data", "wpan.mlme_sub_ie.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
/* IETF IE */
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
{ &hf_ieee802154_pie_ietf,
{ "IETF Payload IE", "wpan.payload_ie.ietf", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
{ &hf_ieee802154_p_ie_ietf_sub_id,
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
{ "Sub-ID", "wpan.ietf_ie.sub_id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
/* IETF IE - 6top IE */
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ &hf_ieee802154_6top,
{ "6top IE", "wpan.6top", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_version,
{ "6P Version", "wpan.6top_version", FT_UINT8, BASE_DEC, NULL, IETF_6TOP_VERSION,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_type,
{ "Type", "wpan.6top_type", FT_UINT8, BASE_HEX, VALS(ietf_6top_types), IETF_6TOP_TYPE,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_flags_reserved,
{ "Reserved", "wpan.6top_flags_reserved", FT_UINT8, BASE_HEX, NULL, IETF_6TOP_FLAGS_RESERVED,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_code,
{ "Code", "wpan.6top_code", FT_UINT8, BASE_HEX, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_sfid,
{ "SFID (6top Scheduling Function ID)", "wpan.6top_sfid", FT_UINT8, BASE_HEX, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_seqnum,
{ "SeqNum", "wpan.6top_seqnum", FT_UINT8, BASE_DEC, NULL, IETF_6TOP_SEQNUM,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ &hf_ieee802154_6top_gen,
{ "GEN", "wpan.6top_gen", FT_UINT8, BASE_DEC, VALS(ietf_6top_generation_numbers), IETF_6TOP_GEN,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_metadata,
{ "Metadata", "wpan.6top_metadata", FT_UINT16, BASE_HEX, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_cell_options,
{ "Cell Options", "wpan.6top_cell_options", FT_UINT8, BASE_HEX, VALS(ietf_6top_cell_options), 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_cell_option_tx,
{ "Transmit (TX) Cell", "wpan.6top_cell_option_tx", FT_UINT8, BASE_HEX, NULL, IETF_6TOP_CELL_OPTION_TX,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_cell_option_rx,
{ "Receive (RX) Cell", "wpan.6top_cell_option_rx", FT_UINT8, BASE_HEX, NULL, IETF_6TOP_CELL_OPTION_RX,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_cell_option_shared,
{ "SHARED Cell", "wpan.6top_cell_option_shared", FT_UINT8, BASE_HEX, NULL, IETF_6TOP_CELL_OPTION_SHARED,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_cell_option_reserved,
{ "Reserved", "wpan.6top_cell_option_reserved", FT_UINT8, BASE_HEX, NULL, IETF_6TOP_CELL_OPTION_RESERVED,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_num_cells,
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ "Number of Cells", "wpan.6top_num_cells", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_6top_cell_list,
{ "CellList", "wpan.6top_cell_list", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_6top_rel_cell_list,
{ "Rel. CellList", "wpan.6top_rel_cell_list", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_6top_cand_cell_list,
{ "Cand. CellList", "wpan.6top_cand_cell_list", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_6top_cell,
{ "Cell", "wpan.6top_cell", FT_BYTES, BASE_NONE, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_reserved,
{ "Reserved", "wpan.6top_reserved", FT_UINT8, BASE_HEX, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_offset,
{ "Offset", "wpan.6top_offset", FT_UINT16, BASE_DEC, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_max_num_cells,
{ "Maximum Number of Requested Cells", "wpan.6top_max_num_cells", FT_UINT16, BASE_DEC, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_slot_offset,
{ "Slot Offset", "wpan.6top_cell_slot_offset", FT_UINT16, BASE_HEX, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &hf_ieee802154_6top_channel_offset,
{ "Channel Offset", "wpan.6top_channel_offset", FT_UINT16, BASE_HEX, NULL, 0x0,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
NULL, HFILL }},
Add support for 6P-sixtop protocol in the IEEE802.15.4 dissector. This patch adds one more Payload Information Element called 6P or sixtop defined by the IETF 6TiSCH Working Group. Here it is shown the following 6P-sixtop information: -The 6P-sixtop version. -The 6P-sixtop code. -The 6P-sixtop Scheduling Function ID. Then, depending of the 6P-sixtop code, a specific information is shown. The supported codes -commands- for this patch are: -Add. -Delete. -Count. -List. -Clear. -Return Code Success. For more information about the 6P-sixtop protocol, go to: https://tools.ietf.org/html/draft-ietf-6tisch-6top-protocol-02 Bug 13005 Change-Id: I46b015dd8acd1515bff4090c5b39ad3897606f67 Reviewed-on: https://code.wireshark.org/review/18151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-11 08:19:11 +00:00
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
{ &hf_ieee802154_6top_total_num_cells,
{ "Total Number of Cells", "wpan.6top_total_num_cells", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
/* MPX IE (IEEE 802.15.9) */
{ &hf_ieee802159_mpx,
{ "MPX IE", "wpan.mpx", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_transaction_control,
{ "Transaction Control", "wpan.mpx.transaction_control", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_transfer_type,
{ "Transfer Type", "wpan.mpx.transfer_type", FT_UINT8, BASE_HEX, VALS(mpx_transfer_type_vals), IEEE802159_MPX_TRANSFER_TYPE_MASK,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_transaction_id,
{ "Transaction ID", "wpan.mpx.transaction_id", FT_UINT8, BASE_HEX, NULL, IEEE802159_MPX_TRANSACTION_ID_MASK,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_transaction_id_as_multiplex_id,
{ "Multiplex ID", "wpan.mpx.multiplex_id", FT_UINT8, BASE_HEX, VALS(mpx_multiplex_id_vals), IEEE802159_MPX_TRANSACTION_ID_MASK,
"Transaction ID used as Multiplex ID", HFILL }
},
{ &hf_ieee802159_mpx_fragment_number,
{ "Fragment Number", "wpan.mpx.fragment_number", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_total_frame_size,
{ "Total Frame Size", "wpan.mpx.total_frame_size", FT_UINT16, BASE_DEC, NULL, 0x0,
"Total Upper-Layer Frame Size", HFILL }
},
{ &hf_ieee802159_mpx_multiplex_id,
{ "Multiplex ID", "wpan.mpx.multiplex_id", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_kmp_id,
{ "KMP ID", "wpan.mpx.kmp.id", FT_UINT8, BASE_DEC, VALS(mpx_kmp_id_vals), 0x0,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_kmp_vendor_oui,
{ "Vendor OUI", "wpan.mpx.kmp.vendor_oui", FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
NULL, HFILL }
},
{ &hf_ieee802159_mpx_fragment,
{ "Upper-Layer Frame Fragment", "wpan.mpx.fragment", FT_BYTES, SEP_SPACE, NULL, 0x0,
NULL, HFILL }
},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
/* Command Frame Specific Fields */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_cmd_id,
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ "Command Identifier", "wpan.cmd", FT_UINT8, BASE_HEX, VALS(ieee802154_cmd_names), 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Capability Information Fields */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_alt_coord,
{ "Alternate PAN Coordinator", "wpan.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_ALT_PAN_COORD,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device can act as a PAN coordinator or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_device_type,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "Device Type", "wpan.cinfo.device_type", FT_BOOLEAN, 8, TFS(&tfs_cinfo_device_type), IEEE802154_CMD_CINFO_DEVICE_TYPE,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device is RFD (reduced-function device) or FFD (full-function device).", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_power_src,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "Power Source", "wpan.cinfo.power_src", FT_BOOLEAN, 8, TFS(&tfs_cinfo_power_src), IEEE802154_CMD_CINFO_POWER_SRC,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device is operating on AC/mains or battery power.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_idle_rx,
{ "Receive On When Idle", "wpan.cinfo.idle_rx", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_IDLE_RX,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device can receive packets while idle or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_sec_capable,
{ "Security Capability", "wpan.cinfo.sec_capable", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_SEC_CAPABLE,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device is capable of receiving encrypted packets.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_alloc_addr,
{ "Allocate Address", "wpan.cinfo.alloc_addr", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_ALLOC_ADDR,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device wishes to use a 16-bit short address instead of its IEEE 802.15.4 64-bit long address.", HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
/* Association response fields */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_assoc_addr,
{ "Short Address", "wpan.asoc.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
Remove a linefeed from a field description. svn path=/trunk/; revision=24756
2008-03-29 20:47:12 +00:00
"The short address that the device should assume. An address of 0xfffe indicates that the device should use its IEEE 64-bit long address.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_assoc_status,
{ "Association Status", "wpan.assoc.status", FT_UINT8, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_disassoc_reason,
{ "Disassociation Reason", "wpan.disassoc.reason", FT_UINT8, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
/* Coordinator Realignment fields */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_pan,
{ "PAN ID", "wpan.realign.pan", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The PAN identifier the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_caddr,
{ "Coordinator Short Address", "wpan.realign.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The 16-bit address the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_channel,
{ "Logical Channel", "wpan.realign.channel", FT_UINT8, BASE_DEC, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The logical channel the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_addr,
{ "Short Address", "wpan.realign.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"A short-address that the orphaned device shall assume if applicable.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_channel_page,
{ "Channel Page", "wpan.realign.channel_page", FT_UINT8, BASE_DEC, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The logical channel page the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gtsreq_len,
{ "GTS Length", "wpan.gtsreq.length", FT_UINT8, BASE_DEC, NULL, IEEE802154_CMD_GTS_REQ_LEN,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Number of superframe slots the device is requesting.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gtsreq_dir,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "GTS Direction", "wpan.gtsreq.direction", FT_BOOLEAN, 8, TFS(&tfs_gtsreq_dir), IEEE802154_CMD_GTS_REQ_DIR,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The direction of traffic in the guaranteed timeslot.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gtsreq_type,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "Characteristic Type", "wpan.gtsreq.type", FT_BOOLEAN, 8, TFS(&tfs_gtsreq_type), IEEE802154_CMD_GTS_REQ_TYPE,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this request is to allocate or deallocate a timeslot.", HFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
/* Beacon Frame Specific Fields */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_beacon_order,
{ "Beacon Interval", "wpan.beacon_order", FT_UINT16, BASE_DEC, NULL, IEEE802154_BEACON_ORDER_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Specifies the transmission interval of the beacons.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_superframe_order,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Superframe Interval", "wpan.superframe_order", FT_UINT16, BASE_DEC, NULL,
IEEE802154_SUPERFRAME_ORDER_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Specifies the length of time the coordinator will interact with the PAN.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cap,
{ "Final CAP Slot", "wpan.cap", FT_UINT16, BASE_DEC, NULL, IEEE802154_SUPERFRAME_CAP_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Specifies the final superframe slot used by the CAP.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_superframe_battery_ext,
{ "Battery Extension", "wpan.battery_ext", FT_BOOLEAN, 16, NULL, IEEE802154_BATT_EXTENSION_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether transmissions may not extend past the length of the beacon frame.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_superframe_coord,
{ "PAN Coordinator", "wpan.bcn_coord", FT_BOOLEAN, 16, NULL, IEEE802154_SUPERFRAME_COORD_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this beacon frame is being transmitted by the PAN coordinator or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_assoc_permit,
{ "Association Permit", "wpan.assoc_permit", FT_BOOLEAN, 16, NULL, IEEE802154_ASSOC_PERMIT_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this PAN is accepting association requests or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gts_count,
{ "GTS Descriptor Count", "wpan.gts.count", FT_UINT8, BASE_DEC, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The number of GTS descriptors present in this beacon frame.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gts_permit,
{ "GTS Permit", "wpan.gts.permit", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether the PAN coordinator is accepting GTS requests or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gts_direction,
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
{ "Direction", "wpan.gts.direction", FT_BOOLEAN, BASE_NONE, TFS(&ieee802154_gts_direction_tfs), 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"A flag defining the direction of the GTS Slot.", HFILL }},
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
{ &hf_ieee802154_gts_address,
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
{ "Address", "wpan.gts.address", FT_UINT16, BASE_HEX, NULL, 0x0,
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
NULL, HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_pending16,
{ "Address", "wpan.pending16", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Device with pending data to receive.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_pending64,
Add FT_EUI64 Field Type * 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-05-08 10:23:53 +00:00
{ "Address", "wpan.pending64", FT_EUI64, BASE_NONE, NULL, 0x0,
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
"Device with pending data to receive.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
/* Auxiliary Security Header Fields */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
{ &hf_ieee802154_aux_security_header,
{ "Auxiliary Security Header", "wpan.aux_sec.hdr", FT_NONE, BASE_NONE, NULL,
0x0, "The Auxiliary Security Header of the frame", HFILL }},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
{ &hf_ieee802154_aux_sec_security_level,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Security Level", "wpan.aux_sec.sec_level", FT_UINT8, BASE_HEX, VALS(ieee802154_sec_level_names),
IEEE802154_AUX_SEC_LEVEL_MASK, "The Security Level of the frame", HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
{ &hf_ieee802154_aux_sec_security_control,
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-08-09 17:43:44 +00:00
{ "Security Control Field", "wpan.aux_sec.security_control_field", FT_UINT8, BASE_HEX, NULL,
0x0, NULL, HFILL }},
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
{ &hf_ieee802154_aux_sec_key_id_mode,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Key Identifier Mode", "wpan.aux_sec.key_id_mode", FT_UINT8, BASE_HEX, VALS(ieee802154_key_id_mode_names),
IEEE802154_AUX_KEY_ID_MODE_MASK,
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
"The scheme to use by the recipient to lookup the key in its key table", HFILL }},
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
{ &hf_ieee802154_aux_sec_frame_counter_suppression,
{ "Frame Counter Suppression", "wpan.aux_sec.frame_counter_suppression", FT_BOOLEAN, 8, NULL,
IEEE802154_AUX_FRAME_COUNTER_SUPPRESSION_MASK,
"Whether the frame counter is omitted from the Auxiliary Security Header", HFILL }},
{ &hf_ieee802154_aux_sec_asn_in_nonce,
{ "ASN in Nonce", "wpan.aux_sec.asn_in_nonce", FT_BOOLEAN, 8, NULL,
IEEE802154_AUX_ASN_IN_NONCE_MASK,
"Whether the ASN is used to generate the nonce instead of the frame counter", HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
{ &hf_ieee802154_aux_sec_reserved,
IEEE 802.15.4: Enable decryption and decode new aux header fields for v2015 Change guard that prevents decryption of v2015 to only check if frame counter suppression is not used. Add new aux header fields. Cleanups. Bug: 13805 Change-Id: Ib025e724415d7d7b85d63e2f44a37c7c691e9de6 Reviewed-on: https://code.wireshark.org/review/22165 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>
2017-06-16 11:22:56 +00:00
{ "Reserved", "wpan.aux_sec.reserved", FT_UINT8, BASE_HEX, NULL, IEEE802154_AUX_CTRL_RESERVED_MASK,
(Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL. svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
NULL, HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
{ &hf_ieee802154_aux_sec_frame_counter,
{ "Frame Counter", "wpan.aux_sec.frame_counter", FT_UINT32, BASE_DEC, NULL, 0x0,
"Frame counter of the originator of the protected frame", HFILL }},
{ &hf_ieee802154_aux_sec_key_source,
{ "Key Source", "wpan.aux_sec.key_source", FT_UINT64, BASE_HEX, NULL, 0x0,
"Key Source for processing of the protected frame", HFILL }},
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
{ &hf_ieee802154_aux_sec_key_source_bytes,
{ "Key Source", "wpan.aux_sec.key_source.bytes", FT_BYTES, BASE_NONE, NULL, 0x0,
"Key Source for processing of the protected frame", HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
{ &hf_ieee802154_aux_sec_key_index,
{ "Key Index", "wpan.aux_sec.key_index", FT_UINT8, BASE_HEX, NULL, 0x0,
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
"Key Index for processing of the protected frame", HFILL }},
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
{ &hf_ieee802154_mic,
{ "Decrypted MIC", "wpan.mic", FT_BYTES, BASE_NONE, NULL, 0x0,
"The Decrypted MIC", HFILL }},
{ &hf_ieee802154_key_number,
{ "Key Number", "wpan.key_number", FT_UINT8, BASE_DEC, NULL, 0x0,
"Key number used to decode", HFILL }},
/* IEEE 802.15.4-2003 Security Header Fields */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
{ &hf_ieee802154_sec_frame_counter,
{ "Frame Counter", "wpan.sec_frame_counter", FT_UINT32, BASE_HEX, NULL, 0x0,
"Frame counter of the originator of the protected frame (802.15.4-2003)", HFILL }},
{ &hf_ieee802154_sec_key_sequence_counter,
{ "Key Sequence Counter", "wpan.sec_key_sequence_counter", FT_UINT8, BASE_HEX, NULL, 0x0,
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
"Key Sequence counter of the originator of the protected frame (802.15.4-2003)", HFILL }},
/* ZBOSS dump */
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
{ &hf_zboss_page,
{ "Page", "wpan.zboss.page", FT_UINT8, BASE_DEC_HEX, VALS(zboss_page_names), 0xFE,
"IEEE802.15.4 page number", HFILL } },
{ &hf_zboss_channel,
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
{ "Channel", "wpan.zboss.channel", FT_UINT8, BASE_DEC, NULL, 0x0,
"Channel number", HFILL }},
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
{ &hf_zboss_direction,
{ "ZBOSS Direction", "wpan.zboss.direction", FT_UINT8, BASE_HEX, VALS(zboss_direction_names), 0x01,
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
"ZBOSS Packet Direction", HFILL }},
802.15.4: Improved ZBOSS header dissection. Implemented extraction of 802.15.4 page number information. Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955 Reviewed-on: https://code.wireshark.org/review/22040 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-06-08 14:18:21 +00:00
{ &hf_zboss_trace_number,
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
{ "Trace number", "wpan.zboss.trace", FT_UINT32, BASE_DEC, NULL, 0x0,
"Trace item number", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Subtrees */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static gint *ett[] = {
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
&ett_ieee802154_nonask_phy,
&ett_ieee802154_nonask_phy_phr,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
&ett_ieee802154,
&ett_ieee802154_fcf,
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
&ett_ieee802154_auxiliary_security,
&ett_ieee802154_aux_sec_control,
&ett_ieee802154_aux_sec_key_id,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
&ett_ieee802154_fcs,
&ett_ieee802154_cmd,
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
&ett_ieee802154_superframe,
&ett_ieee802154_gts,
&ett_ieee802154_gts_direction,
&ett_ieee802154_gts_descriptors,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
&ett_ieee802154_pendaddr,
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
&ett_ieee802154_header_ies,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
&ett_ieee802154_header_ie,
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
&ett_ieee802154_header_ie_tlv,
&ett_ieee802154_hie_unsupported,
&ett_ieee802154_hie_time_correction,
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
&ett_ieee802154_hie_ht,
IEEE 802.15.4: Support for CSL Header IE Change-Id: Ibda1f0757401566170459570e1138ac3dc3e5101 Reviewed-on: https://code.wireshark.org/review/22421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-27 15:07:53 +00:00
&ett_ieee802154_hie_csl,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
&ett_ieee802154_payload_ie,
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
&ett_ieee802154_payload_ie_tlv,
&ett_ieee802154_pie_termination,
&ett_ieee802154_pie_vendor,
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
&ett_ieee802159_mpx,
&ett_ieee802159_mpx_transaction_control,
IEEE 802.15.4: Revise Payload IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. More consistent display. Use dedicated HFs and ETTs. More consistent code with fewer casts. Add warning if IE dissection consumes less content than the indicated length. Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861 Reviewed-on: https://code.wireshark.org/review/22577 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: Anders Broman <a.broman58@gmail.com>
2017-07-10 13:39:58 +00:00
&ett_ieee802154_pie_ietf,
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
&ett_ieee802154_pie_unsupported,
ieee802154: Refactor payload IE dissection - Create explicit display filter - Adding reference to the IEEE 802.15.4 standard - extract dissect_802154_enhanced_beacon_filter - Explicit case of header termination - Fix typo - Add some cast Change-Id: I21c5b9eb46c72a377f17113ae729c6aeb79e5d2b Reviewed-on: https://code.wireshark.org/review/21361 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-04-27 08:56:40 +00:00
&ett_ieee802154_tsch_timeslot,
&ett_ieee802154_tsch_synch,
&ett_ieee802154_channel_hopping,
&ett_ieee802154_mlme,
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch. This patch shows the Information Elements (IE) defined by the IEEE802.15.4. It dissects the information of those IE which are used by the IETF WG 6tisch and announces the others. Here the list of the fully dissected ones: - For the header IEs: - Time Correction. - Header Termination 1. - Header Termination 2. - For the payload IEs: - MLME: - Nested Shorts: - TSCH Synchronization IE. - TSCH Timeslot IE. - TSCH Slotframe and Link IE. - Nested Longs: - Channel Hopping IE. - Payload Termination IE. For the rest of the IEs defined in the standart, this patch shows them but does not analyze their inner fields. References: https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/ IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs). Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4 Reviewed-on: https://code.wireshark.org/review/16671 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-07-05 15:13:14 +00:00
&ett_ieee802154_mlme_payload,
&ett_ieee802154_mlme_payload_data,
802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE Minimal support has been added for the MLME Payload IE and the Enhanced Beacon Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it easy to add dissection for specific applications once this is known. Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b Reviewed-on: https://code.wireshark.org/review/13999 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>
2016-02-19 02:23:13 +00:00
&ett_ieee802154_psie_short,
&ett_ieee802154_psie_short_bitmap,
&ett_ieee802154_psie_long,
&ett_ieee802154_psie_long_bitmap,
&ett_ieee802154_psie_enh_beacon_flt,
&ett_ieee802154_psie_enh_beacon_flt_bitmap,
ieee802154: handle multiple slotframe descriptors properly Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 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-10-28 19:47:38 +00:00
&ett_ieee802154_psie_slotframe_link_slotframes,
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
&ett_ieee802154_zigbee,
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
&ett_ieee802154_zboss,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
&ett_ieee802154_p_ie_6top,
&ett_ieee802154_p_ie_6top_cell_options,
&ett_ieee802154_p_ie_6top_cell_list,
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
&ett_ieee802154_p_ie_6top_rel_cell_list,
&ett_ieee802154_p_ie_6top_cand_cell_list,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
&ett_ieee802154_p_ie_6top_cell
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static ei_register_info ei[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &ei_ieee802154_invalid_addressing, { "wpan.invalid_addressing", PI_MALFORMED, PI_WARN,
"Invalid Addressing", EXPFILL }},
Fix expert_info errors found by new and improved checkhfs.pl. Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-04 03:45:10 +00:00
#if 0
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &ei_ieee802154_invalid_panid_compression, { "wpan.invalid_panid_compression", PI_MALFORMED, PI_ERROR,
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
"Invalid Setting for PAN ID Compression", EXPFILL }},
Fix expert_info errors found by new and improved checkhfs.pl. Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-04 03:45:10 +00:00
#endif
802.15.4 update handling of PAN ID Compression to 802.15.4-2015 Handling of PAN IDs in 802.15.4 has changed dramatically in 802.15.4-2015, particularly with respect to the new Frame Version 2 (0b10) frames. This update streamlines the logic in an attempt to follow the spec as closely as possible. In doing so it fixes some logical errors in the previous version Change-Id: I1a2f112bbcdeb24a605167578201494823485c47 Reviewed-on: https://code.wireshark.org/review/14167 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-03-01 23:43:55 +00:00
{ &ei_ieee802154_invalid_panid_compression2, { "wpan.seqno_supression_fv2_invalid", PI_MALFORMED, PI_WARN,
"Invalid Pan ID Compression and addressing combination for Frame Version 2", EXPFILL }},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &ei_ieee802154_dst, { "wpan.dst_invalid", PI_MALFORMED, PI_ERROR,
"Invalid Destination Address Mode", EXPFILL }},
{ &ei_ieee802154_src, { "wpan.src_invalid", PI_MALFORMED, PI_ERROR,
"Invalid Source Address Mode", EXPFILL }},
{ &ei_ieee802154_frame_ver, { "wpan.frame_version_unknown", PI_MALFORMED, PI_ERROR,
"Frame Version Unknown Cannot Dissect", EXPFILL }},
Fix expert_info errors found by new and improved checkhfs.pl. Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-04 03:45:10 +00:00
#if 0
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &ei_ieee802154_frame_type, { "wpan.frame_type_unknown", PI_MALFORMED, PI_ERROR,
"Frame Type Unknown Cannot Dissect", EXPFILL }},
Fix expert_info errors found by new and improved checkhfs.pl. Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-04 03:45:10 +00:00
#endif
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &ei_ieee802154_decrypt_error, { "wpan.decrypt_error", PI_UNDECODED, PI_WARN,
"Decryption error", EXPFILL }},
{ &ei_ieee802154_fcs, { "wpan.fcs.bad", PI_CHECKSUM, PI_WARN,
"Bad FCS", EXPFILL }},
{ &ei_ieee802154_seqno_suppression, { "wpan.seqno_supression_invalid", PI_MALFORMED, PI_WARN,
"Sequence Number Suppression invalid for 802.15.4-2003 and 2006", EXPFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &ei_ieee802154_6top_unsupported_type, { "wpan.6top_unsupported_type", PI_PROTOCOL, PI_WARN,
ieee802154: support 6top protocol (6P) draft-03 - support draft-ietf-6tisch-6top-protocol-03 - rename variables and constants to reflect the protocol hierarchy - show 6P specific information in the "Protocol" and "Info" column - cleanup Bug: 13136 Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f Reviewed-on: https://code.wireshark.org/review/18824 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>
2016-11-14 22:47:51 +00:00
"Unsupported Type of Message", EXPFILL }},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &ei_ieee802154_6top_unsupported_command, { "wpan.6top_unsupported_command", PI_PROTOCOL, PI_WARN,
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
"Unsupported 6top command", EXPFILL }},
ieee802154: Time correction IE: Fix and add micro-second value Change-Id: I52a22e7cfd8c0d5c054435678c891a3e1d0505b2 Reviewed-on: https://code.wireshark.org/review/20547 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>
2017-03-07 13:32:22 +00:00
{ &ei_ieee802154_time_correction_error, { "wpan.time_correction.error", PI_PROTOCOL, PI_WARN,
"Incorrect value. Reference: IEEE-802.15.4-2015. Table 7-8: Values of the Time Sync Info field for ACK with timing Information", EXPFILL}},
Simplify filter and 6Top commands - Change internal variables to have shorter and explicit name - Add extra item to perform filtering Change-Id: I84a55540d552ffba6c935eb0bc2d24b7859be1b6 Reviewed-on: https://code.wireshark.org/review/20928 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-03-20 14:39:31 +00:00
{ &ei_ieee802154_6top_unsupported_return_code, { "wpan.6top_unsupported_code", PI_PROTOCOL, PI_WARN,
ieee802154: support 6top protocol (6P) draft-07 - support draft-ietf-6tisch-6top-protocol-07 - replace proto_tree_add_subtree_format() to make manageable JSON output - use constant values defined for the 1st F-Interop 6TiSCH Interop Event Bug: 13868 Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082 Reviewed-on: https://code.wireshark.org/review/22500 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-27 12:51:10 +00:00
"Unsupported 6top return code", EXPFILL }},
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
{ &ei_ieee802154_ie_unsupported_id, { "wpan.ie_unsupported_id", PI_PROTOCOL, PI_WARN,
"Unsupported IE ID", EXPFILL }},
IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-06-23 21:59:16 +00:00
{ &ei_ieee802154_ie_unknown_extra_content, { "wpan.ie_unknown_extra_content", PI_PROTOCOL, PI_WARN,
"Unexpected extra content for IE", EXPFILL }},
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
{ &ei_ieee802159_mpx_invalid_transfer_type, { "wpan.payload_ie.mpx.invalid_transfer_type", PI_PROTOCOL, PI_WARN,
"Invalid transfer type (cf. IEEE 802.15.9 Table 19)", EXPFILL }},
{ &ei_ieee802159_mpx_unsupported_kmp, { "wpan.payload_ie.mpx.invalid_transfer_type", PI_PROTOCOL, PI_WARN,
"Unsupported KMP ID", EXPFILL }},
{ &ei_ieee802159_mpx_unknown_kmp, { "wpan.payload_ie.mpx.invalid_transfer_type", PI_PROTOCOL, PI_WARN,
"Unknown KMP ID (cf. IEEE 802.15.9 Table 21)", EXPFILL }},
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
};
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Preferences. */
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
module_t *ieee802154_module;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_module_t* expert_ieee802154;
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
static uat_field_t addr_uat_flds[] = {
UAT_FLD_HEX(addr_uat,addr16,"Short Address",
"16-bit short address in hexadecimal."),
UAT_FLD_HEX(addr_uat,pan,"PAN Identifier",
"16-bit PAN identifier in hexadecimal."),
UAT_FLD_BUFFER(addr_uat,eui64,"EUI-64",
"64-bit extended unique identifier."),
UAT_END_FIELDS
};
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
static uat_field_t key_uat_flds[] = {
UAT_FLD_CSTRING(key_uat,pref_key,"Decryption key",
"128-bit decryption key in hexadecimal format"),
UAT_FLD_DEC(key_uat,key_index,"Decryption key index",
"Key index in decimal format"),
UAT_FLD_VS(key_uat, hash_type, "Key hash", ieee802154_key_hash_vals, "Specifies which hash scheme is used to derived the key"),
UAT_END_FIELDS
};
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
static build_valid_func ieee802154_da_build_value[1] = {ieee802154_da_value};
static decode_as_value_t ieee802154_da_values = {ieee802154_da_prompt, 1, ieee802154_da_build_value};
static decode_as_t ieee802154_da = {
IEEE802154_PROTOABBREV_WPAN, "PAN", IEEE802154_PROTOABBREV_WPAN_PANID,
1, 0, &ieee802154_da_values, NULL, NULL,
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL
};
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Register the init routine. */
register_init_routine(proto_init_ieee802154);
Split more init routines into init/cleanup functions This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28 13:15:07 +00:00
register_cleanup_routine(proto_cleanup_ieee802154);
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register Protocol name and description. */
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_ieee802154 = proto_register_protocol("IEEE 802.15.4 Low-Rate Wireless PAN", "IEEE 802.15.4",
IEEE802154_PROTOABBREV_WPAN);
proto_ieee802154_nonask_phy = proto_register_protocol("IEEE 802.15.4 Low-Rate Wireless PAN non-ASK PHY",
"IEEE 802.15.4 non-ASK PHY", "wpan-nonask-phy");
ZigBee: ZBOSS v2 traffic dump dissector. Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-20 10:02:53 +00:00
proto_zboss = proto_register_protocol("ZBOSS IEEE 802.15.4 dump",
"ZBOSS dump", "wpan-zboss");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register header fields and subtrees. */
proto_register_field_array(proto_ieee802154, hf, array_length(hf));
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
proto_register_field_array(proto_ieee802154, hf_phy, array_length(hf_phy));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
proto_register_subtree_array(ett, array_length(ett));
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_ieee802154 = expert_register_protocol(proto_ieee802154);
expert_register_field_array(expert_ieee802154, ei, array_length(ei));
Add "column filter string" support to address types. Information about dissector (filter) fields should be kept in a dissector as much as possible. Supporting "column filter string" also allows other dissectors to create their own "address types" with different column filters (because AT_ETHER isn't always an "Ethernet" address). This feature also allowed a few "dissector specific" address types to be moved to their own dissector. Change-Id: Ie9024af4db62bc2ee4f8c9d28a1d807f706f45bf Ping-Bug:7728 Reviewed-on: https://code.wireshark.org/review/7029 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-02-08 18:49:57 +00:00
ieee802_15_4_short_address_type = address_type_dissector_register("AT_IEEE_802_15_4_SHORT", "IEEE 802.15.4 16-bit short address",
Add address_to_bytes API. 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-22 02:23:05 +00:00
ieee802_15_4_short_address_to_str, ieee802_15_4_short_address_str_len, NULL, NULL, ieee802_15_4_short_address_len, NULL, NULL);
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
/* add a user preference to set the 802.15.4 ethertype */
Rename address_to_str() to ep_address_to_str() because: 1) This indicates that the string has ephemeral lifetime 2) More consistent with its existing seasonal counterpart, se_address_to_str(). svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
ieee802154_module = prefs_register_protocol(proto_ieee802154,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_reg_handoff_ieee802154);
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
prefs_register_uint_preference(ieee802154_module, "802154_ethertype",
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
"802.15.4 Ethertype (in hex)",
"(Hexadecimal) Ethertype used to indicate IEEE 802.15.4 frame.",
16, &ieee802154_ethertype);
prefs_register_bool_preference(ieee802154_module, "802154_cc24xx",
"TI CC24xx FCS format",
"Set if the FCS field is in TI CC24xx format.",
&ieee802154_cc24xx);
Fix for bug 4076: Have the option to continue dissection of data even with failed FCS check. svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
prefs_register_bool_preference(ieee802154_module, "802154_fcs_ok",
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
"Dissect only good FCS",
"Dissect payload only if FCS is valid.",
Fix for bug 4076: Have the option to continue dissection of data even with failed FCS check. svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
&ieee802154_fcs_ok);
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Create a UAT for static address mappings. */
static_addr_uat = uat_new("Static Addresses",
sizeof(static_addr_t), /* record size */
"802154_addresses", /* filename */
TRUE, /* from_profile */
Fix all -fstrict-alias warnings found by gcc 4.1.2 The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-30 17:43:52 +00:00
&static_addrs, /* data_ptr */
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
&num_static_addrs, /* numitems_ptr */
UATs could be put into "categories". The categories were defined only implicitly by the #define name and string they were defined to; not all UATs neatly fit into any of the categories, so some of them were put into categories that weren't obviously correct for them, and one - the display filter macro UAT - wasn't put into any category at all (which caused crashes when editing them, as the GUI code that handled UAT changes from a dialog assumed the category field was non-null). The category was, in practice, used only to decide, in the aforementioned GUI code, whether the packet summary pane needed to be updated or not. It also offered no option of "don't update the packet summary pane *and* don't redissect anything", which is what would be appropriate for the display filter macro UAT. Replace the category with a set of fields indicating what the UAT affects; we currently offer "dissection", which applies to most UATs (any UAT in libwireshark presumably affects dissection at a minimum) and "the set of named fields that exist". Changing any UAT that affects dissection requires a redissection; changing any UAT that affects the set of named fields that exist requires a redissection *and* rebuilding the packet summary pane. Perhaps we also need "filtering", so that if you change a display filter macro, we re-filter, in case the display is currently filtered with a display filter that uses a macro that changed. svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
NULL, /* help */
NULL, /* copy callback */
addr_uat_update_cb, /* update callback */
NULL, /* free callback */
NULL, /* post update callback */
uat: add a reset callback. This function will free the resources allocated by the caller. Change-Id: Ib486c14e4fd3c321662fb71f7fd06733ce9a64a4 Reviewed-on: https://code.wireshark.org/review/19375 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-21 10:50:47 +00:00
NULL, /* reset callback */
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
addr_uat_flds); /* UAT field definitions */
prefs_register_uat_preference(ieee802154_module, "static_addr",
"Static Addresses",
"A table of static address mappings between 16-bit short addressing and EUI-64 addresses",
static_addr_uat);
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* Create a UAT for key management. */
ieee802154_key_uat = uat_new("Keys",
sizeof(ieee802154_key_t), /* record size */
"ieee802154_keys", /* filename */
TRUE, /* from_profile */
&ieee802154_keys, /* data_ptr */
&num_ieee802154_keys, /* numitems_ptr */
UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
NULL, /* help */
ieee802154_key_copy_cb, /* copy callback */
ieee802154_key_update_cb, /* update callback */
ieee802154_key_free_cb, /* free callback */
ieee802154_key_post_update_cb, /* post update callback */
NULL, /* reset callback */
key_uat_flds); /* UAT field definitions */
prefs_register_uat_preference(ieee802154_module, "ieee802154_keys",
"Decryption Keys",
"Decryption key configuration data",
ieee802154_key_uat);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Register preferences for a decryption key */
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
prefs_register_obsolete_preference(ieee802154_module, "802154_key");
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
prefs_register_enum_preference(ieee802154_module, "802154_sec_suite",
"Security Suite (802.15.4-2003)",
"Specifies the security suite to use for 802.15.4-2003 secured frames"
" (only supported suites are listed). Option ignored for 802.15.4-2006"
" and unsecured frames.",
&ieee802154_sec_suite, ieee802154_2003_sec_suite_enums, FALSE);
prefs_register_bool_preference(ieee802154_module, "802154_extend_auth",
"Extend authentication data (802.15.4-2003)",
"Set if the manufacturer extends the authentication data with the"
" security header. Option ignored for 802.15.4-2006 and unsecured frames.",
&ieee802154_extend_auth);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register the subdissector list */
Don't do any Decode As stuff for dissector tables not used with Decode As. Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 22:51:54 +00:00
panid_dissector_table = register_dissector_table(IEEE802154_PROTOABBREV_WPAN_PANID, "IEEE 802.15.4 PANID", proto_ieee802154, FT_UINT16, BASE_HEX);
Associate dissector tables and heuristic subdissector lists with a protocol. This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-13 11:51:45 +00:00
ieee802154_heur_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN, proto_ieee802154);
ieee802154_beacon_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN_BEACON, proto_ieee802154);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/* Register dissector tables for IEs */
header_ie_dissector_table = register_dissector_table(IEEE802154_HEADER_IE_DTABLE, "IEEE 802.15.4 Header IEs", proto_ieee802154, FT_UINT8, BASE_HEX);
payload_ie_dissector_table = register_dissector_table(IEEE802154_PAYLOAD_IE_DTABLE, "IEEE 802.15.4 Payload IEs", proto_ieee802154, FT_UINT8, BASE_HEX);
More ethereal --> wireshark svn path=/trunk/; revision=27994
2009-04-08 13:07:21 +00:00
/* Register dissectors with Wireshark. */
Dissectors don't need a journey of self discovery. They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 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-12-17 01:06:11 +00:00
ieee802154_handle = register_dissector(IEEE802154_PROTOABBREV_WPAN, dissect_ieee802154, proto_ieee802154);
ieee802154_nofcs_handle = register_dissector("wpan_nofcs", dissect_ieee802154_nofcs, proto_ieee802154);
new_register_dissector -> register_dissector for dissector directory. 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-12-09 04:04:01 +00:00
register_dissector("wpan_cc24xx", dissect_ieee802154_cc24xx, proto_ieee802154);
Dissectors don't need a journey of self discovery. They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 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-12-17 01:06:11 +00:00
ieee802154_nonask_phy_handle = register_dissector("wpan-nonask-phy", dissect_ieee802154_nonask_phy, proto_ieee802154_nonask_phy);
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE 802.15.4: Add support for Thread, MLE and ZigBee IP Enhancements to security processing add support for Thread, MLE and ZigBee IP. Thread and ZigBee IP use a hash for key derivation for MAC and MLE security processing. Thread additionally uses a sequence counter. Ping-Bug: 13495 Change-Id: Ib8351b21e5615cd44880f5126f59fd0dc0a11742 Reviewed-on: https://code.wireshark.org/review/20585 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-17 11:52:27 +00:00
/* setup registration for other dissectors to provide mac key hash algorithms */
mac_key_hash_handlers = wmem_tree_new(wmem_epan_scope());
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/* Register a Decode-As handler. */
register_decode_as(&ieee802154_da);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* proto_register_ieee802154 */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Registers the IEEE 802.15.4 dissector with Wireshark.
* Will be called every time 'apply' is pressed in the preferences menu.
* as well as during Wireshark initialization
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*/
void proto_reg_handoff_ieee802154(void)
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
static gboolean prefs_initialized = FALSE;
static unsigned int old_ieee802154_ethertype;
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
IEEE 802.15.4: Whitespace and small comment cleanups No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-06-28 08:17:02 +00:00
if (!prefs_initialized) {
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
/* Get the dissector handles. */
802.15.4 added support for the new ZigBee IEs ZigBee has added new 802.15.4 Information Elements, defined in Annex D.8 of ZigBee Specification R22. Specifically this is the Enhanced Beacon Payload IE, TX Power, and Rejoin IEs. Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d Reviewed-on: https://code.wireshark.org/review/14547 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21 22:41:10 +00:00
zigbee_beacon_handle = find_dissector_add_dependency("zbee_beacon", proto_ieee802154);
802.15.4 fixed support for new ZigBee IEs 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-13 00:31:33 +00:00
zigbee_ie_handle = find_dissector_add_dependency("zbee_ie", proto_ieee802154);
ZigBee: decode ZBOSS traffic dump and Interpan frames as ZigBee. 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-15 16:45:50 +00:00
zigbee_nwk_handle = find_dissector("zbee_nwk");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Rename the routines that handle dissector tables with unsigned integer 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-12-20 05:35:29 +00:00
dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4, ieee802154_handle);
dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NONASK_PHY, ieee802154_nonask_phy_handle);
dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NOFCS, ieee802154_nofcs_handle);
From Sascha Herrmann: Patch registering ieee802154 dissector to Linux SLL frames. svn path=/trunk/; revision=47649
2013-02-13 07:16:14 +00:00
dissector_add_uint("sll.ltype", LINUX_SLL_P_IEEE802154, ieee802154_handle);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
prefs_initialized = TRUE;
} else {
Rename the routines that handle dissector tables with unsigned integer 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-12-20 05:35:29 +00:00
dissector_delete_uint("ethertype", old_ieee802154_ethertype, ieee802154_handle);
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
}
old_ieee802154_ethertype = ieee802154_ethertype;
Rename address_to_str() to ep_address_to_str() because: 1) This indicates that the string has ephemeral lifetime 2) More consistent with its existing seasonal counterpart, se_address_to_str(). svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register dissector handles. */
Rename the routines that handle dissector tables with unsigned integer 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-12-20 05:35:29 +00:00
dissector_add_uint("ethertype", ieee802154_ethertype, ieee802154_handle);
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
IEEE 802.15.4: dissector tables for Information Elements Rationale: The IEs are a generic mechanism that allows higher level protocols to transport additional data in the header and some IDs have already been assigned to external organisations. Using dissector tables enable looser coupling. Refactor existing internal IE dissectors to be called via the table as well based on a suggestion by Michael Mann. More consistent display and code for Header IEs and Payload IEs. Change-Id: Ib9c225245fc8dd989200d6ff6aeae8ca5c0f792c Reviewed-on: https://code.wireshark.org/review/22600 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>
2017-07-12 09:31:26 +00:00
/* Register internal IE handlers */
dissector_add_uint(IEEE802154_HEADER_IE_DTABLE, IEEE802154_HEADER_IE_TIME_CORR, create_dissector_handle(dissect_hie_time_correction, -1));
dissector_add_uint(IEEE802154_HEADER_IE_DTABLE, IEEE802154_HEADER_IE_CSL, create_dissector_handle(dissect_hie_csl, -1));
dissector_add_uint(IEEE802154_PAYLOAD_IE_DTABLE, IEEE802154_PAYLOAD_IE_MLME, create_dissector_handle(dissect_pie_mlme, -1));
dissector_add_uint(IEEE802154_PAYLOAD_IE_DTABLE, IEEE802154_PAYLOAD_IE_VENDOR, create_dissector_handle(dissect_pie_vendor, -1));
dissector_add_uint(IEEE802154_PAYLOAD_IE_DTABLE, IEEE802154_PAYLOAD_IE_MPX, create_dissector_handle(dissect_mpx_ie, -1));
dissector_add_uint(IEEE802154_PAYLOAD_IE_DTABLE, IEEE802154_PAYLOAD_IE_IETF, create_dissector_handle(dissect_ietf_ie, -1));
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9 Still open: Reassembly and support for KMP payload dissection besides EAPOL Bug: 13883 Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70 Reviewed-on: https://code.wireshark.org/review/22597 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>
2017-07-11 09:32:22 +00:00
/* For the MPX-IE */
ethertype_table = find_dissector_table("ethertype");
eapol_handle = find_dissector("eapol");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* proto_reg_handoff_ieee802154 */
ieee802154: add modelines info Change-Id: Ieaa9b9db97cd1753e3c395f19ae005c4df1bee3a Reviewed-on: https://code.wireshark.org/review/20394 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-05 15:46:07 +00:00
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/