From 690f0f4d24869bba6e1097a5db24079f10d99d38 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 4 Jun 2019 14:03:41 +0200 Subject: [PATCH] btmesh: fix compilation with older gcrypt version. Fix compilation on Centos. Change-Id: Id51b6681d01e65e6a46ca4a62663c3b4e01669da Reviewed-on: https://code.wireshark.org/review/33463 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte --- epan/dissectors/packet-btmesh.c | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index a3da44509a..7e4ede0029 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -1092,6 +1092,8 @@ static const value_string btmesh_fault_array_vals[] = { { 0, NULL } }; +#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */ + static const int *config_composition_data_status_features_headers[] = { &hf_btmesh_config_composition_data_status_features_relay, &hf_btmesh_config_composition_data_status_features_proxy, @@ -1119,6 +1121,8 @@ static const int *config_heartbeat_publication_status_features_headers[] = { NULL }; +#endif + static const value_string btmesh_status_code_vals[] = { { 0x00, "Success" }, { 0x01, "Invalid Address" }, @@ -3428,6 +3432,51 @@ dissect_btmesh_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da #else /* GCRYPT_VERSION_NUMBER >= 0x010600 */ +static void +format_transmit(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_key_index_rfu(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_interval_steps(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_retransmit(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_publish_period(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_publish_appkeyindex_model(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_vendor_model(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_key_index(gchar *buf _U_, guint32 value _U_) +{ +} + +static void +format_dual_key_index(gchar *buf _U_, guint32 value _U_) +{ +} + static gboolean create_master_security_keys(uat_btmesh_record_t * net_key_set _U_) {