From 6894bccf0304d4500c171960726e177a9dc41038 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Fri, 9 Oct 2020 21:57:59 +0100 Subject: [PATCH] check_tfs.py: Also match case insensitively Fix up some issues where the words were the same except for captitalisation. --- epan/dissectors/packet-ber.c | 26 ++++----- epan/dissectors/packet-btmesh-beacon.c | 29 ++++------ epan/dissectors/packet-dplay.c | 72 +++++++++++------------ epan/dissectors/packet-dvb-s2-bb.c | 9 +-- epan/dissectors/packet-gsm_a_common.c | 80 ++++++++++++-------------- epan/dissectors/packet-isakmp.c | 6 +- epan/dissectors/packet-isns.c | 14 +---- epan/dissectors/packet-netbios.c | 6 +- epan/dissectors/packet-sna.c | 6 +- tools/check_tfs.py | 11 +++- 10 files changed, 111 insertions(+), 148 deletions(-) diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index c90b474541..a5904ad37b 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -220,10 +220,6 @@ static const true_false_string ber_pc_codes = { "Primitive Encoding" }; -static const true_false_string ber_pc_codes_short = { - "constructed", - "primitive" -}; static const value_string ber_uni_tag_codes[] = { { BER_UNI_TAG_EOC, "'end-of-content'" }, @@ -1602,7 +1598,7 @@ proto_tree_add_debug_text(tree, "OCTET STRING dissect_ber_octet_string(%s) enter "BER Error: OctetString expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), ber_class, - tfs_get_string(pc, &ber_pc_codes_short), + tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -1836,7 +1832,7 @@ dissect_ber_null(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbu "BER Error: NULL expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), ber_class, - tfs_get_string(pc, &ber_pc_codes_short), + tfs_get_string(pc, &tfs_constructed_primitive), tag); } @@ -2213,7 +2209,7 @@ proto_tree_add_debug_text(tree, "SEQUENCE dissect_ber_sequence(%s) entered\n", n "BER Error: Sequence expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(classx, ber_class_codes, "Unknown"), classx, - tfs_get_string(pcx, &ber_pc_codes_short), + tfs_get_string(pcx, &tfs_constructed_primitive), tagx); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -2573,7 +2569,7 @@ proto_tree_add_debug_text(tree, "SET dissect_ber_set(%s) entered\n", name); "BER Error: SET expected but class:%s(%d) %s tag:%d was found", val_to_str_const(classx, ber_class_codes, "Unknown"), classx, - tfs_get_string(pcx, &ber_pc_codes_short), + tfs_get_string(pcx, &tfs_constructed_primitive), tagx); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -3067,7 +3063,7 @@ dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int tvb, identifier_offset, identifier_len, "BER Error: GeneralString expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), - ber_class, tfs_get_string(pc, &ber_pc_codes_short), + ber_class, tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -3138,7 +3134,7 @@ proto_tree_add_debug_text(tree, "RESTRICTED STRING dissect_ber_octet_string(%s) "BER Error: String with tag=%d expected but class:%s(%d) %s tag:%d was unexpected", type, val_to_str_const(ber_class, ber_class_codes, "Unknown"), - ber_class, tfs_get_string(pc, &ber_pc_codes_short), + ber_class, tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -3239,7 +3235,7 @@ proto_tree_add_debug_text(tree, "OBJECT IDENTIFIER dissect_ber_any_oid(%s) enter "BER Error: Object Identifier expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), ber_class, - tfs_get_string(pc, &ber_pc_codes_short), + tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -3383,7 +3379,7 @@ proto_tree_add_debug_text(tree, "SQ OF dissect_ber_sq_of(%s) entered\n", name); "BER Error: %s OF expected but class:%s(%d) %s tag:%d was unexpected", (type == BER_UNI_TAG_SEQUENCE) ? "SET" : "SEQUENCE", val_to_str_const(classx, ber_class_codes, "Unknown"), - classx, tfs_get_string(pcx, &ber_pc_codes_short), + classx, tfs_get_string(pcx, &tfs_constructed_primitive), tagx); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(causex, ett_ber_unknown); @@ -3641,7 +3637,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree "BER Error: GeneralizedTime expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), ber_class, - tfs_get_string(pc, &ber_pc_codes_short), + tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -3827,7 +3823,7 @@ dissect_ber_UTCTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, t "BER Error: UTCTime expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), ber_class, - tfs_get_string(pc, &ber_pc_codes_short), + tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); @@ -3996,7 +3992,7 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto tvb, identifier_offset, identifier_len, "BER Error: BitString expected but class:%s(%d) %s tag:%d was unexpected", val_to_str_const(ber_class, ber_class_codes, "Unknown"), - ber_class, tfs_get_string(pc, &ber_pc_codes_short), + ber_class, tfs_get_string(pc, &tfs_constructed_primitive), tag); if (decode_unexpected) { proto_tree *unknown_tree = proto_item_add_subtree(cause, ett_ber_unknown); diff --git a/epan/dissectors/packet-btmesh-beacon.c b/epan/dissectors/packet-btmesh-beacon.c index 4d6deacf0d..0e929b696d 100644 --- a/epan/dissectors/packet-btmesh-beacon.c +++ b/epan/dissectors/packet-btmesh-beacon.c @@ -67,11 +67,6 @@ static const value_string btmesh_beacon_type[] = { { 0, NULL } }; -static const true_false_string available = { - "available", - "not available" -}; - static const true_false_string flags_key_refresh = { "Key Refresh in progress", "Key Refresh not in progress" @@ -215,37 +210,37 @@ proto_register_btmesh_beacon(void) }, { &hf_btmesh_beacon_oob_other, { "Other", "beacon.oob.other", - FT_BOOLEAN, 16, TFS(&available), 0x0001, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0001, NULL, HFILL } }, { &hf_btmesh_beacon_oob_electronic, { "Electronic / URI", "beacon.oob.electronic", - FT_BOOLEAN, 16, TFS(&available), 0x0002, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0002, NULL, HFILL } }, { &hf_btmesh_beacon_oob_2d_code, { "2D machine-readable code", "beacon.oob.2d_code", - FT_BOOLEAN, 16, TFS(&available), 0x0004, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0004, NULL, HFILL } }, { &hf_btmesh_beacon_oob_bar_code, { "Bar code", "beacon.oob.bar_code", - FT_BOOLEAN, 16, TFS(&available), 0x0008, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0008, NULL, HFILL } }, { &hf_btmesh_beacon_oob_nfc, { "Near Field Communication (NFC)", "beacon.oob.nfc", - FT_BOOLEAN, 16, TFS(&available), 0x0010, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0010, NULL, HFILL } }, { &hf_btmesh_beacon_oob_number, { "Number", "beacon.oob.number", - FT_BOOLEAN, 16, TFS(&available), 0x0020, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0020, NULL, HFILL } }, { &hf_btmesh_beacon_oob_string, { "String", "beacon.oob.string", - FT_BOOLEAN, 16, TFS(&available), 0x0040, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0040, NULL, HFILL } }, { &hf_btmesh_beacon_oob_rfu, @@ -255,27 +250,27 @@ proto_register_btmesh_beacon(void) }, { &hf_btmesh_beacon_oob_on_box, { "On box", "beacon.oob.on_box", - FT_BOOLEAN, 16, TFS(&available), 0x0800, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x0800, NULL, HFILL } }, { &hf_btmesh_beacon_oob_inside_box, { "Inside box", "beacon.oob.inside_box", - FT_BOOLEAN, 16, TFS(&available), 0x1000, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x1000, NULL, HFILL } }, { &hf_btmesh_beacon_oob_on_paper, { "On piece of paper", "beacon.oob.on_paper", - FT_BOOLEAN, 16, TFS(&available), 0x2000, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x2000, NULL, HFILL } }, { &hf_btmesh_beacon_oob_inside_manual, { "Inside manual", "beacon.oob.inside_manual", - FT_BOOLEAN, 16, TFS(&available), 0x4000, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x4000, NULL, HFILL } }, { &hf_btmesh_beacon_oob_on_device, { "On device", "beacon.oob.on_device", - FT_BOOLEAN, 16, TFS(&available), 0x8000, + FT_BOOLEAN, 16, TFS(&tfs_available_not_available), 0x8000, NULL, HFILL } }, { &hf_btmesh_beacon_uri_hash, diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 55b7eb8044..39e6115fc4 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -383,10 +383,6 @@ static const value_string yes_no_val[] = { { 0 , NULL }, }; -static const true_false_string tfs_dplay_flag = { - "present", - "absent" -}; /* borrowed from epan/dissectors/packets-smb-common.c */ static gint display_unicode_string(proto_tree *tree, gint hf_index, tvbuff_t *tvb, gint offset) @@ -1191,58 +1187,58 @@ void proto_register_dplay(void) NULL, 0x0, NULL, HFILL}}, { &hf_dplay_flags_no_create_players, { "no create players flag", "dplay.flags.no_create_players", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_CREATE_PLAYERS, "No Create Players", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_NO_CREATE_PLAYERS, "No Create Players", HFILL}}, { &hf_dplay_flags_0002, { "unused", "dplay.flags.unused", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_0002, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_0002, NULL, HFILL}}, { &hf_dplay_flags_migrate_host, { "migrate host flag", "dplay.flags.migrate_host", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_MIGRATE_HOST, "Migrate Host", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_MIGRATE_HOST, "Migrate Host", HFILL}}, { &hf_dplay_flags_short_player_msg, { "short player message", "dplay.flags.short_player_msg", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_SHORT_PLAYER_MSG, "Short Player Msg", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_SHORT_PLAYER_MSG, "Short Player Msg", HFILL}}, { &hf_dplay_flags_ignored, { "ignored", "dplay.ignored", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_IGNORED, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_IGNORED, NULL, HFILL}}, { &hf_dplay_flags_can_join, { "can join", "dplay.flags.can_join", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_CAN_JOIN, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_CAN_JOIN, NULL, HFILL}}, { &hf_dplay_flags_use_ping, { "use ping", "dplay.flags.use_ping", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_USE_PING, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_USE_PING, NULL, HFILL}}, { &hf_dplay_flags_no_player_updates, { "no player updates", "dplay.flags.no_player_updates", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_P_UPD, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_NO_P_UPD, NULL, HFILL}}, { &hf_dplay_flags_use_auth, { "use authentication", "dplay.flags.use_auth", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_USE_AUTH, "Use Auth", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_USE_AUTH, "Use Auth", HFILL}}, { &hf_dplay_flags_private_session, { "private session", "dplay.flags.priv_sess", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_PRIV_SESS, "Priv Session", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_PRIV_SESS, "Priv Session", HFILL}}, { &hf_dplay_flags_password_req, { "password required", "dplay.flags.pass_req", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_PASS_REQ, "Pass Req", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_PASS_REQ, "Pass Req", HFILL}}, { &hf_dplay_flags_route, { "route via game host", "dplay.flags.route", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_ROUTE, "Route", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_ROUTE, "Route", HFILL}}, { &hf_dplay_flags_server_player_only, { "get server player only", "dplay.flags.srv_p_only", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_SRV_ONLY, "Svr Player Only", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_SRV_ONLY, "Svr Player Only", HFILL}}, { &hf_dplay_flags_reliable, { "use reliable protocol", "dplay.flags.reliable", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_RELIABLE, "Reliable", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_RELIABLE, "Reliable", HFILL}}, { &hf_dplay_flags_preserve_order, { "preserve order", "dplay.flags.order", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_ORDER, "Order", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_ORDER, "Order", HFILL}}, { &hf_dplay_flags_optimize_latency, { "optimize for latency", "dplay.flags.opt_latency", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_OPT_LAT, "Opt Latency", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_OPT_LAT, "Opt Latency", HFILL}}, { &hf_dplay_flags_acqire_voice, { "acquire voice", "dplay.flags.acq_voice", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_ACQ_VOICE, "Acq Voice", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_ACQ_VOICE, "Acq Voice", HFILL}}, { &hf_dplay_flags_no_sess_desc_changes, { "no session desc changes", "dplay.flags.no_sess_desc", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_SESS_DESC_CHANGES, "No Sess Desc Changes", HFILL}}, + TFS(&tfs_present_absent), DPLAY_FLAG_NO_SESS_DESC_CHANGES, "No Sess Desc Changes", HFILL}}, { &hf_dplay_instance_guid, { "DirectPlay instance guid", "dplay.instance.guid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1292,16 +1288,16 @@ void proto_register_dplay(void) NULL, 0x0, NULL, HFILL}}, { &hf_dplay_pp_flag_sysplayer, { "is system player", "dplay.pp.flags.sysplayer", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_SYSPLAYER, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_PP_FLAG_SYSPLAYER, NULL, HFILL}}, { &hf_dplay_pp_flag_nameserver, { "is name server", "dplay.pp.flags.nameserver", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_NAMESERVER, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_PP_FLAG_NAMESERVER, NULL, HFILL}}, { &hf_dplay_pp_flag_in_group, { "in group", "dplay.pp.flags.in_group", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_IN_GROUP, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_PP_FLAG_IN_GROUP, NULL, HFILL}}, { &hf_dplay_pp_flag_sending, { "sending player on local machine", "dplay.pp.flags.sending", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SENDING, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_SPP_FLAG_SENDING, NULL, HFILL}}, { &hf_dplay_pp_id, { "PackedPlayer ID", "dplay.pp.id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1360,16 +1356,16 @@ void proto_register_dplay(void) NULL, 0x0, NULL, HFILL}}, { &hf_dplay_spp_flags_sysplayer, { "is system player", "dplay.spp.flags.sysplayer", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SYSPLAYER, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_SPP_FLAG_SYSPLAYER, NULL, HFILL}}, { &hf_dplay_spp_flags_nameserver, { "is name server", "dplay.spp.flags.nameserver", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_NAMESERVER, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_SPP_FLAG_NAMESERVER, NULL, HFILL}}, { &hf_dplay_spp_flags_in_group, { "in group", "dplay.spp.flags.in_group", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_IN_GROUP, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_SPP_FLAG_IN_GROUP, NULL, HFILL}}, { &hf_dplay_spp_flags_sending, { "sending player on local machine", "dplay.spp.flags.sending", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SENDING, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_SPP_FLAG_SENDING, NULL, HFILL}}, { &hf_dplay_spp_id, { "SuperPackedPlayer ID", "dplay.spp.id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1480,13 +1476,13 @@ void proto_register_dplay(void) NULL, 0x0, NULL, HFILL}}, { &hf_enum_sess_flag_join, { "Enumerate joinable sessions", "dplay.type02.joinable", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_ENUM_SESS_FLAG_JOIN, "Joinable", HFILL}}, + TFS(&tfs_present_absent), DPLAY_ENUM_SESS_FLAG_JOIN, "Joinable", HFILL}}, { &hf_enum_sess_flag_all, { "Enumerate all sessions", "dplay.type02.all", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_ENUM_SESS_FLAG_ALL, "All", HFILL}}, + TFS(&tfs_present_absent), DPLAY_ENUM_SESS_FLAG_ALL, "All", HFILL}}, { &hf_enum_sess_flag_passwd, { "Enumerate sessions requiring a password", "dplay.type02.pw_req", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_ENUM_SESS_FLAG_PASSWD, "Password", HFILL}}, + TFS(&tfs_present_absent), DPLAY_ENUM_SESS_FLAG_PASSWD, "Password", HFILL}}, /* Data fields for message type 0x0005 */ { &hf_dplay_type_05_flags, @@ -1494,19 +1490,19 @@ void proto_register_dplay(void) NULL, 0x0, NULL, HFILL}}, { &hf_dplay_type_05_system_player, { "is system player", "dplay.type_05.flags.sys_player", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_SYSPLAYER, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_TYPE05_FLAG_SYSPLAYER, NULL, HFILL}}, { &hf_dplay_type_05_name_server, { "is name server", "dplay.type_05.flags.name_server", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_NAMESERVER, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_TYPE05_FLAG_NAMESERVER, NULL, HFILL}}, { &hf_dplay_type_05_local, { "is local player", "dplay.type_05.flags.local", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_LOCAL, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_TYPE05_FLAG_LOCAL, NULL, HFILL}}, { &hf_dplay_type_05_unknown, { "unknown", "dplay.type_05.flags.unknown", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_UNKNOWN, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_TYPE05_FLAG_UNKNOWN, NULL, HFILL}}, { &hf_dplay_type_05_secure, { "is secure session", "dplay.type_05.flags.secure", FT_BOOLEAN, 32, - TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_SECURE, NULL, HFILL}}, + TFS(&tfs_present_absent), DPLAY_TYPE05_FLAG_SECURE, NULL, HFILL}}, /* Data fields for message type 0x0007 */ { &hf_dplay_type_07_dpid, diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 01f13bf05f..8449c959ed 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -846,10 +846,7 @@ static const value_string bb_low_ro[] = { #define DVB_S2_GSE_HDR_START_POS 15 #define DVB_S2_GSE_HDR_STOP_MASK 0x4000 #define DVB_S2_GSE_HDR_STOP_POS 14 -static const true_false_string tfs_gse_ss = { - "enabled", - "disabled" -}; + #define DVB_S2_GSE_HDR_LABELTYPE_MASK 0x3000 #define DVB_S2_GSE_HDR_LABELTYPE_POS1 13 @@ -1590,12 +1587,12 @@ void proto_register_dvb_s2_modeadapt(void) }, {&hf_dvb_s2_gse_hdr_start, { "Start", "dvb-s2_gse.hdr.start", - FT_BOOLEAN, 16, TFS(&tfs_gse_ss), DVB_S2_GSE_HDR_START_MASK, + FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), DVB_S2_GSE_HDR_START_MASK, "Start Indicator", HFILL} }, {&hf_dvb_s2_gse_hdr_stop, { "Stop", "dvb-s2_gse.hdr.stop", - FT_BOOLEAN, 16, TFS(&tfs_gse_ss), DVB_S2_GSE_HDR_STOP_MASK, + FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), DVB_S2_GSE_HDR_STOP_MASK, "Stop Indicator", HFILL} }, {&hf_dvb_s2_gse_hdr_labeltype, { diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index e01f99b520..bf7e98286f 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -210,10 +210,6 @@ static const true_false_string oddevenind_vals = { "Even number of identity digits" }; -static const true_false_string true_false_vals = { - "true", - "false" -}; const value_string gsm_a_sms_vals[] = { { 0, "1/4 timeslot (~144 microseconds)" }, @@ -2249,10 +2245,6 @@ de_lai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guin * [3] 10.5.1.4 Mobile Identity * 3GPP TS 24.008 version 7.8.0 Release 7 */ -static const true_false_string gsm_a_present_vals = { - "Present" , - "Not present" -}; guint16 de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) @@ -4019,12 +4011,12 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_tmgi_mcc_mnc_ind, { "MCC/MNC indication", "gsm_a.tmgi_mcc_mnc_ind", - FT_BOOLEAN, 8, TFS(&gsm_a_present_vals), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x10, NULL, HFILL} }, { &hf_gsm_a_mbs_ses_id_ind, { "MBMS Session Identity indication", "gsm_a.mbs_session_id_ind", - FT_BOOLEAN, 8, TFS(&gsm_a_present_vals), 0x20, + FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x20, NULL, HFILL} }, { &hf_gsm_a_mbs_service_id, @@ -4124,17 +4116,17 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_pgsm_supported, { "P-GSM Supported", "gsm_a.classmark3.pgsmSupported", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_egsm_supported, { "E-GSM or R-GSM Supported", "gsm_a.classmark3.egsmSupported", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_gsm1800_supported, { "GSM 1800 Supported", "gsm_a.classmark3.gsm1800Supported", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_ass_radio_cap1, @@ -4154,7 +4146,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_rsupport, { "R Support", "gsm_a.classmark3.rsupport", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_r_capabilities, @@ -4164,7 +4156,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_multislot_capabilities, { "HSCSD Multi Slot Capability", "gsm_a.classmark3.multislot_capabilities", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_multislot_class, @@ -4179,12 +4171,12 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_extended_measurement_cap, { "Extended Measurement Capability", "gsm_a.classmark3.ext_meas_cap", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_ms_measurement_capability, { "MS measurement capability", "gsm_a.classmark3.ms_measurement_capability", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, NULL, HFILL} }, { &hf_gsm_a_sms_value, @@ -4199,7 +4191,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_ms_pos_method_cap_present, { "MS Positioning Method Capability present", "gsm_a.classmark3.ms_pos_method_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_ms_pos_method, @@ -4234,7 +4226,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_ecsd_multi_slot_capability, { "ECSD Multi Slot Capability present", "gsm_a.classmark3.ecsd_multi_slot_capability", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_ecsd_multi_slot_class, @@ -4244,7 +4236,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_8_psk_struct_present, { "8-PSK Struct present", "gsm_a.classmark3.8_psk_struct_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_8_psk_struct, @@ -4259,7 +4251,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_8_psk_rf_power_capability_1_present, { "8-PSK RF Power Capability 1 present", "gsm_a.classmark3.8_psk_rf_power_capability_1_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_8_psk_rf_power_capability_1, @@ -4269,7 +4261,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_8_psk_rf_power_capability_2_present, { "8-PSK RF Power Capability 2 present", "gsm_a.classmark3.8_psk_rf_power_capability_2_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_8_psk_rf_power_capability_2, @@ -4279,7 +4271,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_400_band_info_present, { "GSM 400 Band Information present", "gsm_a.classmark3.gsm_400_band_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_400_bands_supported, @@ -4294,7 +4286,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_850_assoc_radio_cap_present, { "GSM 850 Associated Radio Capability present", "gsm_a.classmark3.gsm_850_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_850_assoc_radio_cap, @@ -4304,7 +4296,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_1900_assoc_radio_cap_present, { "GSM 1900 Associated Radio Capability present", "gsm_a.classmark3.gsm_1900_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_1900_assoc_radio_cap, @@ -4329,7 +4321,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_e_gprs_multi_slot_info_present, { "DTM E/GPRS Multi Slot Information present", "gsm_a.classmark3.dtm_e_gprs_multi_slot_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_gprs_multi_slot_class, @@ -4344,7 +4336,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_egprs_multi_slot_class_present, { "DTM EGPRS Multi Slot Class present", "gsm_a.classmark3.dtm_egprs_multi_slot_class_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_egprs_multi_slot_class, @@ -4354,7 +4346,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_single_band_support, { "Single Band Support", "gsm_a.classmark3.single_band_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_band, @@ -4364,7 +4356,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_750_assoc_radio_cap_present, { "GSM 750 Associated Radio Capability present", "gsm_a.classmark3.gsm_750_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_750_assoc_radio_cap, @@ -4384,7 +4376,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_ext_dtm_e_gprs_multi_slot_info_present, { "Extended DTM E/GPRS Multi Slot Information present", "gsm_a.classmark3.ext_dtm_e_gprs_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_ext_dtm_gprs_multi_slot_class, @@ -4399,7 +4391,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_high_multislot_cap_present, { "High Multislot Capability present", "gsm_a.classmark3.high_multislot_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_high_multislot_cap, @@ -4409,7 +4401,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_geran_iu_mode_support, { "GERAN Iu Mode Support", "gsm_a.classmark3.geran_iu_mode_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_geran_iu_mode_cap, @@ -4444,7 +4436,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_t_gsm_400_band_info_present, { "T-GSM 400 Band Information present", "gsm_a.classmark3.gsm_400_band_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_t_gsm_400_bands_supported, @@ -4459,7 +4451,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_t_gsm_900_assoc_radio_cap_present, { "T-GSM 900 Associated Radio Capability present", "gsm_a.classmark3.t_gsm_900_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_t_gsm_900_assoc_radio_cap, @@ -4479,7 +4471,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_e_gprs_high_multi_slot_info_present, { "DTM E/GPRS High Multi Slot Information present", "gsm_a.classmark3.dtm_e_gprs_high_mutli_slot_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_gprs_high_multi_slot_class, @@ -4494,7 +4486,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_egprs_high_multi_slot_class_present, { "DTM EGPRS High Multi Slot Class present", "gsm_a.classmark3.dtm_egprs_high_multi_slot_class_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_egprs_high_multi_slot_class, @@ -4509,7 +4501,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_710_assoc_radio_cap_present, { "GSM 710 Associated Radio Capability present", "gsm_a.classmark3.gsm_710_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_710_assoc_radio_cap, @@ -4519,7 +4511,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_t_gsm_810_assoc_radio_cap_present, { "T-GSM 810 Associated Radio Capability present", "gsm_a.classmark3.t_gsm_810_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_t_gsm_810_assoc_radio_cap, @@ -4589,32 +4581,32 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_geran_network_sharing_support, { "GERAN Network Sharing support", "gsm_a.classmark3.geran_network_sharing_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_eutra_wb_rsrq_support, { "E-UTRA Wideband RSRQ measurements support", "gsm_a.classmark3.eutra_wb_rsrq_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_er_band_support, { "ER Band support", "gsm_a.classmark3.er_band_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_utra_mfbi_support, { "UTRA Multiple Frequency Band Indicators support", "gsm_a.classmark3.utra_mfbi_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_eutra_mfbi_support, { "E-UTRA Multiple Frequency Band Indicators support", "gsm_a.classmark3.eutra_mfbi_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_ext_tsc_set_cap_support, { "Extended TSC Set Capability support", "gsm_a.classmark3.ext_tsc_set_cap_support", - FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, NULL, HFILL} }, { &hf_gsm_a_ext_earfcn_value_range, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index d9ebe8b922..61c160ff06 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1702,10 +1702,6 @@ typedef struct isakmp_hdr { guint32 length; } isakmp_hdr_t; -static const true_false_string criticalpayload = { - "Critical", - "Not Critical" -}; static const true_false_string attribute_format = { "Type/Value (TV)", "Type/Length/Value (TLV)" @@ -6466,7 +6462,7 @@ proto_register_isakmp(void) "ISAKMP Next Payload", HFILL }}, { &hf_isakmp_criticalpayload, { "Critical Bit", "isakmp.criticalpayload", - FT_BOOLEAN, 8,TFS(&criticalpayload), 0x80, + FT_BOOLEAN, 8,TFS(&tfs_critical_not_critical), 0x80, "IKEv2 Critical Payload", HFILL }}, { &hf_isakmp_reserved7, { "Reserved", "isakmp.reserved7", diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 3ee9d5891e..069e7ce444 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -478,23 +478,15 @@ static value_string_ext isns_attribute_tags_ext = VALUE_STRING_EXT_INIT(isns_att #define tfs_isns_scn_bitmap_dd_dds_member_removed tfs_true_false #define tfs_isns_scn_bitmap_dd_dds_member_added tfs_true_false -static const true_false_string tfs_isns_preferred = { - "Preferred", - "No Preference" -}; -#define tfs_isns_psb_tunnel_mode tfs_isns_preferred -#define tfs_isns_psb_transport_mode tfs_isns_preferred +#define tfs_isns_psb_tunnel_mode tfs_preferred_no_preference +#define tfs_isns_psb_transport_mode tfs_preferred_no_preference #define tfs_isns_psb_pfs tfs_enabled_disabled #define tfs_isns_psb_aggressive_mode tfs_enabled_disabled #define tfs_isns_psb_main_mode tfs_enabled_disabled #define tfs_isns_psb_ike_ipsec tfs_enabled_disabled -static const true_false_string tfs_isns_psb_bitmap = { - "VALID", - "INVALID" -}; #define tfs_isns_isnt_control tfs_yes_no #define tfs_isns_isnt_initiator tfs_yes_no @@ -1293,7 +1285,7 @@ void proto_register_isns(void) }, { &hf_isns_psb_bitmap, { "Bitmap", "isns.psb.bitmap", - FT_BOOLEAN, 32, TFS(&tfs_isns_psb_bitmap), 0x0001, /* bit 31 */ + FT_BOOLEAN, 32, TFS(&tfs_valid_invalid), 0x0001, /* bit 31 */ NULL, HFILL } }, diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 260c51e72e..2ef1b087a1 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -237,10 +237,6 @@ static const value_string name_types[] = { { 0, NULL } }; -static const true_false_string flags_allowed = { - "Allowed", - "Not allowed" -}; static const true_false_string netb_version_str = { "2.00 or higher", @@ -1336,7 +1332,7 @@ proto_register_netbios(void) { &hf_netb_flags_ack_with_data, { "Acknowledge with data", "netbios.flags.ack_with_data", FT_BOOLEAN, 8, - TFS( &flags_allowed), 0x04, NULL, HFILL }}, + TFS( &tfs_allowed_not_allowed), 0x04, NULL, HFILL }}, { &hf_netb_flags_ack_expected, { "Acknowledge expected", "netbios.flags.ack_expected", FT_BOOLEAN, 8, diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 722008ab57..b85fcaa3b3 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -366,10 +366,6 @@ static const value_string sna_rh_ru_category_vals[] = { static const true_false_string sna_rh_fi_truth = { "FM Header", "No FM Header" }; -/* Sense Data Included */ -static const true_false_string sna_rh_sdi_truth = - { "Included", "Not Included" }; - /* Begin Chain Indicator */ static const true_false_string sna_rh_bci_truth = { "First in Chain", "Not First in Chain" }; @@ -3072,7 +3068,7 @@ proto_register_sna(void) { &hf_sna_rh_sdi, { "Sense Data Included", "sna.rh.sdi", FT_BOOLEAN, 8, - TFS(&sna_rh_sdi_truth), 0x04, NULL, HFILL }}, + TFS(&tfs_included_not_included), 0x04, NULL, HFILL }}, { &hf_sna_rh_bci, { "Begin Chain Indicator", "sna.rh.bci", FT_BOOLEAN, 8, diff --git a/tools/check_tfs.py b/tools/check_tfs.py index 5d8a06d740..b98f1e5354 100755 --- a/tools/check_tfs.py +++ b/tools/check_tfs.py @@ -117,10 +117,17 @@ def checkFile(filename, tfs_items, look_for_common=False): for i in items: for t in tfs_items: found = False + exact_case = False if tfs_items[t].val1 == items[i].val1 and tfs_items[t].val2 == items[i].val2: - print(filename, i, "- could have used", t, 'from tfs.c instead: ', tfs_items[t]) - issues_found += 1 found = True + exact_case = True + elif tfs_items[t].val1.upper() == items[i].val1.upper() and tfs_items[t].val2.upper() == items[i].val2.upper(): + found = True + + if found: + print(filename, i, "- could have used", t, 'from tfs.c instead: ', tfs_items[t], + '' if exact_case else ' (capitalisation differs)') + issues_found += 1 break if not found: if look_for_common: