diff options
26 files changed, 186 insertions, 186 deletions
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index fff3876382..1ae28caed1 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -82,7 +82,7 @@ proto_register_cert(void) */ static hf_register_info hf[] = { { &hf_cert, - { "Certificate", "cert", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}}, + { "Certificate", "pkix-cert.cert", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}}, }; /* Setup protocol subtree array */ diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index 988a7e97d9..1319744e3a 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -513,7 +513,7 @@ proto_register_applemidi( void ) &hf_applemidi_unknown_data, { "Unknown Data", - "rtpmidi.unknown_data", + "applemidi.unknown_data", FT_BYTES, BASE_NONE, NULL, diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 72ad642134..7a871fe699 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -2319,43 +2319,43 @@ proto_register_atalk(void) static hf_register_info hf_pap[] = { { &hf_pap_connid, - { "ConnID", "pap.connid", FT_UINT8, BASE_DEC, NULL, 0x0, + { "ConnID", "prap.connid", FT_UINT8, BASE_DEC, NULL, 0x0, "PAP connection ID", HFILL }}, { &hf_pap_function, - { "Function", "pap.function", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &pap_function_vals_ext, 0x0, + { "Function", "prap.function", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &pap_function_vals_ext, 0x0, "PAP function", HFILL }}, { &hf_pap_socket, - { "Socket", "pap.socket", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Socket", "prap.socket", FT_UINT8, BASE_DEC, NULL, 0x0, "ATP responding socket number", HFILL }}, { &hf_pap_quantum, - { "Quantum", "pap.quantum", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Quantum", "prap.quantum", FT_UINT8, BASE_DEC, NULL, 0x0, "Flow quantum", HFILL }}, { &hf_pap_waittime, - { "Wait time", "pap.waittime", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Wait time", "prap.waittime", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pap_result, - { "Result", "pap.result", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Result", "prap.result", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pap_seq, - { "Sequence", "pap.seq", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Sequence", "prap.seq", FT_UINT16, BASE_DEC, NULL, 0x0, "Sequence number", HFILL }}, { &hf_pap_status, - { "Status", "pap.status", FT_STRING, BASE_NONE, NULL, 0x0, + { "Status", "prap.status", FT_STRING, BASE_NONE, NULL, 0x0, "Printer status", HFILL }}, { &hf_pap_eof, - { "EOF", "pap.eof", FT_BOOLEAN, BASE_NONE, + { "EOF", "prap.eof", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pap_pad, - { "Pad", "pap.pad", FT_NONE, BASE_NONE, NULL, 0, + { "Pad", "prap.pad", FT_NONE, BASE_NONE, NULL, 0, "Pad Byte", HFILL }}, }; @@ -2409,7 +2409,7 @@ proto_register_atalk(void) proto_asp = proto_register_protocol("AppleTalk Session Protocol", "ASP", "asp"); proto_register_field_array(proto_asp, hf_asp, array_length(hf_asp)); - proto_pap = proto_register_protocol("Printer Access Protocol", "PAP", "apap"); + proto_pap = proto_register_protocol("Printer Access Protocol", "PrAP", "prap"); proto_register_field_array(proto_pap, hf_pap, array_length(hf_pap)); proto_zip = proto_register_protocol("Zone Information Protocol", "ZIP", "zip"); diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index f26eb6894c..180c89b8a8 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -792,62 +792,62 @@ proto_register_bfd(void) "The Sequence Number is periodically incremented to prevent replay attacks", HFILL } }, { &hf_mep_type, - { "Type", "mep.type", + { "Type", "bfd.mep.type", FT_UINT16, BASE_DEC, VALS(mplstp_mep_tlv_type_values), 0x0, "The type of the MEP Id", HFILL } }, { &hf_mep_len, - { "Length", "mep.len", + { "Length", "bfd.mep.len", FT_UINT16, BASE_DEC, NULL , 0x0, "The length of the MEP Id", HFILL } }, { &hf_mep_global_id, - { "Global Id", "mep.global.id", + { "Global Id", "bfd.mep.global.id", FT_UINT32, BASE_DEC, NULL , 0x0, "MPLS-TP Global MEP Id", HFILL } }, { &hf_mep_node_id, - { "Node Id", "mep.node.id", + { "Node Id", "bfd.mep.node.id", FT_IPv4, BASE_NONE, NULL , 0x0, "MPLS-TP Node Identifier", HFILL } }, { &hf_mep_interface_no, - { "Interface Number", "mep.interface.no", + { "Interface Number", "bfd.mep.interface.no", FT_UINT32, BASE_DEC, NULL , 0x0, "MPLS-TP Interface Number", HFILL } }, { &hf_mep_tunnel_no, - { "Tunnel Number", "mep.tunnel.no", + { "Tunnel Number", "bfd.mep.tunnel.no", FT_UINT16, BASE_DEC, NULL , 0x0, NULL, HFILL } }, { &hf_mep_lsp_no, - { "LSP Number", "mep.lsp.no", + { "LSP Number", "bfd.mep.lsp.no", FT_UINT16, BASE_DEC, NULL , 0x0, NULL, HFILL } }, { &hf_mep_ac_id, - { "AC Id", "mep.ac.id", + { "AC Id", "bfd.mep.ac.id", FT_UINT32, BASE_DEC, NULL , 0x0, NULL, HFILL } }, { &hf_mep_agi_type, - { "AGI TYPE", "mep.agi.type", + { "AGI TYPE", "bfd.mep.agi.type", FT_UINT8, BASE_DEC, NULL , 0x0, NULL, HFILL } }, { &hf_mep_agi_len, - { "AGI Length", "mep.agi.len", + { "AGI Length", "bfd.mep.agi.len", FT_UINT8, BASE_DEC, NULL , 0x0, NULL, HFILL } }, { &hf_mep_agi_val, - { "AGI value", "mep.agi.val", + { "AGI value", "bfd.mep.agi.val", FT_STRING, BASE_NONE, NULL , 0x0, NULL, HFILL } }, { &hf_section_interface_no, - { "Interface Number", "mep.interface.no", + { "Interface Number", "bfd.mep.interface.no", FT_UINT32, BASE_DEC, NULL , 0x0, "MPLS-TP Interface Number", HFILL } } diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index 39ce13e6c4..cd2b1393cd 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -549,13 +549,13 @@ proto_register_cbs(void) }; /* Register the protocol name and description */ - proto_cell_broadcast = proto_register_protocol("GSM Cell Broadcast Service", "GSM Cell Broadcast Service", "gsm_cell_broadcast"); + proto_cell_broadcast = proto_register_protocol("GSM Cell Broadcast Service", "GSM Cell Broadcast Service", "gsm_cbs"); proto_register_field_array(proto_cell_broadcast, hf_cbs, array_length(hf_cbs)); register_init_routine(gsm_cbs_message_reassembly_init); /* subdissector code */ - register_dissector("gsm_cell_broadcast", dissect_gsm_cell_broadcast, proto_cell_broadcast); + register_dissector("gsm_cbs", dissect_gsm_cell_broadcast, proto_cell_broadcast); register_dissector("umts_cell_broadcast", dissect_umts_cell_broadcast_message, proto_cell_broadcast); /* subtree array */ diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 6821757eda..0538a6cacd 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -92,12 +92,12 @@ proto_register_cimetrics(void) { static hf_register_info hf[] = { { &hf_cimetrics_mstp_timer, - { "Delta Time", "cimetrics_mstp.timer", + { "Delta Time", "cimetrics.mstp_timer", FT_UINT16, BASE_DEC, NULL, 0, "Milliseconds", HFILL } }, { &hf_cimetrics_mstp_value, - { "8-bit value", "cimetrics_mstp.value", + { "8-bit value", "cimetrics.mstp_value", FT_UINT8, BASE_DEC, NULL, 0, "value", HFILL } } diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 15b136a18b..c070902a55 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -1753,7 +1753,7 @@ proto_register_ehs(void) /* aos/los protocol data zone */ { &hf_ehs_dz_aoslos_indicator, - { "AOS/LOS Indicator", "dz.aoslos_indicator", + { "AOS/LOS Indicator", "ehs.dz.aoslos_indicator", FT_UINT8, BASE_DEC, VALS(ehs_data_zone_aoslos_indicator), 0x03, NULL, HFILL } }, @@ -1761,133 +1761,133 @@ proto_register_ehs(void) /* udsm protocol data zone */ { &hf_ehs_dz_udsm_ccsds_vs_bpdu, - { "CCSDS vs BPDU", "dz.udsm_ccsds_vs_bpdu", + { "CCSDS vs BPDU", "ehs.dz.udsm_ccsds_vs_bpdu", FT_UINT8, BASE_DEC, VALS(ehs_data_zone_udsm_ccsds_vs_bpdu), 0x80, NULL, HFILL } }, { &hf_ehs_dz_udsm_unused1, - { "Unused 1", "dz.udsm_unused1", + { "Unused 1", "ehs.dz.udsm_unused1", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL } }, { &hf_ehs_dz_udsm_unused2, - { "Unused 2", "dz.udsm_unused2", + { "Unused 2", "ehs.dz.udsm_unused2", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_unused3, - { "Unused 3", "dz.udsm_unused3", + { "Unused 3", "ehs.dz.udsm_unused3", FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, { &hf_ehs_dz_udsm_gse_pkt_id, - { "GSE Pkt ID", "dz.udsm_gse_pkt_id", + { "GSE Pkt ID", "ehs.dz.udsm_gse_pkt_id", FT_BOOLEAN, 16, NULL, 0x1000, NULL, HFILL } }, { &hf_ehs_dz_udsm_payload_vs_core, - { "Payload vs Core", "dz.udsm_payload_vs_core", + { "Payload vs Core", "ehs.dz.udsm_payload_vs_core", FT_UINT16, BASE_DEC, VALS(ehs_data_zone_udsm_payload_vs_core), 0x0800, NULL, HFILL } }, { &hf_ehs_dz_udsm_apid, - { "APID", "dz.udsm_apid", + { "APID", "ehs.dz.udsm_apid", FT_UINT16, BASE_DEC, NULL, 0x07ff, NULL, HFILL } }, { &hf_ehs_dz_udsm_start_time_year, - { "Start Time Years since 1900", "dz.udsm_start_time_year", + { "Start Time Years since 1900", "ehs.dz.udsm_start_time_year", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_start_time_jday, - { "Start Time Julian Day", "dz.udsm_start_time_jday", + { "Start Time Julian Day", "ehs.dz.udsm_start_time_jday", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_start_time_hour, - { "Start Time Hour", "dz.udsm_start_time_hour", + { "Start Time Hour", "ehs.dz.udsm_start_time_hour", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_start_time_minute, - { "Start Time Minute", "dz.udsm_start_time_minute", + { "Start Time Minute", "ehs.dz.udsm_start_time_minute", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_start_time_second, - { "Start Time Second", "dz.udsm_start_time_second", + { "Start Time Second", "ehs.dz.udsm_start_time_second", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_stop_time_year, - { "Stop Time Years since 1900", "dz.udsm_stop_time_year", + { "Stop Time Years since 1900", "ehs.dz.udsm_stop_time_year", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_stop_time_jday, - { "Stop Time Julian Day", "dz.udsm_stop_time_jday", + { "Stop Time Julian Day", "ehs.dz.udsm_stop_time_jday", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_stop_time_hour, - { "Stop Time Hour", "dz.udsm_stop_time_hour", + { "Stop Time Hour", "ehs.dz.udsm_stop_time_hour", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_stop_time_minute, - { "Stop Time Minute", "dz.udsm_stop_time_minute", + { "Stop Time Minute", "ehs.dz.udsm_stop_time_minute", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_stop_time_second, - { "Stop Time Second", "dz.udsm_stop_time_second", + { "Stop Time Second", "ehs.dz.udsm_stop_time_second", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_unused4, - { "Unused 4", "dz.udsm_unused4", + { "Unused 4", "ehs.dz.udsm_unused4", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_num_pkts_xmtd, - { "Num Pkts Transmitted", "dz.udsm_num_pkts_xmtd", + { "Num Pkts Transmitted", "ehs.dz.udsm_num_pkts_xmtd", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_num_vcdu_seqerrs, - { "Num VCDU Sequence Errors", "dz.udsm_num_vcdu_seqerrs", + { "Num VCDU Sequence Errors", "ehs.dz.udsm_num_vcdu_seqerrs", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_num_pkt_seqerrs, - { "Num Packet Sequence Errors", "dz.udsm_num_pkt_seqerrs", + { "Num Packet Sequence Errors", "ehs.dz.udsm_num_pkt_seqerrs", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_num_pktlen_errors, - { "Num Pkt Length Errors", "dz.udsm_num_pktlen_errors", + { "Num Pkt Length Errors", "ehs.dz.udsm_num_pktlen_errors", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, { &hf_ehs_dz_udsm_event, - { "UDSM Event Code", "dz.udsm_event", + { "UDSM Event Code", "ehs.dz.udsm_event", FT_UINT8, BASE_DEC, VALS(ehs_data_zone_udsm_event), 0xff, NULL, HFILL } }, { &hf_ehs_dz_udsm_num_pkts_xmtd_rollover, - { "Num Pkts Transmitted Rollover Counter", "dz.udsm_num_pkts_xmtd_rollover", + { "Num Pkts Transmitted Rollover Counter", "ehs.dz.udsm_num_pkts_xmtd_rollover", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index c7e4d1d8ef..91df178395 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -576,102 +576,102 @@ proto_register_card_app_toolkit(void) { static hf_register_info hf[] = { { &hf_cat_tlv, - { "COMPREHENSIVE-TLV", "cat.comp_tlv", + { "COMPREHENSIVE-TLV", "etsi_cat.comp_tlv", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_devid_src, - { "Source Device ID", "cat.comp_tlv.src_dev", + { "Source Device ID", "etsi_cat.comp_tlv.src_dev", FT_UINT8, BASE_HEX, VALS(dev_id_vals), 0, NULL, HFILL }, }, { &hf_ctlv_devid_dst, - { "Destination Device ID", "cat.comp_tlv.dst_dev", + { "Destination Device ID", "etsi_cat.comp_tlv.dst_dev", FT_UINT8, BASE_HEX, VALS(dev_id_vals), 0, NULL, HFILL }, }, { &hf_ctlv_cmd_nr, - { "Command Number", "cat.comp_tlv.cmd_nr", + { "Command Number", "etsi_cat.comp_tlv.cmd_nr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_cmd_type, - { "Command Type", "cat.comp_tlv.cmd_type", + { "Command Type", "etsi_cat.comp_tlv.cmd_type", FT_UINT8, BASE_HEX, VALS(cmd_type_vals), 0, NULL, HFILL }, }, { &hf_ctlv_cmd_qual, - { "Command Qualifier", "cat.comp_tlv.cmd_qual", + { "Command Qualifier", "etsi_cat.comp_tlv.cmd_qual", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_dur_time_intv, - { "Time Interval", "cat.comp_tlv.time_interval", + { "Time Interval", "etsi_cat.comp_tlv.time_interval", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_dur_time_unit, - { "Time Unit", "cat.comp_tlv.time_unit", + { "Time Unit", "etsi_cat.comp_tlv.time_unit", FT_UINT8, BASE_HEX, VALS(time_unit_vals), 0, NULL, HFILL }, }, { &hf_ctlv_result_gen, - { "Result", "cat.comp_tlv.result", + { "Result", "etsi_cat.comp_tlv.result", FT_UINT8, BASE_HEX, VALS(result_vals), 0, NULL, HFILL }, }, { &hf_ctlv_text_string_enc, - { "Text String Encoding", "cat.comp_tlv.text_encoding", + { "Text String Encoding", "etsi_cat.comp_tlv.text_encoding", FT_UINT8, BASE_HEX, VALS(text_encoding_vals), 0, NULL, HFILL }, }, { &hf_ctlv_event, - { "Event", "cat.comp_tlv.event", + { "Event", "etsi_cat.comp_tlv.event", FT_UINT8, BASE_HEX, VALS(event_list_vals), 0, NULL, HFILL }, }, { &hf_ctlv_tone, - { "Tone", "cat.comp_tlv.tone", + { "Tone", "etsi_cat.comp_tlv.tone", FT_UINT8, BASE_HEX, VALS(tone_vals), 0, NULL, HFILL }, }, { &hf_ctlv_loc_status, - { "Location Status", "cat.comp_tlv.loc_status", + { "Location Status", "etsi_cat.comp_tlv.loc_status", FT_UINT8, BASE_HEX, VALS(loc_status_vals), 0, NULL, HFILL }, }, { &hf_ctlv_bearer, - { "Bearer", "cat.comp_tlv.bearer", + { "Bearer", "etsi_cat.comp_tlv.bearer", FT_UINT8, BASE_HEX, VALS(bearer_vals), 0, NULL, HFILL }, }, { &hf_ctlv_bearer_descr, - { "Bearer Description", "cat.comp_tlv.bearer_descr", + { "Bearer Description", "etsi_cat.comp_tlv.bearer_descr", FT_UINT8, BASE_HEX, VALS(bearer_descr_vals), 0, NULL, HFILL }, }, { &hf_ctlv_transport_ptype, - { "Transport protocol type", "cat.comp_tlv.transport.ptype", + { "Transport protocol type", "etsi_cat.comp_tlv.transport.ptype", FT_UINT8, BASE_HEX, VALS(transport_ptype_vals), 0, NULL, HFILL }, }, { &hf_ctlv_transport_port, - { "Transport port", "cat.comp_tlv.transport.port", + { "Transport port", "etsi_cat.comp_tlv.transport.port", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_access_tech, - { "Access technology", "cat.comp_tlv.access_tech", + { "Access technology", "etsi_cat.comp_tlv.access_tech", FT_UINT8, BASE_HEX, VALS(access_tech_vals), 0, NULL, HFILL }, }, { &hf_ctlv_loci_lac, - { "Location Area Code", "cat.comp_tlv.loci.lac", + { "Location Area Code", "etsi_cat.comp_tlv.loci.lac", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_ctlv_loci_cell_id, - { "Cell ID", "cat.comp_tlv.loci.cell_id", + { "Cell ID", "etsi_cat.comp_tlv.loci.cell_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }, }, diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index c1cf9cff28..6258521a76 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -687,7 +687,7 @@ proto_register_frame(void) NULL, HFILL }}, { &hf_comments_text, - { "Comment", "comment", + { "Comment", "frame.comment", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c index fbe127aed9..4f6851685e 100644 --- a/epan/dissectors/packet-gsm_cbch.c +++ b/epan/dissectors/packet-gsm_cbch.c @@ -578,5 +578,5 @@ void proto_reg_handoff_gsm_cbch(void) { data_handle = find_dissector("data"); - cbs_handle = find_dissector("gsm_cell_broadcast"); + cbs_handle = find_dissector("gsm_cbs"); } diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index c7eac7b8d0..5bacd8b689 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.c @@ -161,7 +161,7 @@ void proto_register_hsr(void) }, { &hf_hsr_sequence_nr, - { "Sequence number", "hsr.hsr_sequence_nr", + { "Sequence number", "hsr.sequence_nr", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index e402f1706c..1b2d35ccc8 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -775,12 +775,12 @@ void proto_register_hsrp(void) "Standby group number which doesn't become the active router myself", HFILL }}, { &hf_hsrp2_md5_algorithm, - { "MD5 Algorithm", "hsrp2._md5_algorithm", + { "MD5 Algorithm", "hsrp2.md5_algorithm", FT_UINT8, BASE_DEC, VALS(hsrp2_md5_algorithm_vals), 0x0, "Hash Algorithm used by this group", HFILL }}, { &hf_hsrp2_md5_flags, - { "MD5 Flags", "hsrp2._md5_flags", + { "MD5 Flags", "hsrp2.md5_flags", FT_UINT8, BASE_DEC, NULL, 0x0, "Undefined", HFILL }}, diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 5bb2efcca1..a67ca83dfe 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1430,7 +1430,7 @@ void proto_reg_handoff_icep(void) } if(icep_udp_port != 0 && old_icep_udp_port != icep_udp_port) { - dissector_add_uint("udp.port", icep_tcp_port, icep_udp_handle); + dissector_add_uint("udp.port", old_icep_udp_port, icep_udp_handle); } old_icep_udp_port = icep_udp_port; diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index b222ae8387..0844bf8901 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -559,34 +559,34 @@ proto_register_ifcp (void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_ifcp_protocol, - { "Protocol", "fcencap.proto", FT_UINT8, BASE_DEC, + { "Protocol", "ifcp.encap.proto", FT_UINT8, BASE_DEC, VALS(fcencap_proto_vals), 0, NULL, HFILL }}, { &hf_ifcp_protocol_c, - {"Protocol (1's Complement)", "fcencap.protoc", FT_UINT8, BASE_DEC, NULL, + {"Protocol (1's Complement)", "ifcp.encap.protoc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}}, { &hf_ifcp_version, - {"Version", "fcencap.version", FT_UINT8, BASE_DEC, NULL, 0, NULL, + {"Version", "ifcp.encap.version", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}}, { &hf_ifcp_version_c, - {"Version (1's Complement)", "fcencap.versionc", FT_UINT8, BASE_DEC, + {"Version (1's Complement)", "ifcp.encap.versionc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}}, { &hf_ifcp_encap_flags_c, {"iFCP Encapsulation Flags (1's Complement)", "ifcp.encap_flagsc", FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL}}, { &hf_ifcp_framelen, - {"Frame Length (in Words)", "fcencap.framelen", FT_UINT16, BASE_DEC, + {"Frame Length (in Words)", "ifcp.encap.framelen", FT_UINT16, BASE_DEC, NULL, 0x03FF, NULL, HFILL}}, { &hf_ifcp_framelen_c, - {"Frame Length (1's Complement)", "fcencap.framelenc", FT_UINT16, + {"Frame Length (1's Complement)", "ifcp.encap.framelenc", FT_UINT16, BASE_DEC, NULL, 0x03FF, NULL, HFILL}}, { &hf_ifcp_tsec, - {"Time (secs)", "fcencap.tsec", FT_UINT32, BASE_DEC, NULL, 0, NULL, + {"Time (secs)", "ifcp.encap.tsec", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL}}, { &hf_ifcp_tusec, - {"Time (fraction)", "fcencap.tusec", FT_UINT32, BASE_DEC, NULL, 0, + {"Time (fraction)", "ifcp.encap.tusec", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL}}, { &hf_ifcp_encap_crc, - {"CRC", "fcencap.crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}}, + {"CRC", "ifcp.encap.crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}}, { &hf_ifcp_sof, {"SOF", "ifcp.sof", FT_UINT8, BASE_HEX, VALS (&ifcp_sof_vals), 0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 817a922bc8..41627f73f5 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -980,58 +980,58 @@ proto_register_linx_tcp(void) { static hf_register_info hf[] = { { &hf_linx_tcp_reserved, - { "Reserved", "linx_tcp.reserved", FT_UINT32, BASE_DEC, NULL, 0x00007FFF, "TCP CM reserved", HFILL }, + { "Reserved", "linxtcp.reserved", FT_UINT32, BASE_DEC, NULL, 0x00007FFF, "TCP CM reserved", HFILL }, }, { &hf_linx_tcp_oob, - { "Out-of-band", "linx_tcp.oob", FT_UINT32, BASE_DEC, NULL, 0x00008000, "TCP CM oob", HFILL }, + { "Out-of-band", "linxtcp.oob", FT_UINT32, BASE_DEC, NULL, 0x00008000, "TCP CM oob", HFILL }, }, { &hf_linx_tcp_version, - { "Version", "linx_tcp.version", FT_UINT32, BASE_DEC, NULL, 0x00FF0000, "TCP CM version", HFILL }, + { "Version", "linxtcp.version", FT_UINT32, BASE_DEC, NULL, 0x00FF0000, "TCP CM version", HFILL }, }, { &hf_linx_tcp_type, - { "Type", "linx_tcp.type", FT_UINT32, BASE_HEX, VALS(linx_long_tcp_names), 0xFF000000, "TCP CM type", HFILL }, + { "Type", "linxtcp.type", FT_UINT32, BASE_HEX, VALS(linx_long_tcp_names), 0xFF000000, "TCP CM type", HFILL }, }, { &hf_linx_tcp_src, - { "Source", "linx_tcp.src", FT_UINT32, BASE_DEC, NULL, 0xFFFFFFFF, "TCP CM source", HFILL }, + { "Source", "linxtcp.src", FT_UINT32, BASE_DEC, NULL, 0xFFFFFFFF, "TCP CM source", HFILL }, }, { &hf_linx_tcp_dst, - { "Destination", "linx_tcp.dst", FT_UINT32, BASE_DEC, NULL, 0xFFFFFFFF, "TCP CM destination", HFILL }, + { "Destination", "linxtcp.dst", FT_UINT32, BASE_DEC, NULL, 0xFFFFFFFF, "TCP CM destination", HFILL }, }, { &hf_linx_tcp_size, - { "Size", "linx_tcp.size", FT_UINT32, BASE_DEC, NULL, 0xFFFFFFFF, "TCP CM size", HFILL }, + { "Size", "linxtcp.size", FT_UINT32, BASE_DEC, NULL, 0xFFFFFFFF, "TCP CM size", HFILL }, }, /* RLNH */ { &hf_linx_tcp_rlnh_msg_type32, - { "RLNH msg type", "linx_tcp.rlnh_msg_type", FT_UINT32, BASE_DEC, VALS(linx_long_rlnh_names), 0xffffffff, "RLNH message type", HFILL }, + { "RLNH msg type", "linxtcp.rlnh_msg_type", FT_UINT32, BASE_DEC, VALS(linx_long_rlnh_names), 0xffffffff, "RLNH message type", HFILL }, }, { &hf_linx_tcp_rlnh_msg_type8, - { "RLNH msg type", "linx_tcp.rlnh_msg_type8", FT_UINT32, BASE_DEC, VALS(linx_long_rlnh_names), 0x000000ff, "RLNH message type", HFILL }, + { "RLNH msg type", "linxtcp.rlnh_msg_type8", FT_UINT32, BASE_DEC, VALS(linx_long_rlnh_names), 0x000000ff, "RLNH message type", HFILL }, }, { &hf_linx_tcp_rlnh_msg_reserved, - { "RLNH msg reserved", "linx_tcp.rlnh_msg_reserved", FT_UINT32, BASE_DEC, NULL, 0xffffff00, "RLNH message reserved", HFILL }, + { "RLNH msg reserved", "linxtcp.rlnh_msg_reserved", FT_UINT32, BASE_DEC, NULL, 0xffffff00, "RLNH message reserved", HFILL }, }, { &hf_linx_tcp_rlnh_linkaddr, - { "RLNH linkaddr", "linx_tcp.rlnh_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH linkaddress", HFILL }, + { "RLNH linkaddr", "linxtcp.rlnh_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH linkaddress", HFILL }, }, { &hf_linx_tcp_rlnh_src_linkaddr, - { "RLNH src linkaddr", "linx_tcp.rlnh_src_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH source linkaddress", HFILL }, + { "RLNH src linkaddr", "linxtcp.rlnh_src_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH source linkaddress", HFILL }, }, { &hf_linx_tcp_rlnh_peer_linkaddr, - { "RLNH peer linkaddr", "linx_tcp.rlnh_peer_linkaddr", FT_UINT32, + { "RLNH peer linkaddr", "linxtcp.rlnh_peer_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH peer linkaddress", HFILL }, }, { &hf_linx_tcp_rlnh_version, - { "RLNH version", "linx_tcp.rlnh_version", FT_UINT32, BASE_DEC, NULL, 0xffffffff, NULL, HFILL }, + { "RLNH version", "linxtcp.rlnh_version", FT_UINT32, BASE_DEC, NULL, 0xffffffff, NULL, HFILL }, }, { &hf_linx_tcp_rlnh_status, - { "RLNH reply", "linx_tcp.rlnh_status", FT_UINT32, BASE_DEC, VALS(linx_rlnh_reply), 0xffffffff, NULL, HFILL }, + { "RLNH reply", "linxtcp.rlnh_status", FT_UINT32, BASE_DEC, VALS(linx_rlnh_reply), 0xffffffff, NULL, HFILL }, }, { &hf_linx_tcp_rlnh_name, - { "RLNH name", "linx_tcp.rlnh_name", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }, + { "RLNH name", "linxtcp.rlnh_name", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_linx_tcp_rlnh_feat_neg_str, - { "RLNH Feature Negotiation String", "linx_tcp.rlnh_feat_neg_str", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }, + { "RLNH Feature Negotiation String", "linxtcp.rlnh_feat_neg_str", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }, } }; diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 8032047dd3..c596aaf7d6 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -1912,71 +1912,71 @@ proto_register_mpls_echo(void) "MPLS ECHO TLV DownStream Map Egress Interface Number", HFILL} }, { &hf_mpls_echo_lspping_tlv_src_gid, - { "SRC GLOBAL ID", "mpls_echo_lspping.tlv.src.gid", + { "SRC GLOBAL ID", "mpls_echo.lspping.tlv.src.gid", FT_UINT32, BASE_DEC, NULL, 0x0, "LSP SRC GID", HFILL} }, { &hf_mpls_echo_lspping_tlv_src_nid, - { "SRC NODE ID", "mpls_echo_lspping.tlv.src.nid", + { "SRC NODE ID", "mpls_echo.lspping.tlv.src.nid", FT_IPv4, BASE_NONE, NULL, 0x0, "LSP SRC NID", HFILL} }, { &hf_mpls_echo_lspping_tlv_src_tunnel_no, - { "SRC Tunnel Number", "mpls_echo_lspping.tlv.tunnel.no", + { "SRC Tunnel Number", "mpls_echo.lspping.tlv.tunnel.no", FT_UINT16, BASE_DEC, NULL, 0x0, "LSP FEC Tunnel Number", HFILL} }, { &hf_mpls_echo_lspping_tlv_lsp_no, - { "SRC LSP Number", "mpls_echo_lspping.tlv.lsp.no", + { "SRC LSP Number", "mpls_echo.lspping.tlv.lsp.no", FT_UINT16, BASE_DEC, NULL, 0x0, "LSP FEC LSP Number", HFILL} }, { &hf_mpls_echo_lspping_tlv_dst_gid, - { "DST GLOBAL ID", "mpls_echo_lspping.tlv.dst.gid", + { "DST GLOBAL ID", "mpls_echo.lspping.tlv.dst.gid", FT_UINT32, BASE_DEC, NULL, 0x0, "LSP FEC DST GID", HFILL} }, { &hf_mpls_echo_lspping_tlv_dst_nid, - { "DST NODE ID", "mpls_echo_lspping.tlv.dst.nid", + { "DST NODE ID", "mpls_echo.lspping.tlv.dst.nid", FT_IPv4, BASE_NONE, NULL, 0x0, "LSP FEC DST NID", HFILL} }, { &hf_mpls_echo_lspping_tlv_dst_tunnel_no, - { "DST Tunnel Number", "mpls_echo_lspping.tlv.dst.tunnel.no", + { "DST Tunnel Number", "mpls_echo.lspping.tlv.dst.tunnel.no", FT_UINT16, BASE_DEC, NULL, 0x0, "LSP FEC DST Tunnel Number", HFILL} }, { &hf_mpls_echo_lspping_tlv_resv, - { "RESERVED", "mpls_echo_lspping.tlv.resv", + { "RESERVED", "mpls_echo.lspping.tlv.resv", FT_UINT16, BASE_DEC, NULL, 0x0, "RESERVED BITS", HFILL} }, { &hf_mpls_echo_lspping_tlv_src_addr_gid, - { "Global ID", "mpls_echo_lspping.tlv.src.addr.gid", + { "Global ID", "mpls_echo.lspping.tlv.src.addr.gid", FT_UINT32, BASE_DEC, NULL, 0x0, "SRC ADDR TLV GID", HFILL} }, { &hf_mpls_echo_lspping_tlv_src_addr_nid, - { "Node ID", "mpls_echo_lspping.tlv.src.addr.nid", + { "Node ID", "mpls_echo.lspping.tlv.src.addr.nid", FT_IPv4, BASE_NONE, NULL, 0x0, "SRC ADDR TLV NID", HFILL} }, { &hf_mpls_echo_lspping_tlv_pw_serv_identifier, - { "Service identifier", "mpls_echo_lspping.tlv.pw.serv.identifier", + { "Service identifier", "mpls_echo.lspping.tlv.pw.serv.identifier", FT_UINT64, BASE_DEC, NULL, 0x0, "PW FEC Service identifier", HFILL} }, { &hf_mpls_echo_lspping_tlv_pw_src_ac_id, - { "SRC AC ID", "mpls_echo_lspping.tlv.pw.src.ac.id", + { "SRC AC ID", "mpls_echo.lspping.tlv.pw.src.ac.id", FT_UINT32, BASE_DEC, NULL, 0x0, "PW FEC SRC AC ID", HFILL} }, { &hf_mpls_echo_lspping_tlv_pw_dst_ac_id, - { "DST AC ID", "mpls_echo_lspping.tlv.pw.dst.ac.id", + { "DST AC ID", "mpls_echo.lspping.tlv.pw.dst.ac.id", FT_UINT32, BASE_DEC, NULL, 0x0, "PW FEC DST AC ID", HFILL} }, { &hf_mpls_echo_lspping_tlv_pw_agi_type, - { "AGI TYPE", "mpls_echo_lspping.tlv.pw.agi.type", + { "AGI TYPE", "mpls_echo.lspping.tlv.pw.agi.type", FT_UINT8, BASE_DEC,NULL,0x0, "PW AGI TYPE",HFILL} }, { &hf_mpls_echo_lspping_tlv_pw_agi_len, - { "AGI Length", "mpls_echo_lspping.tlv.pw.agi.len", + { "AGI Length", "mpls_echo.lspping.tlv.pw.agi.len", FT_UINT8, BASE_DEC,NULL,0x0, "PW AGI LENGTH",HFILL} }, { &hf_mpls_echo_lspping_tlv_pw_agi_val, - { "AGI VALUE", "mpls_echo_lspping.tlv.pw.agi.val", + { "AGI VALUE", "mpls_echo.lspping.tlv.pw.agi.val", FT_STRING, BASE_NONE,NULL,0x0, "PW AGI VALUE",HFILL} }, { &hf_mpls_echo_tlv_dd_map_mtu, - { "MTU", "mpls_echo_.tlv.dd_map.mtu", + { "MTU", "mpls_echo.lspping.tlv.dd_map.mtu", FT_UINT16, BASE_DEC, NULL, 0x0, "MPLS ECHO TLV Detailed Downstream Map MTU", HFILL} }, { &hf_mpls_echo_tlv_dd_map_addr_type, diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index fdb2288156..f0c669b308 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -1401,25 +1401,25 @@ proto_register_ntp(void) NULL, 0, NULL, HFILL }}, { &hf_ntppriv_flags_r, { - "Response bit", "ntppriv.flags.r", FT_UINT8, BASE_DEC, + "Response bit", "ntp.priv.flags.r", FT_UINT8, BASE_DEC, VALS(priv_r_types), NTPPRIV_R_MASK, NULL, HFILL }}, { &hf_ntppriv_flags_more, { - "More bit", "ntppriv.flags.more", FT_UINT8, BASE_DEC, + "More bit", "ntp.priv.flags.more", FT_UINT8, BASE_DEC, NULL, NTPPRIV_MORE_MASK, NULL, HFILL }}, { &hf_ntppriv_auth_seq, { - "Auth, sequence", "ntppriv.auth_seq", FT_UINT8, BASE_DEC, + "Auth, sequence", "ntp.priv.auth_seq", FT_UINT8, BASE_DEC, NULL, 0, "Auth bit, sequence number", HFILL }}, { &hf_ntppriv_auth, { - "Auth bit", "ntppriv.auth", FT_UINT8, BASE_DEC, + "Auth bit", "ntp.priv.auth", FT_UINT8, BASE_DEC, NULL, NTPPRIV_AUTH_MASK, NULL, HFILL }}, { &hf_ntppriv_seq, { - "Sequence number", "ntppriv.seq", FT_UINT8, BASE_DEC, + "Sequence number", "ntp.priv.seq", FT_UINT8, BASE_DEC, NULL, NTPPRIV_SEQ_MASK, NULL, HFILL }}, { &hf_ntppriv_impl, { - "Implementation", "ntppriv.impl", FT_UINT8, BASE_DEC, + "Implementation", "ntp.priv.impl", FT_UINT8, BASE_DEC, VALS(priv_impl_types), 0, NULL, HFILL }}, { &hf_ntppriv_reqcode, { - "Request code", "ntppriv.reqcode", FT_UINT8, BASE_DEC, + "Request code", "ntp.priv.reqcode", FT_UINT8, BASE_DEC, VALS(priv_rc_types), 0, NULL, HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index a03db70ca5..2b9b48f28f 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -4507,7 +4507,7 @@ proto_reg_handoff_rsl(void) dissector_add_uint("lapd.gsm.sapi", LAPD_GSM_SAPI_RA_SIG_PROC, rsl_handle); gsm_cbch_handle = find_dissector("gsm_cbch"); - gsm_cbs_handle = find_dissector("gsm_cell_broadcast"); + gsm_cbs_handle = find_dissector("gsm_cbs"); gsm_a_ccch_handle = find_dissector("gsm_a_ccch"); gsm_a_dtap_handle = find_dissector("gsm_a_dtap"); gsm_a_sacch_handle = find_dissector("gsm_a_sacch"); diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index 1571560822..727338d0fd 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -201,15 +201,15 @@ proto_register_ssprotocol(void) /* Setup list of header fields */ static hf_register_info hf[] = { - { &hf_message_type, { "Type", "ssprotocol.message_type", FT_UINT8, BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } }, - { &hf_message_flags, { "Flags", "ssprotocol.message_flags", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_message_length, { "Length", "ssprotocol.message_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_message_status, { "Status", "ssprotocol.message_status", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_message_reason, { "Reason", "ssprotocol.message_reason", FT_UINT32, BASE_DEC, VALS(notrdy_reason_values), 0x0, NULL, HFILL } }, - { &hf_message_info, { "Info", "ssprotocol.message_info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_message_data, { "Data", "ssprotocol.message_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_message_hash, { "Hash", "ssprotocol.message_hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_environment_u_bit, { "U-Bit", "ssprotocol.environment_u_bit", FT_BOOLEAN, 8,TFS(&environment_u_bit), SSP_ENVIRONMENT_U_BIT, NULL, HFILL } } + { &hf_message_type, { "Type", "ssp.message_type", FT_UINT8, BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } }, + { &hf_message_flags, { "Flags", "ssp.message_flags", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, + { &hf_message_length, { "Length", "ssp.message_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, + { &hf_message_status, { "Status", "ssp.message_status", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, + { &hf_message_reason, { "Reason", "ssp.message_reason", FT_UINT32, BASE_DEC, VALS(notrdy_reason_values), 0x0, NULL, HFILL } }, + { &hf_message_info, { "Info", "ssp.message_info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_message_data, { "Data", "ssp.message_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_message_hash, { "Hash", "ssp.message_hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_environment_u_bit, { "U-Bit", "ssp.environment_u_bit", FT_BOOLEAN, 8,TFS(&environment_u_bit), SSP_ENVIRONMENT_U_BIT, NULL, HFILL } } }; /* Setup protocol subtree array */ diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 5f781b9102..78798f0088 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -2251,12 +2251,12 @@ proto_register_sdp(void) "Format specific parameter(fmtp)", HFILL } }, { &hf_ipbcp_version, - { "IPBCP Protocol Version", "ipbcp.version", + { "IPBCP Protocol Version", "sdp.ipbcp.version", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ipbcp_type, - { "IPBCP Command Type", "ipbcp.command", + { "IPBCP Command Type", "sdp.ipbcp.command", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index d180355216..b9ff03706a 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -7114,27 +7114,27 @@ proto_register_smb2(void) NULL, 0, "Resiliency reserved", HFILL }}, { &hf_windows_sockaddr_family, - { "Socket Family", "windows.sockaddr.family", FT_UINT16, BASE_DEC, + { "Socket Family", "smb2.windows.sockaddr.family", FT_UINT16, BASE_DEC, NULL, 0, "The socket address family (on windows)", HFILL }}, { &hf_windows_sockaddr_port, - { "Socket Port", "windows.sockaddr.port", FT_UINT16, BASE_DEC, + { "Socket Port", "smb2.windows.sockaddr.port", FT_UINT16, BASE_DEC, NULL, 0, "The socket address port", HFILL }}, { &hf_windows_sockaddr_in_addr, - { "Socket IPv4", "windows.sockaddr.in.addr", FT_IPv4, BASE_NONE, + { "Socket IPv4", "smb2.windows.sockaddr.in.addr", FT_IPv4, BASE_NONE, NULL, 0, "The IPv4 address", HFILL }}, { &hf_windows_sockaddr_in6_flowinfo, - { "IPv6 Flow Info", "windows.sockaddr.in6.flow_info", FT_UINT32, BASE_HEX, + { "IPv6 Flow Info", "smb2.windows.sockaddr.in6.flow_info", FT_UINT32, BASE_HEX, NULL, 0, "The socket IPv6 flow info", HFILL }}, { &hf_windows_sockaddr_in6_addr, - { "Socket IPv6", "windows.sockaddr.in6.addr", FT_IPv6, BASE_NONE, + { "Socket IPv6", "smb2.windows.sockaddr.in6.addr", FT_IPv6, BASE_NONE, NULL, 0, "The IPv6 address", HFILL }}, { &hf_windows_sockaddr_in6_scope_id, - { "IPv6 Scope ID", "windows.sockaddr.in6.scope_id", FT_UINT32, BASE_DEC, + { "IPv6 Scope ID", "smb2.windows.sockaddr.in6.scope_id", FT_UINT32, BASE_DEC, NULL, 0, "The socket IPv6 scope id", HFILL }}, { &hf_smb2_ioctl_network_interface_next_offset, diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index fb8be06f01..255980f94f 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -461,7 +461,7 @@ proto_register_synergy(void) { "Key Id","synergy.keyreleased.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL } }, { &hf_synergy_dkup_keymodifiermask, - { "Key Modifier Mask","synergykeyreleased.mask",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL } + { "Key Modifier Mask","synergy.keyreleased.mask",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL } }, { &hf_synergy_dkup_keybutton, { "Key Button","synergy.keyreleased.key",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL } diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index aa05d0fbb0..59a4c4a0b2 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2757,62 +2757,62 @@ proto_register_tds(void) "The total length of the reassembled payload", HFILL } }, { &hf_tds7_login_total_size, - { "Total Packet Length", "tds7login.total_len", + { "Total Packet Length", "tds.7login.total_len", FT_UINT32, BASE_DEC, NULL, 0x0, "TDS7 Login Packet total packet length", HFILL } }, { &hf_tds7_version, - { "TDS version", "tds7login.version", + { "TDS version", "tds.7login.version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_packet_size, - { "Packet Size", "tds7login.packet_size", + { "Packet Size", "tds.7login.packet_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_client_version, - { "Client version", "tds7login.client_version", + { "Client version", "tds.7login.client_version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_client_pid, - { "Client PID", "tds7login.client_pid", + { "Client PID", "tds.7login.client_pid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_connection_id, - { "Connection ID", "tds7login.connection_id", + { "Connection ID", "tds.7login.connection_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_option_flags1, - { "Option Flags 1", "tds7login.option_flags1", + { "Option Flags 1", "tds.7login.option_flags1", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_option_flags2, - { "Option Flags 2", "tds7login.option_flags2", + { "Option Flags 2", "tds.7login.option_flags2", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_sql_type_flags, - { "SQL Type Flags", "tds7login.sql_type_flags", + { "SQL Type Flags", "tds.7login.sql_type_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_reserved_flags, - { "Reserved Flags", "tds7login.reserved_flags", + { "Reserved Flags", "tds.7login.reserved_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_time_zone, - { "Time Zone", "tds7login.time_zone", + { "Time Zone", "tds.7login.time_zone", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tds7_collation, - { "Collation", "tds7login.collation", + { "Collation", "tds.7login.collation", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index 93019288cb..ec159c1bbb 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -450,97 +450,97 @@ proto_register_vcdu(void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_smex_gsc, - { "Ground Sequence Counter", "smex.gsc", + { "Ground Sequence Counter", "vcdu.smex.gsc", FT_UINT64, BASE_DEC, NULL, 0x0, "SMEX Ground Sequence Counter", HFILL } }, { &hf_smex_unused, - { "Unused", "smex.unused", + { "Unused", "vcdu.smex.unused", FT_UINT16, BASE_DEC, NULL, 0x0, "SMEX Unused", HFILL } }, { &hf_smex_version, - { "Version", "smex.version", + { "Version", "vcdu.smex.version", FT_UINT16, BASE_DEC, NULL, SMEX_VERSION, "SMEX Version", HFILL } }, { &hf_smex_framelen, - { "Frame Length", "smex.frame_len", + { "Frame Length", "vcdu.smex.frame_len", FT_UINT16, BASE_DEC, NULL, SMEX_FRAMELEN, "SMEX Frame Length", HFILL } }, { &hf_smex_rs_enable, - { "RS Enable", "smex.rs_enable", + { "RS Enable", "vcdu.smex.rs_enable", FT_BOOLEAN, 8, NULL, 0x80, "SMEX RS Enable", HFILL } }, { &hf_smex_rs_error, - { "RS Error", "smex.rs_error", + { "RS Error", "vcdu.smex.rs_error", FT_BOOLEAN, 8, NULL, 0x40, "SMEX RS Error", HFILL } }, { &hf_smex_crc_enable, - { "CRC Enable", "smex.crc_enable", + { "CRC Enable", "vcdu.smex.crc_enable", FT_BOOLEAN, 8, NULL, 0x20, "SMEX CRC Enable", HFILL } }, { &hf_smex_crc_error, - { "CRC Error", "smex.crc_error", + { "CRC Error", "vcdu.smex.crc_error", FT_BOOLEAN, 8, NULL, 0x10, "SMEX CRC Error", HFILL } }, { &hf_smex_mcs_enable, - { "MCS Enable", "smex.mcs_enable", + { "MCS Enable", "vcdu.smex.mcs_enable", FT_BOOLEAN, 8, NULL, 0x08, "SMEX MCS Enable", HFILL } }, { &hf_smex_mcs_num_error, - { "MCS Number Error", "smex.mcs_numerr", + { "MCS Number Error", "vcdu.smex.mcs_numerr", FT_BOOLEAN, 8, NULL, 0x04, "SMEX MCS Number Error", HFILL } }, { &hf_smex_data_inv, - { "Data Inversion", "smex.data_inv", + { "Data Inversion", "vcdu.smex.data_inv", FT_UINT16, BASE_DEC, VALS(smex_data_inversion_type), 0x03, "SMEX Data Inversion", HFILL } }, { &hf_smex_frame_sync, - { "Frame Sync", "smex.frame_sync", + { "Frame Sync", "vcdu.smex.frame_sync", FT_UINT16, BASE_DEC, VALS(smex_frame_sync_mode), 0xc0, "SMEX Frame Sync Flag", HFILL } }, { &hf_smex_data_dir, - { "Data Direction", "smex.data_dir", + { "Data Direction", "vcdu.smex.data_dir", FT_UINT16, BASE_DEC, VALS(smex_data_direction), 0x20, "SMEX Data Direction flag", HFILL } }, { &hf_smex_data_class, - { "Data Class", "smex.data_class", + { "Data Class", "vcdu.smex.data_class", FT_UINT16, BASE_DEC, VALS(smex_data_class), 0x1f, "SMEX Data Class", HFILL } }, { &hf_smex_pb5, - { "PB5 Flag", "smex.pb5", + { "PB5 Flag", "vcdu.smex.pb5", FT_UINT16, BASE_DEC, NULL, 0x8000, "SMEX PB5 Flag", HFILL } }, { &hf_smex_jday, - { "Julian Day", "smex.jday", + { "Julian Day", "vcdu.smex.jday", FT_UINT16, BASE_DEC, NULL, PB5_JULIAN_DAY_MASK, "SMEX Julian Day", HFILL } }, { &hf_smex_seconds, - { "Seconds", "smex.seconds", + { "Seconds", "vcdu.smex.seconds", FT_UINT24, BASE_DEC, NULL, PB5_SECONDS_MASK, "SMEX Seconds", HFILL } }, { &hf_smex_msec, - { "Milliseconds", "smex.msec", + { "Milliseconds", "vcdu.smex.msec", FT_UINT16, BASE_DEC, NULL, PB5_MILLISECONDS_MASK, "SMEX Milliseconds", HFILL } }, { &hf_smex_spare, - { "Spare", "smex.spare", + { "Spare", "vcdu.smex.spare", FT_UINT16, BASE_DEC, NULL, 0x03f, "SMEX Spare", HFILL } }, diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index ab7a968085..9833bfe239 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.c @@ -880,7 +880,7 @@ proto_register_vxi11_core(void) proto_vxi11_core = proto_register_protocol("VXI-11 Core Protocol", "VXI-11 Core", - "vxi11core"); + "vxi11_core"); proto_register_field_array(proto_vxi11_core, vxi11_core_hf, array_length(vxi11_core_hf)); proto_register_subtree_array(vxi11_core_ett, array_length(vxi11_core_ett)); } @@ -957,7 +957,7 @@ proto_register_vxi11_async(void) proto_vxi11_async = proto_register_protocol("VXI-11 Asynchronous Abort", "VXI-11 Async", - "vxi11async"); + "vxi11_async"); proto_register_field_array(proto_vxi11_async, vxi11_async_hf, array_length(vxi11_async_hf)); proto_register_subtree_array(vxi11_async_ett, array_length(vxi11_async_ett)); } @@ -1010,7 +1010,7 @@ proto_register_vxi11_intr(void) proto_vxi11_intr = proto_register_protocol("VXI-11 Interrupt", "VXI-11 Intr", - "vxi11intr"); + "vxi11_intr"); proto_register_field_array(proto_vxi11_intr, vxi11_intr_hf, array_length(vxi11_intr_hf)); proto_register_subtree_array(vxi11_intr_ett, array_length(vxi11_intr_ett)); } diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index b38b3fe52f..6d4eaecf08 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -357,15 +357,15 @@ proto_register_xot(void) NULL, 0, "Length of X.25 over TCP packet", HFILL }}, /* These fields are in overlay with packet-x25.c */ { &hf_x25_gfi, - { "GFI", "x.25.gfi", FT_UINT16, BASE_DEC, + { "GFI", "x25.gfi", FT_UINT16, BASE_DEC, NULL, 0xF000, "General Format Identifier", HFILL }}, { &hf_x25_lcn, - { "Logical Channel", "x.25.lcn", FT_UINT16, BASE_DEC, + { "Logical Channel", "x25.lcn", FT_UINT16, BASE_DEC, NULL, 0x0FFF, "Logical Channel Number", HFILL }}, { &hf_x25_type, - { "Packet Type", "x.25.type", FT_UINT8, BASE_HEX, + { "Packet Type", "x25.type", FT_UINT8, BASE_HEX, VALS(vals_x25_type), 0x0, NULL, HFILL }}, { &hf_xot_pvc_version, |