From 4eaee4f094402628ea33588aaa6fc4481eeb9911 Mon Sep 17 00:00:00 2001 From: Paul Zander Date: Mon, 12 Mar 2018 11:59:32 +0100 Subject: [PATCH] Export ZigBee ZCL functions in the libwireshark.dll. The following functions are now also exported in the libwireshark.dll: decode_zcl_time_in_100ms decode_zcl_time_in_seconds decode_zcl_time_in_minutes dissect_zcl_attr_data zbee_zcl_init_cluster By doing this manufacturers can create manufacturer specif plugins that can dissect manufacturer specific ZCL attributes and commands. Change-Id: I2b68c3a4d13f74d648d12816f7693423ba24953b Reviewed-on: https://code.wireshark.org/review/26442 Reviewed-by: Anders Broman --- epan/dissectors/packet-zbee-zcl.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/epan/dissectors/packet-zbee-zcl.h b/epan/dissectors/packet-zbee-zcl.h index 98790ab6ef..787e87c9f0 100644 --- a/epan/dissectors/packet-zbee-zcl.h +++ b/epan/dissectors/packet-zbee-zcl.h @@ -203,14 +203,16 @@ extern void dissect_zcl_write_attr (tvbuff_t *tvb, packet_info *pinfo, proto_tre extern void dissect_zcl_read_attr_resp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint *offset, guint16 cluster_id, guint16 mfr_code); /* Helper functions */ -void decode_zcl_time_in_100ms (gchar *s, guint16 value); -void decode_zcl_time_in_seconds (gchar *s, guint16 value); -void decode_zcl_time_in_minutes (gchar *s, guint16 value); - -void dissect_zcl_attr_data (tvbuff_t *tvb, proto_tree *tree, guint *offset, guint data_type); -void zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, guint16 mfr_code, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data); zbee_zcl_cluster_desc *zbee_zcl_get_cluster_desc(guint16 cluster_id, guint16 mfr_code); +/* Exported DLL functions */ +WS_DLL_PUBLIC void decode_zcl_time_in_100ms (gchar *s, guint16 value); +WS_DLL_PUBLIC void decode_zcl_time_in_seconds (gchar *s, guint16 value); +WS_DLL_PUBLIC void decode_zcl_time_in_minutes (gchar *s, guint16 value); +WS_DLL_PUBLIC void dissect_zcl_attr_data (tvbuff_t *tvb, proto_tree *tree, guint *offset, guint data_type); + +WS_DLL_PUBLIC void zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, guint16 mfr_code, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data); + /* Cluster-specific commands and parameters */ #define ZBEE_ZCL_CSC_IAS_ZONE_C_ERC_NEP 0x02 #define ZBEE_ZCL_CSC_IAS_ZONE_C_ERC_NS 0x01