osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Find and fix dissectors that should be using a default tfs. 

Found using tools/check_tfs.py, included in this commit.
Here are the reports that were fixed here:

Examining:
All dissector modules

epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead:  {High,Low}
epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead:  {Present,Not Present}
epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead:  {Server,Client}
epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead:  {On,Off}
epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead:  {Enabled,Disabled}
epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead:  {Requested,Not Requested}
epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead:  {On,Off}
epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead:  {Active,Inactive}
epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead:  {Enabled,Disabled}
epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead:  {Odd,Even}
epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead:  {Up,Down}
epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead:  {On,Off}
epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead:  {On,Off}
epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead:  {Set,Not set}
epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead:  {Low,Normal}
epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead:  {High,Normal}
epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead:  {Response,Request}
epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead:  {No,Yes}
epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead:  {Supported,Not supported}
epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead:  {Set,Not set}
epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead:  {Activated,Deactivated}
epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead:  {No,Yes}
epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead:  {Present,Not Present}
epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead:  {In use,Not in use}
epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead:  {On,Off}
epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead:  {No,Yes}
epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead:  {Pressed,Not pressed}
27 issues found
Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa
Reviewed-on: https://code.wireshark.org/review/38087
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Martin Mathieson 2020-08-07 21:15:46 +01:00 committed by Anders Broman
parent b711b300cc
commit 1dd8bb2811
22 changed files with 316 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-assa_r3.c
View File

