802.15.4 added new ZigBee R22 status codes

Change-Id: I4708a3a08317c9799216d4045d0ccbea9dbe268f
Reviewed-on: https://code.wireshark.org/review/14908
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 264 insertions, 262 deletions

diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h
index d595508b6b..1d96f22563 100644
--- a/epan/dissectors/packet-zbee-zdp.h
+++ b/epan/dissectors/packet-zbee-zdp.h
@@ -26,167 +26,170 @@
 #define PACKET_ZBEE_ZDP_H
 
 /* The Profile ID for the ZigBee Device Profile. */
-#define ZBEE_ZDP_PROFILE        0x0000
+#define ZBEE_ZDP_PROFILE                          0x0000
 
 /* ZDP Cluster Identifiers. */
-#define ZBEE_ZDP_REQ_NWK_ADDR               0x0000
-#define ZBEE_ZDP_REQ_IEEE_ADDR              0x0001
-#define ZBEE_ZDP_REQ_NODE_DESC              0x0002
-#define ZBEE_ZDP_REQ_POWER_DESC             0x0003
-#define ZBEE_ZDP_REQ_SIMPLE_DESC            0x0004
-#define ZBEE_ZDP_REQ_ACTIVE_EP              0x0005
-#define ZBEE_ZDP_REQ_MATCH_DESC             0x0006
-#define ZBEE_ZDP_REQ_COMPLEX_DESC           0x0010
-#define ZBEE_ZDP_REQ_USER_DESC              0x0011
-#define ZBEE_ZDP_REQ_DISCOVERY_CACHE        0x0012
-#define ZBEE_ZDP_REQ_DEVICE_ANNCE           0x0013
-#define ZBEE_ZDP_REQ_SET_USER_DESC          0x0014
-#define ZBEE_ZDP_REQ_SYSTEM_SERVER_DISC     0x0015  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_STORE_DISCOVERY        0x0016  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_STORE_NODE_DESC        0x0017  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_STORE_POWER_DESC       0x0018  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_STORE_ACTIVE_EP        0x0019  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_STORE_SIMPLE_DESC      0x001a  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_REMOVE_NODE_CACHE      0x001b  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_FIND_NODE_CACHE        0x001c  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_EXT_SIMPLE_DESC        0x001d  /* ZigBee 2007 & later. */
-#define ZBEE_ZDP_REQ_EXT_ACTIVE_EP          0x001e  /* ZigBee 2007 & later. */
-#define ZBEE_ZDP_REQ_PARENT_ANNCE           0x001f  /* r21 */
-#define ZBEE_ZDP_REQ_END_DEVICE_BIND        0x0020
-#define ZBEE_ZDP_REQ_BIND                   0x0021
-#define ZBEE_ZDP_REQ_UNBIND                 0x0022
-#define ZBEE_ZDP_REQ_BIND_REGISTER          0x0023  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_REPLACE_DEVICE         0x0024  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_STORE_BAK_BIND_ENTRY   0x0025  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_REMOVE_BAK_BIND_ENTRY  0x0026  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_BACKUP_BIND_TABLE      0x0027  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_RECOVER_BIND_TABLE     0x0028  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_BACKUP_SOURCE_BIND     0x0029  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_RECOVER_SOURCE_BIND    0x002a  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_MGMT_NWK_DISC          0x0030
-#define ZBEE_ZDP_REQ_MGMT_LQI               0x0031
-#define ZBEE_ZDP_REQ_MGMT_RTG               0x0032
-#define ZBEE_ZDP_REQ_MGMT_BIND              0x0033
-#define ZBEE_ZDP_REQ_MGMT_LEAVE             0x0034
-#define ZBEE_ZDP_REQ_MGMT_DIRECT_JOIN       0x0035
-#define ZBEE_ZDP_REQ_MGMT_PERMIT_JOIN       0x0036  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_MGMT_CACHE             0x0037  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_REQ_MGMT_NWKUPDATE         0x0038  /* ZigBee 2007 & later. */
-
-#define ZBEE_ZDP_RSP_NWK_ADDR               0x8000
-#define ZBEE_ZDP_RSP_IEEE_ADDR              0x8001
-#define ZBEE_ZDP_RSP_NODE_DESC              0x8002
-#define ZBEE_ZDP_RSP_POWER_DESC             0x8003
-#define ZBEE_ZDP_RSP_SIMPLE_DESC            0x8004
-#define ZBEE_ZDP_RSP_ACTIVE_EP              0x8005
-#define ZBEE_ZDP_RSP_MATCH_DESC             0x8006
-#define ZBEE_ZDP_RSP_COMPLEX_DESC           0x8010
-#define ZBEE_ZDP_RSP_USER_DESC              0x8011
-#define ZBEE_ZDP_RSP_DISCOVERY_CACHE        0x8012
-#define ZBEE_ZDP_RSP_CONF_USER_DESC         0x8014  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_SYSTEM_SERVER_DISC     0x8015  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_STORE_DISCOVERY        0x8016  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_STORE_NODE_DESC        0x8017  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_STORE_POWER_DESC       0x8018  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_STORE_ACTIVE_EP        0x8019  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_STORE_SIMPLE_DESC      0x801a  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_REMOVE_NODE_CACHE      0x801b  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_FIND_NODE_CACHE        0x801c  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_EXT_SIMPLE_DESC        0x801d  /* ZigBee 2007 & later. */
-#define ZBEE_ZDP_RSP_EXT_ACTIVE_EP          0x801e  /* ZigBee 2007 & later. */
-#define ZBEE_ZDP_RSP_END_DEVICE_BIND        0x8020
-#define ZBEE_ZDP_RSP_BIND                   0x8021
-#define ZBEE_ZDP_RSP_UNBIND                 0x8022
-#define ZBEE_ZDP_RSP_BIND_REGISTER          0x8023  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_REPLACE_DEVICE         0x8024  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_STORE_BAK_BIND_ENTRY   0x8025  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_REMOVE_BAK_BIND_ENTRY  0x8026  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_BACKUP_BIND_TABLE      0x8027  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_RECOVER_BIND_TABLE     0x8028  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_BACKUP_SOURCE_BIND     0x8029  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_RECOVER_SOURCE_BIND    0x802a  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_MGMT_NWK_DISC          0x8030
-#define ZBEE_ZDP_RSP_MGMT_LQI               0x8031
-#define ZBEE_ZDP_RSP_MGMT_RTG               0x8032
-#define ZBEE_ZDP_RSP_MGMT_BIND              0x8033
-#define ZBEE_ZDP_RSP_MGMT_LEAVE             0x8034
-#define ZBEE_ZDP_RSP_MGMT_DIRECT_JOIN       0x8035
-#define ZBEE_ZDP_RSP_MGMT_PERMIT_JOIN       0x8036  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_MGMT_CACHE             0x8037  /* ZigBee 2006 & later. */
-#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE         0x8038  /* ZigBee 2007 & later. */
-
-#define ZBEE_ZDP_MSG_RESPONSE_BIT           0x8000
-#define ZBEE_ZDP_MSG_MASK                   (ZBEE_ZDP_MSG_RESPONSE_BIT-1)
-#define ZBEE_ZDP_MSG_RESPONSE_BIT_2003      0x0080
-#define ZBEE_ZDP_MSG_MASK_2003              (ZBEE_ZDP_MSG_RESPONSE_BIT_2003-1)
-
-#define ZBEE_ZDP_STATUS_SUCCESS             0x00
-#define ZBEE_ZDP_STATUS_INV_REQUESTTYPE     0x80
-#define ZBEE_ZDP_STATUS_DEVICE_NOT_FOUND    0x81
-#define ZBEE_ZDP_STATUS_INVALID_EP          0x82
-#define ZBEE_ZDP_STATUS_NOT_ACTIVE          0x83
-#define ZBEE_ZDP_STATUS_NOT_SUPPORTED       0x84
-#define ZBEE_ZDP_STATUS_TIMEOUT             0x85
-#define ZBEE_ZDP_STATUS_NO_MATCH            0x86
-#define ZBEE_ZDP_STATUS_NO_ENTRY            0x88
-#define ZBEE_ZDP_STATUS_NO_DESCRIPTOR       0x89
-#define ZBEE_ZDP_STATUS_INSUFFICIENT_SPACE  0x8a
-#define ZBEE_ZDP_STATUS_NOT_PERMITTED       0x8b
-#define ZBEE_ZDP_STATUS_TABLE_FULL          0x8c
-
-#define ZBEE_ZDP_REQ_TYPE_SINGLE            0x00
-#define ZBEE_ZDP_REQ_TYPE_EXTENDED          0x01
-
-#define ZBEE_ZDP_NODE_TYPE                  0x0007
-#define ZBEE_ZDP_NODE_TYPE_COORD            0x0000
-#define ZBEE_ZDP_NODE_TYPE_FFD              0x0001
-#define ZBEE_ZDP_NODE_TYPE_RFD              0x0002
-#define ZBEE_ZDP_NODE_COMPLEX               0x0008
-#define ZBEE_ZDP_NODE_USER                  0x0010
-#define ZBEE_ZDP_NODE_APS                   0x0700
-#define ZBEE_ZDP_NODE_FREQ                  0xf800
-#define ZBEE_ZDP_NODE_FREQ_868MHZ           0x0800
-#define ZBEE_ZDP_NODE_FREQ_900MHZ           0x2000
-#define ZBEE_ZDP_NODE_FREQ_2400MHZ          0x4000
-
-#define ZBEE_ZDP_NODE_SERVER_PRIMARY_TRUST  0x0001
-#define ZBEE_ZDP_NODE_SERVER_BACKUP_TRUST   0x0002
-#define ZBEE_ZDP_NODE_SERVER_PRIMARY_BIND   0x0004
-#define ZBEE_ZDP_NODE_SERVER_BACKUP_BIND    0x0008
-#define ZBEE_ZDP_NODE_SERVER_PRIMARY_DISC   0x0010
-#define ZBEE_ZDP_NODE_SERVER_BACKUP_DISC    0x0020
-#define ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV 0xff00
-
-#define ZBEE_ZDP_POWER_MODE                 0x000f
-#define ZBEE_ZDP_POWER_MODE_RX_ON           0x0000
-#define ZBEE_ZDP_POWER_MODE_RX_PERIODIC     0x0001
-#define ZBEE_ZDP_POWER_MODE_RX_STIMULATE    0x0002
-#define ZBEE_ZDP_POWER_AVAIL                0x00f0
-#define ZBEE_ZDP_POWER_AVAIL_AC             0x0010
-#define ZBEE_ZDP_POWER_AVAIL_RECHARGEABLE   0x0020
-#define ZBEE_ZDP_POWER_AVAIL_DISPOSEABLE    0x0040
-#define ZBEE_ZDP_POWER_SOURCE               0x0f00
-#define ZBEE_ZDP_POWER_SOURCE_AC            0x0100
-#define ZBEE_ZDP_POWER_SOURCE_RECHARGEABLE  0x0200
-#define ZBEE_ZDP_POWER_SOURCE_DISPOSEABLE   0x0400
-#define ZBEE_ZDP_POWER_LEVEL                0xf000
-#define ZBEE_ZDP_POWER_LEVEL_FULL           0xc000
-#define ZBEE_ZDP_POWER_LEVEL_OK             0x8000
-#define ZBEE_ZDP_POWER_LEVEL_LOW            0x4000
-#define ZBEE_ZDP_POWER_LEVEL_CRITICAL       0x0000
-
-#define ZBEE_ZDP_ADDR_MODE_GROUP            0x01
-#define ZBEE_ZDP_ADDR_MODE_UNICAST          0x03
-
-#define ZBEE_ZDP_MGMT_LEAVE_CHILDREN        0x40
-#define ZBEE_ZDP_MGMT_LEAVE_REJOIN          0x80
-
-#define ZBEE_ZDP_NWKUPDATE_SCAN_MAX         0x05
-#define ZBEE_ZDP_NWKUPDATE_CHANNEL_HOP      0xfe
-#define ZBEE_ZDP_NWKUPDATE_PARAMETERS       0xff
-
-#define ZBEE_ZDP_DCF_EAELA                  0x01
-#define ZBEE_ZDP_DCF_ESDLA                  0x02
+#define ZBEE_ZDP_REQ_NWK_ADDR                     0x0000
+#define ZBEE_ZDP_REQ_IEEE_ADDR                    0x0001
+#define ZBEE_ZDP_REQ_NODE_DESC                    0x0002
+#define ZBEE_ZDP_REQ_POWER_DESC                   0x0003
+#define ZBEE_ZDP_REQ_SIMPLE_DESC                  0x0004
+#define ZBEE_ZDP_REQ_ACTIVE_EP                    0x0005
+#define ZBEE_ZDP_REQ_MATCH_DESC                   0x0006
+#define ZBEE_ZDP_REQ_COMPLEX_DESC                 0x0010
+#define ZBEE_ZDP_REQ_USER_DESC                    0x0011
+#define ZBEE_ZDP_REQ_DISCOVERY_CACHE              0x0012
+#define ZBEE_ZDP_REQ_DEVICE_ANNCE                 0x0013
+#define ZBEE_ZDP_REQ_SET_USER_DESC                0x0014
+#define ZBEE_ZDP_REQ_SYSTEM_SERVER_DISC           0x0015  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_DISCOVERY              0x0016  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_NODE_DESC              0x0017  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_POWER_DESC             0x0018  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_ACTIVE_EP              0x0019  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_SIMPLE_DESC            0x001a  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_REMOVE_NODE_CACHE            0x001b  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_FIND_NODE_CACHE              0x001c  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_EXT_SIMPLE_DESC              0x001d  /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_REQ_EXT_ACTIVE_EP                0x001e  /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_REQ_PARENT_ANNCE                 0x001f  /* r21 */
+#define ZBEE_ZDP_REQ_END_DEVICE_BIND              0x0020
+#define ZBEE_ZDP_REQ_BIND                         0x0021
+#define ZBEE_ZDP_REQ_UNBIND                       0x0022
+#define ZBEE_ZDP_REQ_BIND_REGISTER                0x0023  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_REPLACE_DEVICE               0x0024  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_BAK_BIND_ENTRY         0x0025  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_REMOVE_BAK_BIND_ENTRY        0x0026  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_BACKUP_BIND_TABLE            0x0027  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_RECOVER_BIND_TABLE           0x0028  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_BACKUP_SOURCE_BIND           0x0029  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_RECOVER_SOURCE_BIND          0x002a  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_MGMT_NWK_DISC                0x0030
+#define ZBEE_ZDP_REQ_MGMT_LQI                     0x0031
+#define ZBEE_ZDP_REQ_MGMT_RTG                     0x0032
+#define ZBEE_ZDP_REQ_MGMT_BIND                    0x0033
+#define ZBEE_ZDP_REQ_MGMT_LEAVE                   0x0034
+#define ZBEE_ZDP_REQ_MGMT_DIRECT_JOIN             0x0035
+#define ZBEE_ZDP_REQ_MGMT_PERMIT_JOIN             0x0036  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_MGMT_CACHE                   0x0037  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_MGMT_NWKUPDATE               0x0038  /* ZigBee 2007 & later. */
+
+#define ZBEE_ZDP_RSP_NWK_ADDR                     0x8000
+#define ZBEE_ZDP_RSP_IEEE_ADDR                    0x8001
+#define ZBEE_ZDP_RSP_NODE_DESC                    0x8002
+#define ZBEE_ZDP_RSP_POWER_DESC                   0x8003
+#define ZBEE_ZDP_RSP_SIMPLE_DESC                  0x8004
+#define ZBEE_ZDP_RSP_ACTIVE_EP                    0x8005
+#define ZBEE_ZDP_RSP_MATCH_DESC                   0x8006
+#define ZBEE_ZDP_RSP_COMPLEX_DESC                 0x8010
+#define ZBEE_ZDP_RSP_USER_DESC                    0x8011
+#define ZBEE_ZDP_RSP_DISCOVERY_CACHE              0x8012
+#define ZBEE_ZDP_RSP_CONF_USER_DESC               0x8014  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_SYSTEM_SERVER_DISC           0x8015  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_DISCOVERY              0x8016  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_NODE_DESC              0x8017  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_POWER_DESC             0x8018  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_ACTIVE_EP              0x8019  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_SIMPLE_DESC            0x801a  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_REMOVE_NODE_CACHE            0x801b  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_FIND_NODE_CACHE              0x801c  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_EXT_SIMPLE_DESC              0x801d  /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_RSP_EXT_ACTIVE_EP                0x801e  /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_RSP_END_DEVICE_BIND              0x8020
+#define ZBEE_ZDP_RSP_BIND                         0x8021
+#define ZBEE_ZDP_RSP_UNBIND                       0x8022
+#define ZBEE_ZDP_RSP_BIND_REGISTER                0x8023  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_REPLACE_DEVICE               0x8024  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_BAK_BIND_ENTRY         0x8025  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_REMOVE_BAK_BIND_ENTRY        0x8026  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_BACKUP_BIND_TABLE            0x8027  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_RECOVER_BIND_TABLE           0x8028  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_BACKUP_SOURCE_BIND           0x8029  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_RECOVER_SOURCE_BIND          0x802a  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_MGMT_NWK_DISC                0x8030
+#define ZBEE_ZDP_RSP_MGMT_LQI                     0x8031
+#define ZBEE_ZDP_RSP_MGMT_RTG                     0x8032
+#define ZBEE_ZDP_RSP_MGMT_BIND                    0x8033
+#define ZBEE_ZDP_RSP_MGMT_LEAVE                   0x8034
+#define ZBEE_ZDP_RSP_MGMT_DIRECT_JOIN             0x8035
+#define ZBEE_ZDP_RSP_MGMT_PERMIT_JOIN             0x8036  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_MGMT_CACHE                   0x8037  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE               0x8038  /* ZigBee 2007 & later. */
+
+#define ZBEE_ZDP_MSG_RESPONSE_BIT                 0x8000
+#define ZBEE_ZDP_MSG_MASK                         (ZBEE_ZDP_MSG_RESPONSE_BIT-1)
+#define ZBEE_ZDP_MSG_RESPONSE_BIT_2003            0x0080
+#define ZBEE_ZDP_MSG_MASK_2003                    (ZBEE_ZDP_MSG_RESPONSE_BIT_2003-1)
+
+#define ZBEE_ZDP_STATUS_SUCCESS                     0x00
+#define ZBEE_ZDP_STATUS_INV_REQUESTTYPE             0x80
+#define ZBEE_ZDP_STATUS_DEVICE_NOT_FOUND            0x81
+#define ZBEE_ZDP_STATUS_INVALID_EP                  0x82
+#define ZBEE_ZDP_STATUS_NOT_ACTIVE                  0x83
+#define ZBEE_ZDP_STATUS_NOT_SUPPORTED               0x84
+#define ZBEE_ZDP_STATUS_TIMEOUT                     0x85
+#define ZBEE_ZDP_STATUS_NO_MATCH                    0x86
+#define ZBEE_ZDP_STATUS_NO_ENTRY                    0x88
+#define ZBEE_ZDP_STATUS_NO_DESCRIPTOR               0x89
+#define ZBEE_ZDP_STATUS_INSUFFICIENT_SPACE          0x8a
+#define ZBEE_ZDP_STATUS_NOT_PERMITTED               0x8b
+#define ZBEE_ZDP_STATUS_TABLE_FULL                  0x8c
+#define ZBEE_ZDP_STATUS_NOT_AUTHORIZED              0x8d
+#define ZBEE_ZDP_STATUS_DEVICE_BINDING_TABLE_FULL   0x8e
+#define ZBEE_ZDP_STATUS_INVALID_INDEX               0x8f
+
+#define ZBEE_ZDP_REQ_TYPE_SINGLE                    0x00
+#define ZBEE_ZDP_REQ_TYPE_EXTENDED                  0x01
+
+#define ZBEE_ZDP_NODE_TYPE                        0x0007
+#define ZBEE_ZDP_NODE_TYPE_COORD                  0x0000
+#define ZBEE_ZDP_NODE_TYPE_FFD                    0x0001
+#define ZBEE_ZDP_NODE_TYPE_RFD                    0x0002
+#define ZBEE_ZDP_NODE_COMPLEX                     0x0008
+#define ZBEE_ZDP_NODE_USER                        0x0010
+#define ZBEE_ZDP_NODE_APS                         0x0700
+#define ZBEE_ZDP_NODE_FREQ                        0xf800
+#define ZBEE_ZDP_NODE_FREQ_868MHZ                 0x0800
+#define ZBEE_ZDP_NODE_FREQ_900MHZ                 0x2000
+#define ZBEE_ZDP_NODE_FREQ_2400MHZ                0x4000
+
+#define ZBEE_ZDP_NODE_SERVER_PRIMARY_TRUST        0x0001
+#define ZBEE_ZDP_NODE_SERVER_BACKUP_TRUST         0x0002
+#define ZBEE_ZDP_NODE_SERVER_PRIMARY_BIND         0x0004
+#define ZBEE_ZDP_NODE_SERVER_BACKUP_BIND          0x0008
+#define ZBEE_ZDP_NODE_SERVER_PRIMARY_DISC         0x0010
+#define ZBEE_ZDP_NODE_SERVER_BACKUP_DISC          0x0020
+#define ZBEE_ZDP_NODE_SERVER_STACK_COMPL_REV      0xff00
+
+#define ZBEE_ZDP_POWER_MODE                       0x000f
+#define ZBEE_ZDP_POWER_MODE_RX_ON                 0x0000
+#define ZBEE_ZDP_POWER_MODE_RX_PERIODIC           0x0001
+#define ZBEE_ZDP_POWER_MODE_RX_STIMULATE          0x0002
+#define ZBEE_ZDP_POWER_AVAIL                      0x00f0
+#define ZBEE_ZDP_POWER_AVAIL_AC                   0x0010
+#define ZBEE_ZDP_POWER_AVAIL_RECHARGEABLE         0x0020
+#define ZBEE_ZDP_POWER_AVAIL_DISPOSEABLE          0x0040
+#define ZBEE_ZDP_POWER_SOURCE                     0x0f00
+#define ZBEE_ZDP_POWER_SOURCE_AC                  0x0100
+#define ZBEE_ZDP_POWER_SOURCE_RECHARGEABLE        0x0200
+#define ZBEE_ZDP_POWER_SOURCE_DISPOSEABLE         0x0400
+#define ZBEE_ZDP_POWER_LEVEL                      0xf000
+#define ZBEE_ZDP_POWER_LEVEL_FULL                 0xc000
+#define ZBEE_ZDP_POWER_LEVEL_OK                   0x8000
+#define ZBEE_ZDP_POWER_LEVEL_LOW                  0x4000
+#define ZBEE_ZDP_POWER_LEVEL_CRITICAL             0x0000
+
+#define ZBEE_ZDP_ADDR_MODE_GROUP                    0x01
+#define ZBEE_ZDP_ADDR_MODE_UNICAST                  0x03
+
+#define ZBEE_ZDP_MGMT_LEAVE_CHILDREN                0x40
+#define ZBEE_ZDP_MGMT_LEAVE_REJOIN                  0x80
+
+#define ZBEE_ZDP_NWKUPDATE_SCAN_MAX                 0x05
+#define ZBEE_ZDP_NWKUPDATE_CHANNEL_HOP              0xfe
+#define ZBEE_ZDP_NWKUPDATE_PARAMETERS               0xff
+
+#define ZBEE_ZDP_DCF_EAELA                          0x01
+#define ZBEE_ZDP_DCF_ESDLA                          0x02
 
 /**************************************
  * Field Indicies
@@ -269,7 +272,6 @@ extern int hf_zbee_zdp_depth;
 extern int hf_zbee_zdp_permit_joining_03;
 extern int hf_zbee_zdp_lqi;
 
-
 /* Routing Table */
 extern int hf_zbee_zdp_rtg;
 extern int hf_zbee_zdp_rtg_entry;
