aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2020-07-05 23:16:21 +0200
committerAnders Broman <a.broman58@gmail.com>2020-07-06 05:11:52 +0000
commit95c56f5b72220b2f08ea2ef70b914f7a2b5ff4cc (patch)
tree7e7aa65e51f705ebfd51715629b925d32e1d348c
parentc3802e5af1f3817e64a90c0477aeca6f4f01fd9f (diff)
nordic_ble: Avoid identical true and false strings
Change field 'MIC' (nordic_ble.mic_not_relevant) to avoid using identical true and false strings. Change-Id: I204cc096e4af6d6000a6aa7e70e7885221fb211f Reviewed-on: https://code.wireshark.org/review/37721 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-nordic_ble.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/epan/dissectors/packet-nordic_ble.c b/epan/dissectors/packet-nordic_ble.c
index 1f116a9bbf..0bd9bfa34b 100644
--- a/epan/dissectors/packet-nordic_ble.c
+++ b/epan/dissectors/packet-nordic_ble.c
@@ -232,7 +232,7 @@ static int hf_nordic_ble_flags = -1;
static int hf_nordic_ble_crcok = -1;
static int hf_nordic_ble_encrypted = -1;
static int hf_nordic_ble_micok = -1;
-static int hf_nordic_ble_mic_not_relevant= -1;
+static int hf_nordic_ble_mic_not_relevant = -1;
static int hf_nordic_ble_aux_type = -1;
static int hf_nordic_ble_flag_reserved1 = -1;
static int hf_nordic_ble_flag_reserved2 = -1;
@@ -265,12 +265,6 @@ static const true_false_string ok_incorrect =
"Incorrect"
};
-static const true_false_string not_relevant =
-{
- "Only relevant when encrypted",
- "Only relevant when encrypted"
-};
-
static const value_string le_phys[] =
{
{ 0, "LE 1M" },
@@ -812,9 +806,9 @@ proto_register_nordic_ble(void)
"Message Integrity Check state", HFILL }
},
{ &hf_nordic_ble_mic_not_relevant,
- { "MIC", "nordic_ble.mic_not_relevant",
- FT_BOOLEAN, 8, TFS(&not_relevant), 0x08,
- "Message Integrity Check state", HFILL }
+ { "MIC (not relevant)", "nordic_ble.mic_not_relevant",
+ FT_UINT8, BASE_DEC, NULL, 0x08,
+ "Message Integrity Check state is only relevant when encrypted", HFILL }
},
{ &hf_nordic_ble_flag_reserved3,
{ "Reserved", "nordic_ble.flag_reserved3",