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

Fix some wrong filter names. 

These were detected by running check_typed_item_calls.py
with --consecutive, which flags items that have different
labels but the same filter string.  Usually this is because
of copy/paste.

Quite a few similar bugs still exist, will address in a future commit.
This commit is contained in:
Martin Mathieson 2020-09-26 23:14:23 +01:00 committed by AndersBroman
parent 2dd014f8f2
commit 08ab0e5d1f
19 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-alcap.c
View File

@ -1736,7 +1736,7 @@ proto_register_alcap(void)
NULL, HFILL }
},
{ &hf_alcap_ssisa_max_sssar_bw,
{ "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sssar.max_len.fw",
{ "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sssar.max_len.bw",
FT_UINT24, BASE_DEC, NULL, 0,
NULL, HFILL }
},
@ -1767,7 +1767,7 @@ proto_register_alcap(void)
NULL, HFILL }
},
{ &hf_alcap_ssisu_max_sssar_bw,
{ "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisu.sssar.max_len.fw",
{ "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisu.sssar.max_len.bw",
FT_UINT24, BASE_DEC, NULL, 0,
NULL, HFILL }
},

2
epan/dissectors/packet-amqp.c
View File

@ -13252,7 +13252,7 @@ proto_register_amqp(void)
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}},
{&hf_amqp_0_10_dtx_xa_status, {
"dtx.xa-status", "amqp.method.properties.broadcast",
"DTX xa-status", "amqp.dtx.xa-status",
FT_UINT16, BASE_DEC, VALS(amqp_0_10_xa_status), 0,
NULL, HFILL}},
{&hf_amqp_payload, {

4
epan/dissectors/packet-ansi_a.c
View File

@ -11288,12 +11288,12 @@ proto_register_ansi_a(void)
NULL, HFILL }
},
{ &hf_ansi_a_scm_band_class_entry_opmode5_2,
{ "Air Interface OP_MODE5: DS-41", "ansi_a_bsmap.cm2.scm.bc_entry.opmode4",
{ "Air Interface OP_MODE5: DS-41", "ansi_a_bsmap.cm2.scm.bc_entry.opmode5",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x04,
NULL, HFILL }
},
{ &hf_ansi_a_scm_band_class_entry_opmode6_2,
{ "Air Interface OP_MODE6: MC-MAP", "ansi_a_bsmap.cm2.scm.bc_entry.opmode4",
{ "Air Interface OP_MODE6: MC-MAP", "ansi_a_bsmap.cm2.scm.bc_entry.opmode6",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x02,
NULL, HFILL }
},

2
epan/dissectors/packet-batadv.c
View File

@ -5310,7 +5310,7 @@ void proto_register_batadv(void)
NULL, HFILL }
},
{ &hf_batadv_tvlv_version,
{ "Version", "batadv.tvlv.length",
{ "Version", "batadv.tvlv.version",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},

2
epan/dissectors/packet-bgp.c
View File

@ -10276,7 +10276,7 @@ proto_register_bgp(void)
{ "MPLS Label", "bgp.update.encaps_tunnel_tlv_subtlv.segment_list_subtlv.mpls_label", FT_UINT24,
BASE_HEX, NULL, BGP_MPLS_LABEL, NULL, HFILL}},
{ &hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_traffic_class,
{ "Traffic Class", "bgp.update.encaps_tunnel_tlv_subtlv.segment_list_subtlv.mpls_label", FT_UINT8,
{ "Traffic Class", "bgp.update.encaps_tunnel_tlv_subtlv.segment_list_subtlv.traffic_class", FT_UINT8,
BASE_HEX, NULL, BGP_MPLS_TRAFFIC_CLASS, NULL, HFILL}},
{ &hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_bottom_stack,
{ "Bottom-of-Stack", "bgp.update.encaps_tunnel_tlv_subtlv.segment_list_subtlv.bottom_stack", FT_BOOLEAN,

2
epan/dissectors/packet-btatt.c
View File

@ -12279,7 +12279,7 @@ proto_register_btatt(void)
NULL, HFILL}
},
{&hf_btatt_report_reference_report_type,
{"Report Type", "btatt.report_reference.report_id",
{"Report Type", "btatt.report_reference.report_type",
FT_UINT8, BASE_HEX, VALS(report_reference_report_type_vals), 0x0,
NULL, HFILL}
},

4
epan/dissectors/packet-bthci_cmd.c
View File

@ -6672,7 +6672,7 @@ proto_register_bthci_cmd(void)
NULL, HFILL}
},
{ &hf_bthci_cmd_inq_mode,
{"Inquiry Mode", "bthci_cmd.inq_scan_type",
{"Inquiry Mode", "bthci_cmd.inq_mode",
FT_UINT8, BASE_DEC, VALS(bthci_cmd_inq_modes), 0x0,
NULL, HFILL}
},
@ -7393,7 +7393,7 @@ proto_register_bthci_cmd(void)
NULL, HFILL }
},
{ &hf_bthci_cmd_test_packet_payload,
{ "Packet Payload", "bthci_cmd.le_test_data_length",
{ "Packet Payload", "bthci_cmd.le_test_payload",
FT_UINT8, BASE_HEX, VALS(cmd_le_test_pkt_payload), 0x0,
NULL, HFILL }
},

2
epan/dissectors/packet-bthci_evt.c
View File

@ -7936,7 +7936,7 @@ proto_register_bthci_evt(void)
NULL, HFILL}
},
{ &hf_bthci_evt_inq_mode,
{"Inquiry Mode", "bthci_evt.inq_scan_type",
{"Inquiry Mode", "bthci_evt.inq_mode",
FT_UINT8, BASE_DEC, VALS(bthci_cmd_inq_modes), 0x0,
NULL, HFILL}
},

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

@ -3431,9 +3431,9 @@ void proto_register_cemi( void )
{ &hf_cemi_tc, { "Service", "cemi.tc", FT_UINT8, BASE_HEX, VALS( tc_vals ), 0x03, NULL, HFILL } },
{ &hf_cemi_ac, { "Service", "cemi.ac", FT_UINT16, BASE_HEX, VALS( ac_vals ), 0x03C0, NULL, HFILL } },
{ &hf_cemi_ad, { "Data", "cemi.ad", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ad_memory_length, { "Memory Length", "cemi.ad", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ad_channel, { "Channel", "cemi.ad", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ad_type, { "Data", "cemi.ad", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ad_memory_length, { "Memory Length", "cemi.ad.ml", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ad_channel, { "Channel", "cemi.ad.ch", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ad_type, { "Data", "cemi.ad.type", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL } },
{ &hf_cemi_ax, { "Service", "cemi.ax", FT_UINT16, BASE_HEX, VALS( ax_vals ), 0x03FF, NULL, HFILL } },
{ &hf_cemi_pw, { "Writable", "cemi.pw", FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL } },
{ &hf_cemi_pdt, { "Property Data Type", "cemi.pdt", FT_UINT8, BASE_HEX, VALS( pdt_vals ), 0x3F, NULL, HFILL } },

2
epan/dissectors/packet-cip.c
View File

@ -8619,7 +8619,7 @@ proto_register_cip(void)
{ &hf_cip_pccc_resp_code, { "Response Code", "cip.pccc.resp.code", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_pccc_execute_multi_count, { "Execute Multiple Command - Number of Commands", "cip.pccc.execute.multi.count", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_pccc_execute_multi_len, { "Execute Multiple Command - Command Length", "cip.pccc.execute.multi.count", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_pccc_execute_multi_fnc, { "Execute Multiple Command - Function Code", "cip.pccc.execute.multi.count", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_pccc_execute_multi_fnc, { "Execute Multiple Command - Function Code", "cip.pccc.execute.multi.code", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_pccc_data, { "Data", "cip.pccc.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}
};

2
epan/dissectors/packet-couchbase.c
View File

@ -3020,7 +3020,7 @@ proto_register_couchbase(void)
{ &hf_extras_marker_version, { "Snapshot Marker Version", "couchbase.extras.marker_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_vbucket_uuid, { "VBucket UUID", "couchbase.extras.vbucket_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_snap_start_seqno, { "Snapshot Start Sequence Number", "couchbase.extras.snap_start_seqno", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_snap_end_seqno, { "Snapshot End Sequence Number", "couchbase.extras.snap_start_seqno", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_snap_end_seqno, { "Snapshot End Sequence Number", "couchbase.extras.snap_end_seqno", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_by_seqno, { "by_seqno", "couchbase.extras.by_seqno", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_prepared_seqno, { "by_seqno (prepared)", "couchbase.extras.by_seqno_prepared", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_extras_commit_seqno, { "by_seqno (commit)", "couchbase.extras.by_seqno_commit", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },

2
epan/dissectors/packet-dcm.c
View File

@ -4042,7 +4042,7 @@ proto_register_dcm(void)
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
{ &hf_dcm_pctx_id, { "Presentation Context ID", "dicom.pctx.id",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_dcm_pctx_result, { "Presentation Context Result", "dicom.pctx.id",
{ &hf_dcm_pctx_result, { "Presentation Context Result", "dicom.pctx.result",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_dcm_pctx_abss_syntax, { "Abstract Syntax", "dicom.pctx.abss.syntax",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },

2
epan/dissectors/packet-fc.c
View File

@ -1458,7 +1458,7 @@ proto_register_fc(void)
{"Type", "fc.vft.type", FT_UINT8, BASE_DEC, NULL,
0, "Type of tagged frame", HFILL}},
{ &hf_fc_vft_pri,
{"Priority", "fc.vft.type", FT_UINT8, BASE_DEC, NULL,
{"Priority", "fc.vft.pri", FT_UINT8, BASE_DEC, NULL,
0, "QoS Priority", HFILL}},
{ &hf_fc_vft_vf_id,
{"VF_ID", "fc.vft.vf_id", FT_UINT16, BASE_DEC, NULL,

2
epan/dissectors/packet-gtp.c
View File

@ -10492,7 +10492,7 @@ proto_register_gtp(void)
NULL, HFILL}
},
{&hf_gtp_ext_hdr_nr_ran_cont_dl_delay_du_result,
{ "DL Delay DU Result", "gtp.ext_hdr.nr_ran_cont.ul_delay_du_result",
{ "DL Delay DU Result", "gtp.ext_hdr.nr_ran_cont.dl_delay_du_result",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},

2
epan/dissectors/packet-pfcp.c
View File

@ -9913,7 +9913,7 @@ proto_register_pfcp(void)
NULL, HFILL }
},
{ &hf_pfcp_gate_status_b0b1_dlgate,
{ "DL Gate", "pfcp.gate_status.ulgate",
{ "DL Gate", "pfcp.gate_status.dlgate",
FT_UINT8, BASE_DEC, VALS(pfcp_gate_status_vals), 0x03,
NULL, HFILL }
},

2
epan/dissectors/packet-rdm.c
View File

@ -6288,7 +6288,7 @@ proto_register_rdm(void)
NULL, HFILL }},
{ &hf_rdm_pd_rdm_traffic_enable_rdm_enabled,
{ "Enabled", "rdm.pd.rdm_traffic_enable.endpoint_id",
{ "Enabled", "rdm.pd.rdm_traffic_enable.enabled",
FT_UINT8, BASE_DEC, VALS(true_false_vals), 0x0,
NULL, HFILL }},

2
epan/dissectors/packet-rtls.c
View File

@ -474,7 +474,7 @@ proto_register_rtls(void)
},
/* AR_STATION_REQUEST */
{ &hf_rtls_sr_mac_address,
{ "MAC Address", "rtls.as_tag_addr",
{ "MAC Address", "rtls.sr_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},

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

@ -6507,7 +6507,7 @@ void proto_register_sip(void)
"RFC 3261: Expires Header", HFILL }
},
{ &hf_header_array[POS_FEATURE_CAPS],
{ "Feature-Caps", "sip.feature_caps",
{ "Feature-Caps", "sip.Feature-Caps",
FT_STRING, BASE_NONE,NULL,0x0,
"RFC 6809: Feature-Caps", HFILL }
},
@ -6527,12 +6527,12 @@ void proto_register_sip(void)
NULL, HFILL }
},
{ &hf_header_array[POS_GEOLOCATION_ERROR],
{ "Geolocation-Error", "sip.Geolocation",
{ "Geolocation-Error", "sip.Geolocation-Error",
FT_STRING, BASE_NONE,NULL,0x0,
NULL, HFILL }
},
{ &hf_header_array[POS_GEOLOCATION_ROUTING],
{ "Geolocation-Routing", "sip.Geolocation_Routing",
{ "Geolocation-Routing", "sip.Geolocation-Routing",
FT_STRING, BASE_NONE,NULL,0x0,
NULL, HFILL }
},

2
epan/dissectors/packet-snort.c
View File

@ -1484,7 +1484,7 @@ proto_register_snort(void)
"Number of match for this alert among all alerts", HFILL }},
{ &hf_snort_global_stats_rule_alerts_count,
{ "Number of alerts for this rule", "snort.global-stats.rule.match-number", FT_UINT32, BASE_DEC, NULL, 0x00,
{ "Number of alerts for this rule", "snort.global-stats.rule.alerts-count", FT_UINT32, BASE_DEC, NULL, 0x00,
"Number of alerts detected for this rule", HFILL }},
{ &hf_snort_global_stats_rule_match_number,
{ "Match number for this rule", "snort.global-stats.rule.match-number", FT_UINT32, BASE_DEC, NULL, 0x00,