@@ -305,114 +307,114 @@ extern gint ett_zbee_zdp_table_entry;
  * Helper Functions
  **************************************
  */
-extern const gchar  *zdp_status_name    (guint8 status);
-extern void     zdp_dump_excess         (tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree);
-extern guint    zbee_parse_uint         (proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset, guint length, proto_item **ti);
-extern guint64  zbee_parse_eui64        (proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset, guint length, proto_item **ti);
-extern void     zbee_append_info        (proto_item *item, packet_info *pinfo, const gchar *format, ...) G_GNUC_PRINTF(3, 4);
-
-extern void     zdp_parse_node_desc     (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, guint8 version);
-extern void     zdp_parse_power_desc    (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
-extern void     zdp_parse_simple_desc   (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, guint8 version);
-extern void     zdp_parse_complex_desc  (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, guint length);
-
-extern guint8   zdp_parse_status        (proto_tree *tree, tvbuff_t *tvb, guint *offset);
-extern guint32  zdp_parse_chanmask      (proto_tree *tree, tvbuff_t *tvb, guint *offset, int hf_channel);
-extern guint8   zdp_parse_cinfo         (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
-extern guint16  zdp_parse_server_flags  (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
+extern const gchar  *zdp_status_name       (guint8 status);
+extern void     zdp_dump_excess            (tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree);
+extern guint    zbee_parse_uint            (proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset, guint length, proto_item **ti);
+extern guint64  zbee_parse_eui64           (proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset, guint length, proto_item **ti);
+extern void     zbee_append_info           (proto_item *item, packet_info *pinfo, const gchar *format, ...) G_GNUC_PRINTF(3, 4);
+
+extern void     zdp_parse_node_desc        (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, guint8 version);
+extern void     zdp_parse_power_desc       (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
+extern void     zdp_parse_simple_desc      (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, guint8 version);
+extern void     zdp_parse_complex_desc     (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, guint length);
+extern void     zdp_parse_bind_table_entry (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version);
+
+extern guint8   zdp_parse_status           (proto_tree *tree, tvbuff_t *tvb, guint *offset);
+extern guint32  zdp_parse_chanmask         (proto_tree *tree, tvbuff_t *tvb, guint *offset, int hf_channel);
+extern guint8   zdp_parse_cinfo            (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
+extern guint16  zdp_parse_server_flags     (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
 
 /* Message dissector routines. */
-extern void dissect_zbee_zdp_req_nwk_addr           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_ext_addr           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_node_desc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_power_desc         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_simple_desc        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_active_ep          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_match_desc         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_complex_desc       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_user_desc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_discovery_cache    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_device_annce           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_parent_annce           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_set_user_desc      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_system_server_disc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_store_discovery    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_store_node_desc    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_store_power_desc   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_store_active_ep    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_store_simple_desc  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_remove_node_cache  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_find_node_cache    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_ext_simple_desc    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_ext_active_ep      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-extern void dissect_zbee_zdp_req_end_device_bind    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_bind               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_unbind             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_bind_register      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_replace_device     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_nwk_addr               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_ext_addr               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_node_desc              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_power_desc             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_simple_desc            (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_active_ep              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_match_desc             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_complex_desc           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_user_desc              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_discovery_cache        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_device_annce               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_parent_annce               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_set_user_desc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_system_server_disc     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_store_discovery        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_store_node_desc        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_store_power_desc       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_store_active_ep        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_store_simple_desc      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_remove_node_cache      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_find_node_cache        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_ext_simple_desc        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_ext_active_ep          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+extern void dissect_zbee_zdp_req_end_device_bind        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_bind                   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_unbind                 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_bind_register          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_replace_device         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 extern void dissect_zbee_zdp_req_store_bak_bind_entry   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
 extern void dissect_zbee_zdp_req_remove_bak_bind_entry  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_backup_bind_table  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_recover_bind_table (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_backup_source_bind (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-extern void dissect_zbee_zdp_req_mgmt_nwk_disc      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int hf_channel);
-extern void dissect_zbee_zdp_req_mgmt_lqi           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_mgmt_rtg           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_mgmt_bind          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_mgmt_leave         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_req_mgmt_direct_join   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_mgmt_permit_join   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_mgmt_cache         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_req_mgmt_nwkupdate     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-extern void dissect_zbee_zdp_rsp_nwk_addr           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_ext_addr           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_node_desc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_power_desc         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_simple_desc        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_active_ep          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_match_desc         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_complex_desc       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_user_desc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_user_desc_conf     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_discovery_cache    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_system_server_disc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_discovery_store    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_store_node_desc    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_store_power_desc   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_store_active_ep    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_store_simple_desc  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_remove_node_cache  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_find_node_cache    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_ext_simple_desc    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_ext_active_ep      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-extern void dissect_zbee_zdp_rsp_end_device_bind    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_bind               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_unbind             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_bind_register      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_replace_device     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_backup_bind_table      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_recover_bind_table     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_backup_source_bind     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_recover_source_bind    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+extern void dissect_zbee_zdp_req_mgmt_nwk_disc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int hf_channel);
+extern void dissect_zbee_zdp_req_mgmt_lqi               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_mgmt_rtg               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_mgmt_bind              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_mgmt_leave             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_req_mgmt_direct_join       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_mgmt_permit_join       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_mgmt_cache             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_req_mgmt_nwkupdate         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+extern void dissect_zbee_zdp_rsp_nwk_addr               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_ext_addr               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_node_desc              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_power_desc             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_simple_desc            (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_active_ep              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_match_desc             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_complex_desc           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_user_desc              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_user_desc_conf         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_discovery_cache        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_system_server_disc     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_discovery_store        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_store_node_desc        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_store_power_desc       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_store_active_ep        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_store_simple_desc      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_remove_node_cache      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_find_node_cache        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_ext_simple_desc        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_ext_active_ep          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+extern void dissect_zbee_zdp_rsp_end_device_bind        (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_bind                   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_unbind                 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_bind_register          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_replace_device         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 extern void dissect_zbee_zdp_rsp_store_bak_bind_entry   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 extern void dissect_zbee_zdp_rsp_remove_bak_bind_entry  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_backup_bind_table  (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_recover_bind_table (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_backup_source_bind (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-extern void dissect_zbee_zdp_rsp_mgmt_nwk_disc      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_mgmt_lqi           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_mgmt_rtg           (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_mgmt_bind          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
-extern void dissect_zbee_zdp_rsp_mgmt_leave         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_mgmt_direct_join   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_mgmt_permit_join   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_mgmt_cache         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-extern void dissect_zbee_zdp_rsp_mgmt_nwkupdate     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-extern void zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version);
+extern void dissect_zbee_zdp_rsp_backup_bind_table      (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_recover_bind_table     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_backup_source_bind     (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_recover_source_bind    (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+extern void dissect_zbee_zdp_rsp_mgmt_nwk_disc          (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_mgmt_lqi               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_mgmt_rtg               (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_mgmt_bind              (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
+extern void dissect_zbee_zdp_rsp_mgmt_leave             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_mgmt_direct_join       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_mgmt_permit_join       (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_mgmt_cache             (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_mgmt_nwkupdate         (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
 extern const value_string zbee_zdp_cluster_names[];
 extern const value_string zbee_zdp_rtg_status_vals[];