@ -2878,12 +2878,6 @@ static const true_false_string tfs_rmtauthretry_flags =
"Deny"
};
static const true_false_string tfs_mortisepins_flags =
{
"High",
"Low"
};
static const true_false_string tfs_errornoerror_flags =
{
"Error",
@ -8177,22 +8171,22 @@ void proto_register_r3 (void)
{ &hf_r3_mortisepins_s1,
{ "Mortise Pin S1", "r3.mortisepins.s1",
FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000001,
FT_BOOLEAN, 8, TFS (&tfs_high_low), 0x00000001,
NULL, HFILL }
},
{ &hf_r3_mortisepins_s2,
{ "Mortise Pin S2", "r3.mortisepins.s2",
FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000002,
FT_BOOLEAN, 8, TFS (&tfs_high_low), 0x00000002,
NULL, HFILL }
},
{ &hf_r3_mortisepins_s3,
{ "Mortise Pin S3", "r3.mortisepins.s3",
FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000004,
FT_BOOLEAN, 8, TFS (&tfs_high_low), 0x00000004,
NULL, HFILL }
},
{ &hf_r3_mortisepins_s4,
{ "Mortise Pin S4", "r3.mortisepins.s4",
FT_BOOLEAN, 8, TFS (&tfs_mortisepins_flags), 0x00000008,
FT_BOOLEAN, 8, TFS (&tfs_high_low), 0x00000008,
NULL, HFILL }
},

21
epan/dissectors/packet-btle.c
View File

@ -562,11 +562,6 @@ static const true_false_string tfs_offset_adjust = {
"No adjust"
};
static const true_false_string tfs_present_bit = {
"Present",
"Not Present"
};
static const true_false_string tfs_ch_sel = {
"#2",
"#1"
@ -2173,42 +2168,42 @@ proto_register_btle(void)
},
{ &hf_extended_advertising_flags_adva,
{ "Advertiser Address", "btle.extended_advertising_header.flags.advertiser_address",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x01,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x01,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_targeta,
{ "Target Address", "btle.extended_advertising_header.flags.target_address",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x02,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x02,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_cteinfo,
{ "CTE Info", "btle.extended_advertising_header.flags.cte_info",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x04,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x04,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_advdatainfo,
{ "Advertiser Data Info", "btle.extended_advertising_header.advertiser_data_info",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x08,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x08,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_aux_ptr,
{ "Aux pointer", "btle.extended_advertising_header.flags.aux_pointer",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x10,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x10,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_sync_info,
{ "Sync Info", "btle.extended_advertising_header.flags.sync_info",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x20,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x20,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_tx_power,
{ "TX Power", "btle.extended_advertising_header.flags.tx_power",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x40,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x40,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_reserved,
{ "Reserved", "btle.extended_advertising_header.flags.reserved",
FT_BOOLEAN, 8, TFS(&tfs_present_bit), 0x80,
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x80,
NULL, HFILL }
},
{ &hf_extended_advertising_cte_info,

6
epan/dissectors/packet-dhcp.c
View File

@ -1032,10 +1032,6 @@ static const enum_val_t dhcp_uuid_endian_vals[] = {
#define F_ISNS_SRV_SEC_BITMAP_TUNNEL_MODE 0x0040
#define F_ISNS_SRV_SEC_BITMAP_RESERVED 0xFF80
static const true_false_string tfs_fqdn_s = {
"Server",
"Client"
};
static const true_false_string tfs_fqdn_o = {
"Override",
@ -7425,7 +7421,7 @@ proto_register_dhcp(void)
{ &hf_dhcp_fqdn_s,
{ "Server", "dhcp.fqdn.s",
FT_BOOLEAN, 8, TFS(&tfs_fqdn_s), F_FQDN_S,
FT_BOOLEAN, 8, TFS(&tfs_server_client), F_FQDN_S,
"If true, server should do DDNS update", HFILL }},
{ &hf_dhcp_fqdn_o,

47
epan/dissectors/packet-docsis-macmgmt.c
View File

@ -2461,9 +2461,6 @@ static const value_string rba_subband_direction_vals [] = {
{0, NULL}
};
/* Windows does not allow data copy between dlls */
static const true_false_string mdd_tfs_on_off = { "On", "Off" };
static const true_false_string mdd_tfs_en_dis = { "Enabled", "Disabled" };
static const true_false_string tfs_ucd_change_ind_vals = {"Changes", "No changes"};
@ -2471,8 +2468,6 @@ static const true_false_string tfs_allow_inhibit = { "Inhibit Initial Ranging",
const true_false_string type35ucd_tfs_present_not_present = { "UCD35 is present for this UCID",
"UCD35 is not present for this UCID" };
static const true_false_string req_not_req_tfs = {"Requested", "Not Requested"};
static const true_false_string sid_field_bit15_tfs = {
"The commanded power level P1.6r_n is higher than the value corresponding to the top of the DRW.",
"The commanded power level P1.6r_n is not higher than the value corresponding to the top of the DRW."
@ -9469,7 +9464,7 @@ proto_register_docsis_mgmt (void)
},
{&hf_docsis_mdd_extended_upstream_transmit_power_support,
{ "Extended Upstream Transmit Power Support", "docsis_mdd.extended_upstream_transmit_power_support",
FT_BOOLEAN, BASE_NONE, TFS(&mdd_tfs_on_off), 0x0,
FT_BOOLEAN, BASE_NONE, TFS(&tfs_on_off), 0x0,
"Mdd Extended Upstream Transmit Power Support", HFILL}
},
{&hf_docsis_mdd_cmts_major_docsis_version,
@ -9494,62 +9489,62 @@ proto_register_docsis_mgmt (void)
},
{&hf_docsis_mdd_cm_status_event_d31_ofdm_prof_fail,
{ "Downstream OFDM Profile Failure", "docsis_mdd.cm_status_event_d31_ofdm_prof_fail",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x01,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_prim_down_chan_change,
{ "Primary Downstream Channel Change", "docsis_mdd.cm_status_event_d31_prim_down_chan_change",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x02,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x02,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_dpd_mismatch,
{ "DPD Mismatch", "docsis_mdd.cm_status_event_d31_dpd_mismatch",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x04,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x04,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_deprecated,
{ "Deprecated", "docsis_mdd.cm_status_event_d31_deprecated",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x08,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x08,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_ncp_prof_fail,
{ "NCP Profile Failure", "docsis_mdd.cm_status_event_d31_ncp_prof_fail",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x10,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x10,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_loss_fec_plc,
{ "Loss of FEC lock on PLC", "docsis_mdd.cm_status_event_d31_loss_fec_plc",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x20,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x20,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_ncp_prof_recover,
{ "NCP Profile Recovery", "docsis_mdd.cm_status_event_d31_ncp_prof_recover",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x40,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x40,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_fec_recover_on_plc,
{ "FEC Recovery on PLC", "docsis_mdd.cm_status_event_d31_fec_recover_on_plc",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x80,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x80,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_fec_recover_on_ofdm_prof,
{ "FEC Recovery on OFDM Profile", "docsis_mdd.cm_status_event_d31_fec_recover_on_ofdm_prof",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x0100,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0100,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_ofdma_prof_fail,
{ "OFDMA Profile Failure", "docsis_mdd.cm_status_event_d31_ofdma_prof_fail",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x0200,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0200,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_map_stor_overflow_ind,
{ "MAP Storage Overflow Indicator", "docsis_mdd.cm_status_event_d31_map_stor_overflow_ind",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x0400,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0400,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_ofdm_map_stor_almost_full_ind,
{ "MAP Storage Almost Full Indicator", "docsis_mdd.cm_status_event_d31_ofdm_map_stor_almost_full_ind",
FT_BOOLEAN, 32, TFS(&mdd_tfs_en_dis), 0x0800,
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0800,
NULL, HFILL}
},
{&hf_docsis_mdd_cm_status_event_d31_reserved,
@ -10112,28 +10107,28 @@ proto_register_docsis_mgmt (void)
{"Length", "docsis_optreq.length",FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_rxmer_stat_subc,
{"RxMER Statistics per subcarrier", "docsis_optreq.reqstat.rxmer_stat_per_subcarrier", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x1, NULL, HFILL}
{"RxMER Statistics per subcarrier", "docsis_optreq.reqstat.rxmer_stat_per_subcarrier", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x1, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_rxmer_subc_threshold_comp,
{"RxMER per Subcarrier Threshold Comparison for Candidate Profile", "docsis_optreq.reqstat.rxmer_per_subcarrrier_thresh_comp", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x2, NULL, HFILL}
{"RxMER per Subcarrier Threshold Comparison for Candidate Profile", "docsis_optreq.reqstat.rxmer_per_subcarrrier_thresh_comp", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x2, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_snr_marg_cand_prof,
{"SNR Margin for Candidate Profile", "docsis_optreq.reqstat.snr_marg_cand_prof", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x4, NULL, HFILL}
{"SNR Margin for Candidate Profile", "docsis_optreq.reqstat.snr_marg_cand_prof", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x4, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_codew_stat_cand_prof,
{"Codeword Statistics for Candidate Profile", "docsis_optreq.reqstat.codew_stat_cand_prof", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x8, NULL, HFILL}
{"Codeword Statistics for Candidate Profile", "docsis_optreq.reqstat.codew_stat_cand_prof", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x8, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_codew_thresh_comp_cand_prof,
{"Codeword Threshold Comparison for Candidate Profile", "docsis_optreq.reqstat.codew_thresh_comp_cand_prof", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x10, NULL, HFILL}
{"Codeword Threshold Comparison for Candidate Profile", "docsis_optreq.reqstat.codew_thresh_comp_cand_prof", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x10, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_ncp_field_stat,
{"NCP Field Statistics", "docsis_optreq.reqstat.ncp_field_stats", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x20, NULL, HFILL}
{"NCP Field Statistics", "docsis_optreq.reqstat.ncp_field_stats", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x20, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_ncp_crc_thresh_comp,
{"NCP CRC Threshold Comparison", "docsis_optreq.reqstat.ncp_crc_thresh_comp", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x40, NULL, HFILL}
{"NCP CRC Threshold Comparison", "docsis_optreq.reqstat.ncp_crc_thresh_comp", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x40, NULL, HFILL}
},
{&hf_docsis_optreq_reqstat_reserved,
{"Reserved", "docsis_optreq.reqstat.reserved", FT_BOOLEAN, 32, TFS(&req_not_req_tfs), 0x80, NULL, HFILL}
{"Reserved", "docsis_optreq.reqstat.reserved", FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x80, NULL, HFILL}
},
{&hf_docsis_optreq_tlv_xrmer_thresh_data,
{"TLV Data", "docsis_optreq.rxmer_thresh_params.tlv_data", FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x0, NULL, HFILL}

35
epan/dissectors/packet-docsis-tlv.c
View File

@ -567,10 +567,6 @@ static gint ett_docsis_ucd_reassembled = -1;
static expert_field ei_docsis_tlv_tlvlen_bad = EI_INIT;
static expert_field ei_docsis_tlv_tlvval_bad = EI_INIT;
static const true_false_string on_off_tfs = {
"On",
"Off"
};
static const value_string on_off_vals[] = {
{0, "Off"},
@ -603,11 +599,6 @@ static const value_string docs_ver_vals[] = {
{0, NULL},
};
static const true_false_string activation_tfs = {
"Active",
"Inactive"
};
static const value_string dsc_act_vals[] = {
{0, "DSC Add Classifier"},
{1, "DSC Replace Classifier"},
@ -5586,7 +5577,7 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_net_access,
{"3 Network Access", "docsis_tlv.netaccess",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Network Access TLV", HFILL}
},
#if 0
@ -5645,7 +5636,7 @@ proto_register_docsis_tlv (void)
#endif
{&hf_docsis_tlv_mcap_concat,
{".1 Concatenation Support", "docsis_tlv.mcap.concat",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Concatenation Support", HFILL}
},
{&hf_docsis_tlv_mcap_docs_ver,
@ -5655,22 +5646,22 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_mcap_frag,
{".3 Fragmentation Support", "docsis_tlv.mcap.frag",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Fragmentation Support", HFILL}
},
{&hf_docsis_tlv_mcap_phs,
{".4 PHS Support", "docsis_tlv.mcap.phs",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"PHS Support", HFILL}
},
{&hf_docsis_tlv_mcap_igmp,
{".5 IGMP Support", "docsis_tlv.mcap.igmp",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"IGMP Support", HFILL}
},
{&hf_docsis_tlv_mcap_privacy,
{".6 Privacy Support", "docsis_tlv.mcap.privacy",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Privacy Support", HFILL}
},
{&hf_docsis_tlv_mcap_down_said,
@ -5705,7 +5696,7 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_mcap_dcc,
{".12 DCC Support", "docsis_tlv.mcap.dcc",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"DCC Support", HFILL}
},
{&hf_docsis_tlv_mcap_ip_filters,
@ -5720,7 +5711,7 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_mcap_exp_unicast_sid,
{".15 Expanded Unicast SID Space","docsis_tlv.mcap.exucsid",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Expanded Unicast SID Space", HFILL}
},
{&hf_docsis_tlv_mcap_rnghoff_cm,
@ -5806,12 +5797,12 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_mcap_sac,
{".22 Selectable Active Code Mode 2 Support","docsis_tlv.mcap.sac",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Selectable Active Code Mode 2 Support", HFILL}
},
{&hf_docsis_tlv_mcap_code_hop_mode2,
{".23 Code Hopping Mode 2 Support","docsis_tlv.mcap.codehopm2",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"Code Hopping Mode 2 Support", HFILL}
},
{&hf_docsis_tlv_mcap_mtc,
@ -5893,7 +5884,7 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_mcap_map_ucd,
{".37 MAP and UCD Receipt Support","docsis_tlv.mcap.mapucd",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"MAP and UCD Receipt Support", HFILL}
},
{&hf_docsis_tlv_mcap_udc,
@ -5903,7 +5894,7 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_mcap_ipv6,
{".39 IPv6 Support","docsis_tlv.mcap.ipv6",
FT_BOOLEAN, BASE_NONE, TFS (&on_off_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_on_off), 0x0,
"IPv6 Support", HFILL}
},
{&hf_docsis_tlv_mcap_ext_us_trans_power,
@ -6413,7 +6404,7 @@ proto_register_docsis_tlv (void)
},
{&hf_docsis_tlv_clsfr_act_state,
{".6 Activation State", "docsis_tlv.clsfr.actstate",
FT_BOOLEAN, BASE_NONE, TFS (&activation_tfs), 0x0,
FT_BOOLEAN, BASE_NONE, TFS (&tfs_active_inactive), 0x0,
"Classifier Activation State", HFILL}
},
{&hf_docsis_tlv_clsfr_dsc_act,

10
epan/dissectors/packet-docsis.c
View File

@ -228,12 +228,6 @@ static const true_false_string exthdr_tfs = {
"Extended Header Absent"
};
/* Plugins can't use true_false_string and value_string const from /epan on Windows
Duplicated here because of that */
static const true_false_string ena_dis_tfs = {
"Enabled",
"Disabled"
};
static const value_string local_proto_checksum_vals[] = {
{ PROTO_CHECKSUM_E_BAD, "Bad" },
@ -1041,7 +1035,7 @@ proto_register_docsis (void)
},
{&hf_docsis_ehdr_bpup2_bpi_en,
{"Encryption", "docsis.ehdr.bpup2_bpi_en",
FT_BOOLEAN, 8, TFS (&ena_dis_tfs), 0x80,
FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x80,
"BPI Enable", HFILL}
},
{&hf_docsis_ehdr_bpup2_toggle_bit,
@ -1096,7 +1090,7 @@ proto_register_docsis (void)
},
{ &hf_docsis_bpi_en,
{ "Encryption", "docsis.bpi_en",
FT_BOOLEAN, 8, TFS (&ena_dis_tfs), 0x80,
FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x80,
"BPI Enable", HFILL}
},
{ &hf_docsis_toggle_bit,

3
epan/dissectors/packet-ecmp.c
View File

@ -529,9 +529,6 @@ static const value_string file_integrity_vals[] = {
{ 0, NULL }
};
#if 0
static const true_false_string tfs_not_expected_expected = { "Odd", "Even" };
#endif
/* The following hf_* variables are used to hold the Wireshark IDs of
* our header fields; they are filled out when we call

6
epan/dissectors/packet-erf.c
View File

@ -645,14 +645,10 @@ static const header_field_info erf_tunneling_modes[] = {
{ "MPLS over VLAN", "mpls_vlan", FT_BOOLEAN, 32, NULL, 0x20, NULL, HFILL }
};
static const true_false_string erf_link_status_tfs = {
"Up",
"Down"
};
/* Used as templates for ERF_META_TAG_if_link_status */
static const header_field_info erf_link_status[] = {
{ "Link", "link", FT_BOOLEAN, 32, TFS(&erf_link_status_tfs), 0x1, NULL, HFILL }
{ "Link", "link", FT_BOOLEAN, 32, TFS(&tfs_up_down), 0x1, NULL, HFILL }
};
/* Used as templates for ERF_META_TAG_ptp_time_properties */

22
epan/dissectors/packet-h263.c
View File

@ -108,10 +108,6 @@ static const value_string h263_ufep_vals[] =
{ 0, NULL },
};
static const true_false_string on_off_flg = {
"On",
"Off"
};
static const true_false_string picture_coding_type_flg = {
"INTER (P-picture)",
"INTRA (I-picture)"
@ -129,10 +125,6 @@ static const true_false_string PB_frames_mode_flg = {
"Normal I- or P-picture"
};
static const true_false_string cpm_flg = {
"On",
"Off"
};
static const true_false_string custom_pcf_flg = {
"Custom PCF",
@ -741,7 +733,7 @@ proto_register_h263_data(void)
"h263.split_screen_indicator",
FT_BOOLEAN,
BASE_NONE,
TFS(&on_off_flg),
TFS(&tfs_on_off),
0x0,
"Split screen indicator", HFILL
}
@ -753,7 +745,7 @@ proto_register_h263_data(void)
"h263.document_camera_indicator",
FT_BOOLEAN,
BASE_NONE,
TFS(&on_off_flg),
TFS(&tfs_on_off),
0x0,
"Document camera indicator", HFILL
}
@ -765,7 +757,7 @@ proto_register_h263_data(void)
"h263.split_screen_indicator",
FT_BOOLEAN,
BASE_NONE,
TFS(&on_off_flg),
TFS(&tfs_on_off),
0x0,
"Full Picture Freeze Release", HFILL
}
@ -837,7 +829,7 @@ proto_register_h263_data(void)
"h263.opt_unres_motion_vector_mode",
FT_BOOLEAN,
BASE_NONE,
TFS(&on_off_flg),
TFS(&tfs_on_off),
0x0,
"Optional Unrestricted Motion Vector mode", HFILL
}
@ -849,7 +841,7 @@ proto_register_h263_data(void)
"h263.syntax_based_arithmetic_coding_mode",
FT_BOOLEAN,
BASE_NONE,
TFS(&on_off_flg),
TFS(&tfs_on_off),
0x0,
"Optional Syntax-based Arithmetic Coding mode", HFILL
}
@ -861,7 +853,7 @@ proto_register_h263_data(void)
"h263.optional_advanced_prediction_mode",
FT_BOOLEAN,
BASE_NONE,
TFS(&on_off_flg),
TFS(&tfs_on_off),
0x0,
"Optional Advanced Prediction mode", HFILL
}
@ -909,7 +901,7 @@ proto_register_h263_data(void)
"h263.cpm",
FT_BOOLEAN,
BASE_NONE,
TFS(&cpm_flg),
TFS(&tfs_on_off),
0x0,
"Continuous Presence Multipoint and Video Multiplex (CPM)", HFILL
}

7
epan/dissectors/packet-interlink.c
View File

@ -43,9 +43,6 @@ static dissector_handle_t data_handle;
static dissector_table_t subdissector_table;
static dissector_handle_t interlink_handle;
static const true_false_string flags_set_notset = {
"Set", "Not set"
};
static const value_string names_cmd[] = {
{ 1, "Data" },
@ -177,10 +174,10 @@ proto_register_interlink(void)
BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_interlink_flags_req_ack, {
"REQ_ACK", "interlink.flags.req_ack", FT_BOOLEAN,
16, TFS(&flags_set_notset), 0x01, NULL, HFILL }},
16, TFS(&tfs_set_notset), 0x01, NULL, HFILL }},
{ &hf_interlink_flags_inc_ack_port, {
"INC_ACK_PORT", "interlink.flags.inc_ack_port", FT_BOOLEAN,
16, TFS(&flags_set_notset), 0x02, NULL, HFILL }},
16, TFS(&tfs_set_notset), 0x02, NULL, HFILL }},
{ &hf_interlink_block_type, {
"Type", "interlink.type", FT_UINT8,
BASE_DEC, NULL, 0, NULL, HFILL }},

18
epan/dissectors/packet-ip.c
View File

@ -1798,16 +1798,6 @@ static const value_string iptos_vals[] = {
{ 0, NULL }
};
static const true_false_string tos_set_low = {
"Low",
"Normal"
};
static const true_false_string tos_set_high = {
"High",
"Normal"
};
static const true_false_string flags_sf_set_evil = {
"Evil",
"Not evil"
@ -2476,19 +2466,19 @@ proto_register_ip(void)
{ &hf_ip_tos_delay,
{ "Delay", "ip.tos.delay", FT_BOOLEAN, 8,
TFS(&tos_set_low), IPTOS_LOWDELAY, NULL, HFILL }},
TFS(&tfs_low_normal), IPTOS_LOWDELAY, NULL, HFILL }},
{ &hf_ip_tos_throughput,
{ "Throughput", "ip.tos.throughput", FT_BOOLEAN, 8,
TFS(&tos_set_high), IPTOS_THROUGHPUT, NULL, HFILL }},
TFS(&tfs_high_normal), IPTOS_THROUGHPUT, NULL, HFILL }},
{ &hf_ip_tos_reliability,
{ "Reliability", "ip.tos.reliability", FT_BOOLEAN, 8,
TFS(&tos_set_high), IPTOS_RELIABILITY, NULL, HFILL }},
TFS(&tfs_high_normal), IPTOS_RELIABILITY, NULL, HFILL }},
{ &hf_ip_tos_cost,
{ "Cost", "ip.tos.cost", FT_BOOLEAN, 8,
TFS(&tos_set_low), IPTOS_LOWCOST, NULL, HFILL }},
TFS(&tfs_low_normal), IPTOS_LOWCOST, NULL, HFILL }},
{ &hf_ip_len,
{ "Total Length", "ip.len", FT_UINT16, BASE_DEC,

11
epan/dissectors/packet-isakmp.c
View File

@ -1733,10 +1733,7 @@ static const true_false_string flag_v = {
"A higher version enabled",
"No higher version"
};
static const true_false_string flag_r = {
"Response",
"Request"
};
/* ROHC Attribute Type RFC5857 */
@ -3399,7 +3396,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
proto_item_append_text(fti, " (%s, %s, %s)",
tfs_get_string(flags & I_FLAG, &flag_i),
tfs_get_string(flags & V_FLAG, &flag_v),
tfs_get_string(flags & R_FLAG, &flag_r));
tfs_get_string(flags & R_FLAG, &tfs_response_request));
}
offset += 1;
}
@ -3413,7 +3410,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
col_append_fstr(pinfo->cinfo, COL_INFO, " MID=%02u %s %s",
hdr.message_id,
tfs_get_string(flags & I_FLAG, &flag_i),
tfs_get_string(flags & R_FLAG, &flag_r));
tfs_get_string(flags & R_FLAG, &tfs_response_request));
}
if (hdr.length < ISAKMP_HDR_SIZE) {
@ -6536,7 +6533,7 @@ proto_register_isakmp(void)
"Version Bit", HFILL }},
{ &hf_isakmp_flag_r,
{ "Response", "isakmp.flag_r",
FT_BOOLEAN, 8, TFS(&flag_r), R_FLAG,
FT_BOOLEAN, 8, TFS(&tfs_response_request), R_FLAG,
"Response Bit", HFILL }},
{ &hf_isakmp_messageid,
{ "Message ID", "isakmp.messageid",

11
epan/dissectors/packet-isis-lsp.c
View File

@ -4260,9 +4260,6 @@ dissect_isis_l2_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
* if it's *clear*, the metric is supported, and if it's *set*, the
* metric is not supported.
*/
static const true_false_string tfs_metric_supported_not_supported = {
"No", "Yes"
};
void
proto_register_isis_lsp(void)
@ -5733,7 +5730,7 @@ proto_register_isis_lsp(void)
},
{ &hf_isis_lsp_default_support,
{ "Default metric supported", "isis.lsp.default_support",
FT_BOOLEAN, 8, TFS(&tfs_metric_supported_not_supported), 0x80,
FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x80,
NULL, HFILL }
},
{ &hf_isis_lsp_delay,
@ -5743,7 +5740,7 @@ proto_register_isis_lsp(void)
},
{ &hf_isis_lsp_delay_support,
{ "Delay metric supported", "isis.lsp.delay_support",
FT_BOOLEAN, 8, TFS(&tfs_metric_supported_not_supported), 0x80,
FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x80,
NULL, HFILL }
},
{ &hf_isis_lsp_expense,
@ -5753,7 +5750,7 @@ proto_register_isis_lsp(void)
},
{ &hf_isis_lsp_expense_support,
{ "Expense metric supported", "isis.lsp.expense_support",
FT_BOOLEAN, 8, TFS(&tfs_metric_supported_not_supported), 0x80,
FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x80,
NULL, HFILL }
},
{ &hf_isis_lsp_error,
@ -5763,7 +5760,7 @@ proto_register_isis_lsp(void)
},
{ &hf_isis_lsp_error_support,
{ "Error metric supported", "isis.lsp.error_support",
FT_BOOLEAN, 8, TFS(&tfs_metric_supported_not_supported), 0x80,
FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x80,
NULL, HFILL }
},

27
epan/dissectors/packet-kerberos.c
View File

@ -3612,10 +3612,6 @@ static int * const hf_krb_pa_supported_enctypes_fields[] = {
NULL,
};
static const true_false_string supported_tfs = {
"Supported", "Not supported"
};
static int
dissect_kerberos_PA_SUPPORTED_ENCTYPES(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
int offset _U_, asn1_ctx_t *actx _U_,
@ -3636,9 +3632,6 @@ static int * const hf_krb_ad_ap_options_fields[] = {
NULL,
};
static const true_false_string set_tfs = {
"Set", "Not set"
};
static int
dissect_kerberos_AD_AP_OPTIONS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
@ -7661,37 +7654,37 @@ void proto_register_kerberos(void) {
FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_des_cbc_crc,
{ "des-cbc-crc", "kerberos.supported_entypes.des-cbc-crc",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00000001, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000001, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_des_cbc_md5,
{ "des-cbc-md5", "kerberos.supported_entypes.des-cbc-md5",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00000002, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000002, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_rc4_hmac,
{ "rc4-hmac", "kerberos.supported_entypes.rc4-hmac",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00000004, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000004, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_aes128_cts_hmac_sha1_96,
{ "aes128-cts-hmac-sha1-96", "kerberos.supported_entypes.aes128-cts-hmac-sha1-96",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00000008, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000008, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_aes256_cts_hmac_sha1_96,
{ "aes256-cts-hmac-sha1-96", "kerberos.supported_entypes.aes256-cts-hmac-sha1-96",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00000010, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000010, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_fast_supported,
{ "fast-supported", "kerberos.supported_entypes.fast-supported",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00010000, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00010000, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_compound_identity_supported,
{ "compound-identity-supported", "kerberos.supported_entypes.compound-identity-supported",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00020000, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00020000, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_claims_supported,
{ "claims-supported", "kerberos.supported_entypes.claims-supported",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00040000, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00040000, NULL, HFILL }},
{ &hf_krb_pa_supported_enctypes_resource_sid_compression_disabled,
{ "resource-sid-compression-disabled", "kerberos.supported_entypes.resource-sid-compression-disabled",
FT_BOOLEAN, 32, TFS(&supported_tfs), 0x00080000, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00080000, NULL, HFILL }},
{ &hf_krb_ad_ap_options,
{ "AD-AP-Options", "kerberos.ad_ap_options",
FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_krb_ad_ap_options_cbt,
{ "ChannelBindings", "kerberos.ad_ap_options.cbt",
FT_BOOLEAN, 32, TFS(&set_tfs), 0x00004000, NULL, HFILL }},
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00004000, NULL, HFILL }},
{ &hf_krb_ad_target_principal,
{ "Target Principal", "kerberos.ad_target_principal",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},

66
epan/dissectors/packet-mac-lte.c
View File

@ -593,10 +593,6 @@ static const true_false_string mac_lte_ph_value_vals = {
"Based on real transmission"
};
static const true_false_string mac_lte_scell_status_vals = {
"Activated",
"Deactivated"
};
#define EXT_LOGICAL_CHANNEL_ID_LCID 0x10
#define ACTIVATION_DEACTIVATION_CSI_RS_LCID 0x15
@ -9238,43 +9234,43 @@ void proto_register_mac_lte(void)
{ &hf_mac_lte_control_activation_deactivation_c7,
{ "SCell Index 7 Status",
"mac-lte.control.activation-deactivation.c7", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x80, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x80, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c6,
{ "SCell Index 6 Status",
"mac-lte.control.activation-deactivation.c6", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x40, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x40, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c5,
{ "SCell Index 5 Status",
"mac-lte.control.activation-deactivation.c5", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x20, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x20, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c4,
{ "SCell Index 4 Status",
"mac-lte.control.activation-deactivation.c4", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x10, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x10, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c3,
{ "SCell Index 3 Status",
"mac-lte.control.activation-deactivation.c3", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x08, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x08, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c2,
{ "SCell Index 2 Status",
"mac-lte.control.activation-deactivation.c2", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x04, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x04, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c1,
{ "SCell Index 1 Status",
"mac-lte.control.activation-deactivation.c1", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x02, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x02, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_reserved,
@ -9286,145 +9282,145 @@ void proto_register_mac_lte(void)
{ &hf_mac_lte_control_activation_deactivation_c15,
{ "SCell Index 15 Status",
"mac-lte.control.activation-deactivation.c15", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x80, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x80, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c14,
{ "SCell Index 14 Status",
"mac-lte.control.activation-deactivation.c14", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x40, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x40, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c13,
{ "SCell Index 13 Status",
"mac-lte.control.activation-deactivation.c13", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x20, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x20, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c12,
{ "SCell Index 12 Status",
"mac-lte.control.activation-deactivation.c12", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x10, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x10, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c11,
{ "SCell Index 11 Status",
"mac-lte.control.activation-deactivation.c11", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x08, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x08, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c10,
{ "SCell Index 10 Status",
"mac-lte.control.activation-deactivation.c10", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x04, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x04, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c9,
{ "SCell Index 9 Status",
"mac-lte.control.activation-deactivation.c9", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x02, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x02, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c8,
{ "SCell Index 8 Status",
"mac-lte.control.activation-deactivation.c8", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x01, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x01, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c23,
{ "SCell Index 23 Status",
"mac-lte.control.activation-deactivation.c23", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x80, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x80, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c22,
{ "SCell Index 22 Status",
"mac-lte.control.activation-deactivation.c22", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x40, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x40, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c21,
{ "SCell Index 21 Status",
"mac-lte.control.activation-deactivation.c21", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x20, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x20, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c20,
{ "SCell Index 20 Status",
"mac-lte.control.activation-deactivation.c20", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x10, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x10, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c19,
{ "SCell Index 19 Status",
"mac-lte.control.activation-deactivation.c19", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x08, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x08, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c18,
{ "SCell Index 18 Status",
"mac-lte.control.activation-deactivation.c18", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x04, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x04, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c17,
{ "SCell Index 17 Status",
"mac-lte.control.activation-deactivation.c17", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x02, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x02, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c16,
{ "SCell Index 16 Status",
"mac-lte.control.activation-deactivation.c16", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x01, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x01, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c31,
{ "SCell Index 31 Status",
"mac-lte.control.activation-deactivation.c31", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x80, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x80, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c30,
{ "SCell Index 30 Status",
"mac-lte.control.activation-deactivation.c30", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x40, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x40, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c29,
{ "SCell Index 29 Status",
"mac-lte.control.activation-deactivation.c29", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x20, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x20, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c28,
{ "SCell Index 28 Status",
"mac-lte.control.activation-deactivation.c28", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x10, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x10, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c27,
{ "SCell Index 27 Status",
"mac-lte.control.activation-deactivation.c27", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x08, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x08, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c26,
{ "SCell Index 26 Status",
"mac-lte.control.activation-deactivation.c26", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x04, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x04, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c25,
{ "SCell Index 25 Status",
"mac-lte.control.activation-deactivation.c25", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x02, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x02, NULL, HFILL
}
},
{ &hf_mac_lte_control_activation_deactivation_c24,
{ "SCell Index 24 Status",
"mac-lte.control.activation-deactivation.c24", FT_BOOLEAN, 8,
TFS(&mac_lte_scell_status_vals), 0x01, NULL, HFILL
TFS(&tfs_activated_deactivated), 0x01, NULL, HFILL
}
},

7
epan/dissectors/packet-p_mul.c
View File

@ -252,9 +252,6 @@ static const enum_val_t decode_options[] = {
{ NULL, NULL, 0 }
};
static const true_false_string no_yes = {
"No", "Yes"
};
static const gchar *get_type (guint8 value)
{
@ -1316,10 +1313,10 @@ void proto_register_p_mul (void)
NULL, 0x0, NULL, HFILL } },
{ &hf_map_first,
{ "First", "p_mul.first", FT_BOOLEAN, 8,
TFS (&no_yes), 0x80, NULL, HFILL } },
TFS (&tfs_no_yes), 0x80, NULL, HFILL } },
{ &hf_map_last,
{ "Last", "p_mul.last", FT_BOOLEAN, 8,
TFS (&no_yes), 0x40, NULL, HFILL } },
TFS (&tfs_no_yes), 0x40, NULL, HFILL } },
{ &hf_map_unused,
{ "MAP unused", "p_mul.unused", FT_UINT8, BASE_DEC,
NULL, 0xC0, NULL, HFILL } },

13
epan/dissectors/packet-pgm.c
View File

@ -313,11 +313,6 @@ static const value_string opx_vals[] = {
{ 0, NULL }
};
static const true_false_string opts_present = {
"Present",
"Not Present"
};
#define TLV_CHECK(ett) \
opt_tree = proto_tree_add_subtree_format(opts_tree, tvb, ptvcursor_current_offset(cursor), genopts_len, \
ett, &tf, "Option: %s, Length: %u", \
@ -1075,18 +1070,18 @@ proto_register_pgm(void)
NULL, 0x0, NULL, HFILL }},
{ &hf_pgm_main_opts_opt,
{ "Options", "pgm.hdr.opts.opt", FT_BOOLEAN, 8,
TFS(&opts_present), PGM_OPT, NULL, HFILL }},
TFS(&tfs_present_not_present), PGM_OPT, NULL, HFILL }},
{ &hf_pgm_main_opts_netsig,
{ "Network Significant Options", "pgm.hdr.opts.netsig",
FT_BOOLEAN, 8,
TFS(&opts_present), PGM_OPT_NETSIG, NULL, HFILL }},
TFS(&tfs_present_not_present), PGM_OPT_NETSIG, NULL, HFILL }},
{ &hf_pgm_main_opts_varlen,
{ "Variable length Parity Packet Option", "pgm.hdr.opts.varlen",
FT_BOOLEAN, 8,
TFS(&opts_present), PGM_OPT_VAR_PKTLEN, NULL, HFILL }},
TFS(&tfs_present_not_present), PGM_OPT_VAR_PKTLEN, NULL, HFILL }},
{ &hf_pgm_main_opts_parity,
{ "Parity", "pgm.hdr.opts.parity", FT_BOOLEAN, 8,
TFS(&opts_present), PGM_OPT_PARITY, NULL, HFILL }},
TFS(&tfs_present_not_present), PGM_OPT_PARITY, NULL, HFILL }},
{ &hf_pgm_main_cksum,
{ "Checksum", "pgm.hdr.cksum", FT_UINT16, BASE_HEX,
NULL, 0x0, NULL, HFILL }},

9
epan/dissectors/packet-rsl.c
View File

@ -1464,10 +1464,7 @@ dissect_rsl_ie_ms_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
return offset;
}
static const true_false_string rsl_ms_fpc_epc_mode_vals = {
"In use",
"Not in use"
};
/*
* 9.3.13 MS Power
*/
@ -4625,7 +4622,7 @@ void proto_register_rsl(void)
},
{ &hf_rsl_l1inf_fpc,
{ "FPC/EPC", "gsm_abis_rsl.ms_fpc",
FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x04,
FT_BOOLEAN, 8, TFS(&tfs_inuse_not_inuse), 0x04,
NULL, HFILL }
},
{ &hf_rsl_ms_power_lev,
@ -4635,7 +4632,7 @@ void proto_register_rsl(void)
},
{ &hf_rsl_ms_fpc,
{ "FPC/EPC", "gsm_abis_rsl.ms_fpc",
FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x20,
FT_BOOLEAN, 8, TFS(&tfs_inuse_not_inuse), 0x20,
NULL, HFILL }
},
{ &hf_rsl_act_timing_adv,

11
epan/dissectors/packet-sita.c
View File

@ -212,7 +212,6 @@ static const true_false_string tfs_sita_violation = { "Violation", ""
static const true_false_string tfs_sita_received = { "Received", "" };
static const true_false_string tfs_sita_lost = { "Lost", "" };
static const true_false_string tfs_sita_exceeded = { "Exceeded", "" };
static const true_false_string tfs_sita_on_off = { "On", "Off" };
static const value_string tfs_sita_proto[] = {
{ SITA_PROTO_UNUSED, "Unused" },
@ -341,27 +340,27 @@ proto_register_sita(void)
{ &hf_dsr,
{ "DSR", "sita.signals.dsr",
FT_BOOLEAN, 8, TFS(&tfs_sita_on_off), SITA_SIG_DSR,
FT_BOOLEAN, 8, TFS(&tfs_on_off), SITA_SIG_DSR,
"TRUE if Data Set Ready", HFILL }
},
{ &hf_dtr,
{ "DTR", "sita.signals.dtr",
FT_BOOLEAN, 8, TFS(&tfs_sita_on_off), SITA_SIG_DTR,
FT_BOOLEAN, 8, TFS(&tfs_on_off), SITA_SIG_DTR,
"TRUE if Data Terminal Ready", HFILL }
},
{ &hf_cts,
{ "CTS", "sita.signals.cts",
FT_BOOLEAN, 8, TFS(&tfs_sita_on_off), SITA_SIG_CTS,
FT_BOOLEAN, 8, TFS(&tfs_on_off), SITA_SIG_CTS,
"TRUE if Clear To Send", HFILL }
},
{ &hf_rts,
{ "RTS", "sita.signals.rts",
FT_BOOLEAN, 8, TFS(&tfs_sita_on_off), SITA_SIG_RTS,
FT_BOOLEAN, 8, TFS(&tfs_on_off), SITA_SIG_RTS,
"TRUE if Request To Send", HFILL }
},
{ &hf_dcd,
{ "DCD", "sita.signals.dcd",
FT_BOOLEAN, 8, TFS(&tfs_sita_on_off), SITA_SIG_DCD,
FT_BOOLEAN, 8, TFS(&tfs_on_off), SITA_SIG_DCD,
"TRUE if Data Carrier Detect", HFILL }
},
{ &hf_signals,

7
epan/dissectors/packet-vines.c
View File

@ -1338,7 +1338,6 @@ static const true_false_string tfs_vine_rtp_not_all_neighbor_all_neighbor = { "N
static const true_false_string tfs_vine_rtp_sequenced_not_sequenced = { "Sequenced", "Not Sequenced" };
static const true_false_string tfs_part_not_part = { "Part of", "Not part of" };
static const true_false_string tfs_fast_bus_slow_bus = { "Fast bus", "Slow bus" };
static const true_false_string tfs_vine_rtp_no_yes = { "No", "Yes" };
static void
rtp_show_machine_type(proto_tree *tree, tvbuff_t *tvb, int offset, int hf_machine)
@ -1628,7 +1627,7 @@ proto_register_vines_rtp(void)
{ &hf_vines_rtp_comp_flag_sequence_rtp,
{ "Sequenced RTP", "vines_rtp.comp_flag.sequence_rtp",
FT_BOOLEAN, 8, TFS(&tfs_vine_rtp_not_all_neighbor_all_neighbor), 0x02,
NULL, HFILL }},
NULL, HFILL }},
{ &hf_vines_rtp_comp_flag_sequence_rtp_version,
{ "RTP version mismatch", "vines_rtp.comp_flag.rtp_version",
@ -1652,7 +1651,7 @@ proto_register_vines_rtp(void)
{ &hf_vines_rtp_control_specific_request,
{ "Contains info specifically requested", "vines_rtp.control.specific_request",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x04,
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x04,
NULL, HFILL }},
{ &hf_vines_rtp_control_end_msg,
@ -1682,7 +1681,7 @@ proto_register_vines_rtp(void)
{ &hf_vines_rtp_flag_sequence_rtp,
{ "Network supports Sequenced RTP", "vines_rtp.flag.sequence_rtp",
FT_BOOLEAN, 8, TFS(&tfs_vine_rtp_no_yes), 0x08,
FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x08,
NULL, HFILL }},
{ &hf_vines_rtp_flag_network_p2p,

20
epan/dissectors/packet-vnc.c
View File

@ -189,10 +189,6 @@ static const value_string vnc_server_message_types_vs[] = {
{ 0, NULL }
};
static const true_false_string button_mask_tfs = {
"Pressed",
"Not pressed"
};
#define VNC_ENCODING_TYPE_DESKTOP_SIZE 0xFFFFFF21
#define VNC_ENCODING_TYPE_LAST_RECT 0xFFFFFF20
@ -3873,42 +3869,42 @@ proto_register_vnc(void)
/* Client Pointer Event */
{ &hf_vnc_button_1_pos,
{ "Mouse button #1 position", "vnc.button_1_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x1,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x1,
"Whether mouse button #1 is being pressed or not", HFILL }
},
{ &hf_vnc_button_2_pos,
{ "Mouse button #2 position", "vnc.button_2_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x2,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x2,
"Whether mouse button #2 is being pressed or not", HFILL }
},
{ &hf_vnc_button_3_pos,
{ "Mouse button #3 position", "vnc.button_3_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x4,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x4,
"Whether mouse button #3 is being pressed or not", HFILL }
},
{ &hf_vnc_button_4_pos,
{ "Mouse button #4 position", "vnc.button_4_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x8,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x8,
"Whether mouse button #4 is being pressed or not", HFILL }
},
{ &hf_vnc_button_5_pos,
{ "Mouse button #5 position", "vnc.button_5_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x10,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x10,
"Whether mouse button #5 is being pressed or not", HFILL }
},
{ &hf_vnc_button_6_pos,
{ "Mouse button #6 position", "vnc.button_6_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x20,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x20,
"Whether mouse button #6 is being pressed or not", HFILL }
},
{ &hf_vnc_button_7_pos,
{ "Mouse button #7 position", "vnc.button_7_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x40,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x40,
"Whether mouse button #7 is being pressed or not", HFILL }
},
{ &hf_vnc_button_8_pos,
{ "Mouse button #8 position", "vnc.button_8_pos",
FT_BOOLEAN, 8, TFS(&button_mask_tfs), 0x80,
FT_BOOLEAN, 8, TFS(&tfs_pressed_not_pressed), 0x80,
"Whether mouse button #8 is being pressed or not", HFILL }
},
{ &hf_vnc_pointer_x_pos,

179
tools/check_tfs.py Executable file
View File

@ -0,0 +1,179 @@
#!/usr/bin/env python3
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# SPDX-License-Identifier: GPL-2.0-or-later
import os
import re
import argparse
import signal
# This utility scans for tfs items, and works out if standard ones
# could have been used intead (from epan/tfs.c)
# TODO:
# - check how many of the definitions in epan/tfs.c are used in other dissectors
# - see if there are other values that should be in epan/tfs.c and shared
# - look for leading/trailing whitespace in true/flase strings?
# Try to exit soon after Ctrl-C is pressed.
should_exit = False
def signal_handler(sig, frame):
global should_exit
should_exit = True
print('You pressed Ctrl+C - exiting')
signal.signal(signal.SIGINT, signal_handler)
class TFS:
def __init__(self, file, val1, val2):
self.file = file
self.val1 = val1
self.val2 = val2
def __str__(self):
return '{' + self.val1 + ',' + self.val2 + '}'
def removeComments(code_string):
code_string = re.sub(re.compile("/\*.*?\*/",re.DOTALL ) ,"" ,code_string) # C-style comment
code_string = re.sub(re.compile("//.*?\n" ) ,"" ,code_string) # C++-style comment
return code_string
# Look for hf items in a dissector file.
def find_items(filename):
items = {}
with open(filename, 'r') as f:
contents = f.read()
# Example: const true_false_string tfs_true_false = { "True", "False" };
# Remove comments so as not to trip up RE.
contents = removeComments(contents)
matches = re.finditer(r'.*const\s*true_false_string\s*([a-z_]*)\s*=\s*{\s*\"([a-zA-Z_ ]*)\"\s*,\s*\"([a-zA-Z_ ]*)\"', contents)
for m in matches:
name = m.group(1)
val1 = m.group(2)
val2 = m.group(3)
# Store this entry.
items[name] = TFS(filename, val1, val2)
return items
def isDissectorFile(filename):
p = re.compile('.*packet-.*\.c')
return p.match(filename)
def findDissectorFilesInFolder(folder):
# Look at files in sorted order, to give some idea of how far through is.
files = []
for f in sorted(os.listdir(folder)):
if should_exit:
return
if isDissectorFile(f):
filename = os.path.join(folder, f)
files.append(filename)
return files
issues_found = 0
# Check the given dissector file.
def checkFile(filename, tfs_items):
global issues_found
# Find items.
items = find_items(filename)
# See if any of these items already existed in tfs.c
for i in items:
for t in tfs_items:
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
#################################################################
# Main logic.
# command-line args. Controls which dissector files should be checked.
# If no args given, will just scan epan/dissectors folder.
parser = argparse.ArgumentParser(description='Check calls in dissectors')
parser.add_argument('--file', action='store', default='',
help='specify individual dissector file to test')
parser.add_argument('--commits', action='store',
help='last N commits to check')
parser.add_argument('--open', action='store_true',
help='check open files')
args = parser.parse_args()
# Get files from wherever command-line args indicate.
files = []
if args.file:
# Add single specified file..
if not args.file.startswith('epan'):
files.append(os.path.join('epan', 'dissectors', args.file))
else:
files.append(args.file)
elif args.commits:
# Get files affected by specified number of commits.
command = ['git', 'diff', '--name-only', 'HEAD~' + args.commits]
files = [f.decode('utf-8')
for f in subprocess.check_output(command).splitlines()]
# Will examine dissector files only
files = list(filter(lambda f : isDissectorFile(f), files))
elif args.open:
# Unstaged changes.
command = ['git', 'diff', '--name-only']
files = [f.decode('utf-8')
for f in subprocess.check_output(command).splitlines()]
# Only interested in dissector files.
files = list(filter(lambda f : isDissectorFile(f), files))
# Staged changes.
command = ['git', 'diff', '--staged', '--name-only']
files_staged = [f.decode('utf-8')
for f in subprocess.check_output(command).splitlines()]
# Only interested in dissector files.
files_staged = list(filter(lambda f : isDissectorFile(f), files_staged))
for f in files:
files.append(f)
for f in files_staged:
if not f in files:
files.append(f)
else:
# Find all dissector files from folder.
files = findDissectorFilesInFolder(os.path.join('epan', 'dissectors'))
# If scanning a subset of files, list them here.
print('Examining:')
if args.file or args.commits or args.open:
if files:
print(' '.join(files), '\n')
else:
print('No files to check.\n')
else:
print('All dissector modules\n')
# Get standard/ shared ones.
tfs_entries = find_items(os.path.join('epan', 'tfs.c'))
# Now check the files to see if they could have used shared ones instead.
for f in files:
if should_exit:
exit(1)
checkFile(f, tfs_entries)
# Show summary.
print(issues_found, 'issues found')