From Martin Kaiser:

correct the filter names
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6239

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38767 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 79 insertions, 79 deletions

diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 49818fe166..baec386f7c 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -2291,235 +2291,235 @@ proto_register_dvbci(void)
 
     static hf_register_info hf[] = {
         { &hf_dvbci_event,
-            { "Event", "dvbci.event", FT_UINT8, BASE_HEX,
+            { "Event", "dvb-ci.event", FT_UINT8, BASE_HEX,
                 VALS(dvbci_event), 0, NULL, HFILL } },
         { &hf_dvbci_hw_event,
-            { "Hardware event", "dvbci.hw_event", FT_UINT8, BASE_HEX,
+            { "Hardware event", "dvb-ci.hw_event", FT_UINT8, BASE_HEX,
                 VALS(dvbci_hw_event), 0, NULL, HFILL } },
         { &hf_dvbci_cistpl_code,
-            { "CIS tuple code", "dvbci.cistpl_code", FT_UINT8, BASE_HEX,
+            { "CIS tuple code", "dvb-ci.cistpl_code", FT_UINT8, BASE_HEX,
                 VALS(dvbci_cistpl_code), 0, NULL, HFILL } },
         { &hf_dvbci_buf_size,
-            { "Buffer Size", "dvbci.buf_size", FT_UINT16, BASE_HEX,
+            { "Buffer Size", "dvb-ci.buf_size", FT_UINT16, BASE_HEX,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_tcid,
-            { "Transport Connection ID", "dvbci.tcid", FT_UINT8, BASE_HEX,
+            { "Transport Connection ID", "dvb-ci.tcid", FT_UINT8, BASE_HEX,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_ml,
-            { "More/Last indicator", "dvbci.more_last", FT_UINT8, BASE_HEX,
+            { "More/Last indicator", "dvb-ci.more_last", FT_UINT8, BASE_HEX,
                 VALS(dvbci_ml), 0, NULL, HFILL } },
         /* on the link layer, tpdus are reassembled */
         {&hf_dvbci_l_frags,
-            {"Tpdu fragments", "dvbci.tpdu_fragments",
+            {"Tpdu fragments", "dvb-ci.tpdu_fragments",
                 FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag,
-            {"Tpdu fragment", "dvbci.tpdu_fragment",
+            {"Tpdu fragment", "dvb-ci.tpdu_fragment",
                 FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag_overlap,
-            {"Tpdu fragment overlap", "dvbci.tpdu_fragment.overlap",
+            {"Tpdu fragment overlap", "dvb-ci.tpdu_fragment.overlap",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag_overlap_conflicts,
             {"Tpdu fragment overlapping with conflicting data",
-                "dvbci.tpdu_fragment.overlap.conflicts",
+                "dvb-ci.tpdu_fragment.overlap.conflicts",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag_multiple_tails,
             {"Tpdu has multiple tail fragments",
-                "dvbci.tpdu_fragment.multiple_tails",
+                "dvb-ci.tpdu_fragment.multiple_tails",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag_too_long_frag,
-            {"Tpdu fragment too long", "dvbci.tpdu_fragment.too_long_fragment",
+            {"Tpdu fragment too long", "dvb-ci.tpdu_fragment.too_long_fragment",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag_err,
-            {"Tpdu defragmentation error", "dvbci.tpdu_fragment.error",
+            {"Tpdu defragmentation error", "dvb-ci.tpdu_fragment.error",
                 FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_frag_cnt,
-            {"Tpdu fragment count", "dvbci.tpdu_fragment.count",
+            {"Tpdu fragment count", "dvb-ci.tpdu_fragment.count",
                 FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_reass_in,
-            {"Tpdu reassembled in", "dvbci.tpdu_reassembled.in",
+            {"Tpdu reassembled in", "dvb-ci.tpdu_reassembled.in",
                 FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_l_reass_len,
-            {"Reassembled tpdu length", "dvbci.tpdu_reassembled.length",
+            {"Reassembled tpdu length", "dvb-ci.tpdu_reassembled.length",
                 FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } },
         { &hf_dvbci_c_tpdu_tag,
-            { "Command TPDU Tag", "dvbci.c_tpdu_tag", FT_UINT8, BASE_HEX,
+            { "Command TPDU Tag", "dvb-ci.c_tpdu_tag", FT_UINT8, BASE_HEX,
                 VALS(dvbci_c_tpdu), 0, NULL, HFILL } },
         { &hf_dvbci_r_tpdu_tag,
-            { "Response TPDU Tag", "dvbci.r_tpdu_tag", FT_UINT8, BASE_HEX,
+            { "Response TPDU Tag", "dvb-ci.r_tpdu_tag", FT_UINT8, BASE_HEX,
                 VALS(dvbci_r_tpdu), 0, NULL, HFILL } },
         { &hf_dvbci_t_c_id,
-            { "Transport Connection ID", "dvbci.t_c_id", FT_UINT8, BASE_HEX,
+            { "Transport Connection ID", "dvb-ci.t_c_id", FT_UINT8, BASE_HEX,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_sb_value,
-            { "SB Value", "dvbci.sb_value", FT_UINT8, BASE_HEX,
+            { "SB Value", "dvb-ci.sb_value", FT_UINT8, BASE_HEX,
                 VALS(dvbci_sb_value), 0, NULL, HFILL } },
         /* on the transport layer, spdus are reassembled */
         {&hf_dvbci_t_frags,
-            {"Spdu fragments", "dvbci.spdu_fragments",
+            {"Spdu fragments", "dvb-ci.spdu_fragments",
                 FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag,
-            {"Spdu fragment", "dvbci.spdu_fragment",
+            {"Spdu fragment", "dvb-ci.spdu_fragment",
                 FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag_overlap,
-            {"Spdu fragment overlap", "dvbci.spdu_fragment.overlap",
+            {"Spdu fragment overlap", "dvb-ci.spdu_fragment.overlap",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag_overlap_conflicts,
             {"Spdu fragment overlapping with conflicting data",
-                "dvbci.tpdu_fragment.overlap.conflicts",
+                "dvb-ci.tpdu_fragment.overlap.conflicts",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag_multiple_tails,
             {"Spdu has multiple tail fragments",
-                "dvbci.spdu_fragment.multiple_tails",
+                "dvb-ci.spdu_fragment.multiple_tails",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag_too_long_frag,
-            {"Spdu fragment too long", "dvbci.spdu_fragment.too_long_fragment",
+            {"Spdu fragment too long", "dvb-ci.spdu_fragment.too_long_fragment",
                 FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag_err,
-            {"Spdu defragmentation error", "dvbci.spdu_fragment.error",
+            {"Spdu defragmentation error", "dvb-ci.spdu_fragment.error",
                 FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_frag_cnt,
-            {"Spdu fragment count", "dvbci.spdu_fragment.count",
+            {"Spdu fragment count", "dvb-ci.spdu_fragment.count",
                 FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_reass_in,
-            {"Spdu reassembled in", "dvbci.spdu_reassembled.in",
+            {"Spdu reassembled in", "dvb-ci.spdu_reassembled.in",
                 FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
         {&hf_dvbci_t_reass_len,
-            {"Reassembled spdu length", "dvbci.spdu_reassembled.length",
+            {"Reassembled spdu length", "dvb-ci.spdu_reassembled.length",
                 FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } },
         { &hf_dvbci_spdu_tag,
-            { "SPDU Tag", "dvbci.spdu_tag", FT_UINT8, BASE_HEX,
+            { "SPDU Tag", "dvb-ci.spdu_tag", FT_UINT8, BASE_HEX,
                 VALS(dvbci_spdu_tag), 0, NULL, HFILL } },
         { &hf_dvbci_sess_status,
-            { "Session Status", "dvbci.session_status", FT_UINT8, BASE_HEX,
+            { "Session Status", "dvb-ci.session_status", FT_UINT8, BASE_HEX,
                 VALS(dvbci_sess_status), 0, NULL, HFILL } },
         { &hf_dvbci_sess_nb,
-            { "Session Number", "dvbci.session_nb", FT_UINT16, BASE_DEC,
+            { "Session Number", "dvb-ci.session_nb", FT_UINT16, BASE_DEC,
                 NULL , 0, NULL, HFILL } },
         { &hf_dvbci_close_sess_status,
-            { "Session Status", "dvbci.close_session_status", FT_UINT8,
+            { "Session Status", "dvb-ci.close_session_status", FT_UINT8,
                 BASE_HEX, VALS(dvbci_close_sess_status), 0, NULL, HFILL } },
         { &hf_dvbci_apdu_tag,
-            { "APDU Tag", "dvbci.apdu_tag", FT_UINT24, BASE_HEX,
+            { "APDU Tag", "dvb-ci.apdu_tag", FT_UINT24, BASE_HEX,
                 VALS(dvbci_apdu_tag), 0, NULL, HFILL } },
         { &hf_dvbci_app_type,
-            { "Application type", "dvbci.application_type", FT_UINT8,
+            { "Application type", "dvb-ci.ap.type", FT_UINT8,
                 BASE_HEX, VALS(dvbci_app_type), 0, NULL, HFILL } },
         { &hf_dvbci_app_manf,
-            { "Application manufacturer", "dvbci.application_manufacturer",
+            { "Application manufacturer", "dvb-ci.ap.manufacturer",
                 FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_manf_code,
-            { "Manufacturer code", "dvbci.manufacturer_code", FT_UINT16,
+            { "Manufacturer code", "dvb-ci.ap.manufacturer_code", FT_UINT16,
                 BASE_HEX, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_menu_str_len,
-            { "Menu string length", "dvbci.menu_string_length",
+            { "Menu string length", "dvb-ci.ap.menu_string_length",
                 FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_ca_sys_id,
-            { "CA system ID", "dvbci.ca_system_id", FT_UINT16, BASE_HEX,
+            { "CA system ID", "dvb-ci.ca.ca_system_id", FT_UINT16, BASE_HEX,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_ca_pmt_list_mgmt,
-            { "CA PMT list management", "dvbci.ca_pmt_list_management",
+            { "CA PMT list management", "dvb-ci.ca.ca_pmt_list_management",
                 FT_UINT8, BASE_HEX, VALS(dvbci_ca_pmt_list_mgmt), 0, NULL,
                 HFILL } },
         { &hf_dvbci_prog_num,
-            { "Program number", "dvbci.program_number", FT_UINT16, BASE_HEX,
-                NULL, 0, NULL, HFILL } },
+            { "Program number", "dvb-ci.ca.program_number", FT_UINT16,
+                BASE_HEX, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_prog_info_len,
-            { "Program info length", "dvbci.program_info_length", FT_UINT16,
-                BASE_HEX, NULL, 0x0FFF, NULL, HFILL } },
+            { "Program info length", "dvb-ci.ca.program_info_length",
+                FT_UINT16, BASE_HEX, NULL, 0x0FFF, NULL, HFILL } },
         { &hf_dvbci_stream_type,
-            { "Stream type", "dvbci.stream_type", FT_UINT8, BASE_HEX,
+            { "Stream type", "dvb-ci.ca.stream_type", FT_UINT8, BASE_HEX,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_es_pid,
-            { "Elementary stream PID", "dvbci.elementary_pid", FT_UINT16,
+            { "Elementary stream PID", "dvb-ci.ca.elementary_pid", FT_UINT16,
                 BASE_HEX, NULL, 0x1FFF, NULL, HFILL } },
         { &hf_dvbci_es_info_len,
-            { "Elementary stream info length", "dvbci.es_info_length",
+            { "Elementary stream info length", "dvb-ci.ca.es_info_length",
                 FT_UINT16, BASE_HEX, NULL, 0x0FFF, NULL, HFILL } },
         { &hf_dvbci_ca_pmt_cmd_id,
-            { "CA PMT command ID", "dvbci.ca_pmt_cmd_id", FT_UINT8, BASE_HEX,
-                VALS(dvbci_ca_pmt_cmd_id), 0, NULL, HFILL } },
+            { "CA PMT command ID", "dvb-ci.ca.ca_pmt_cmd_id", FT_UINT8,
+                BASE_HEX, VALS(dvbci_ca_pmt_cmd_id), 0, NULL, HFILL } },
         { &hf_dvbci_descr_len,
-            { "CA descriptor length", "dvbci.ca_desc_len", FT_UINT8, BASE_DEC,
-                NULL, 0, NULL, HFILL } },
+            { "CA descriptor length", "dvb-ci.ca.ca_desc_len", FT_UINT8,
+                BASE_DEC, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_ca_pid,
-            { "CA PID", "dvbci.ca_pid", FT_UINT16, BASE_HEX,
+            { "CA PID", "dvb-ci.ca.ca_pid", FT_UINT16, BASE_HEX,
                 NULL, 0x1FFF, NULL, HFILL } },
         { &hf_dvbci_ca_enable_flag,
-            { "CA enable flag", "dvbci.ca_enable_flag", FT_UINT8, BASE_HEX,
-                NULL, 0x80, NULL, HFILL } },
+            { "CA enable flag", "dvb-ci.ca.ca_enable_flag", FT_UINT8,
+                BASE_HEX, NULL, 0x80, NULL, HFILL } },
         { &hf_dvbci_ca_enable,
-            { "CA enable", "dvbci.ca_enable", FT_UINT8, BASE_HEX,
+            { "CA enable", "dvb-ci.ca.ca_enable", FT_UINT8, BASE_HEX,
                 VALS(dvbci_ca_enable), 0x7F, NULL, HFILL } },
          { &hf_dvbci_network_id,
-           { "Network ID", "dvbci.hc.nid", FT_UINT16, BASE_HEX,
+           { "Network ID", "dvb-ci.hc.nid", FT_UINT16, BASE_HEX,
               NULL, 0, NULL, HFILL } },
         { &hf_dvbci_original_network_id,
-           { "Original network ID", "dvbci.hc.onid", FT_UINT16, BASE_HEX,
+           { "Original network ID", "dvb-ci.hc.onid", FT_UINT16, BASE_HEX,
               NULL, 0, NULL, HFILL } },
         { &hf_dvbci_transport_stream_id,
-           { "Transport stream ID", "dvbci.hc.tsid", FT_UINT16, BASE_HEX,
+           { "Transport stream ID", "dvb-ci.hc.tsid", FT_UINT16, BASE_HEX,
               NULL, 0, NULL, HFILL } },
         { &hf_dvbci_service_id,
-           { "Service ID", "dvbci.hc.svcid", FT_UINT16, BASE_HEX,
+           { "Service ID", "dvb-ci.hc.svcid", FT_UINT16, BASE_HEX,
               NULL, 0, NULL, HFILL } },
         { &hf_dvbci_replacement_ref,
-           { "Replacement reference", "dvbci.hc.replacement_ref",
+           { "Replacement reference", "dvb-ci.hc.replacement_ref",
               FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_replaced_pid,
-           { "Replaced PID", "dvbci.hc.replaced_pid", FT_UINT16,
+           { "Replaced PID", "dvb-ci.hc.replaced_pid", FT_UINT16,
               BASE_HEX, NULL, 0x1FFF, NULL, HFILL } },
         { &hf_dvbci_replacement_pid,
-           { "Replacement PID", "dvbci.hc.replacement_pid", FT_UINT16,
+           { "Replacement PID", "dvb-ci.hc.replacement_pid", FT_UINT16,
               BASE_HEX, NULL, 0x1FFF, NULL, HFILL } },
         { &hf_dvbci_resp_intv,
-            { "Response interval", "dvbci.dt.resp_interval",
+            { "Response interval", "dvb-ci.dt.resp_interval",
                 FT_RELATIVE_TIME, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_dvbci_utc_time,
-            { "UTC time", "dvbci.dt.utc_time",
+            { "UTC time", "dvb-ci.dt.utc_time",
                 FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } },
         /* we have to use FT_INT16 instead of FT_RELATIVE_TIME,
            local offset can be negative */
         { &hf_dvbci_local_offset,
-            { "Local time offset", "dvbci.dt.local_offset", FT_INT16, BASE_DEC,
+            { "Local time offset", "dvb-ci.dt.local_offset", FT_INT16, BASE_DEC,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_close_mmi_cmd_id,
-            { "Command ID", "dvbci.mmi.close_mmi_cmd_id", FT_UINT8, BASE_HEX,
+            { "Command ID", "dvb-ci.mmi.close_mmi_cmd_id", FT_UINT8, BASE_HEX,
                 VALS(dvbci_close_mmi_cmd_id), 0, NULL, HFILL } },
         { &hf_dvbci_close_mmi_delay,
-            { "Delay (in sec)", "dvbci.mmi.delay", FT_UINT8, BASE_DEC,
+            { "Delay (in sec)", "dvb-ci.mmi.delay", FT_UINT8, BASE_DEC,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_disp_ctl_cmd,
-            { "Command", "dvbci.mmi.disp_ctl_cmd", FT_UINT8, BASE_HEX,
+            { "Command", "dvb-ci.mmi.disp_ctl_cmd", FT_UINT8, BASE_HEX,
                 VALS(dvbci_disp_ctl_cmd), 0, NULL, HFILL } },
         { &hf_dvbci_mmi_mode,
-            { "MMI mode", "dvbci.mmi.mode", FT_UINT8, BASE_HEX,
+            { "MMI mode", "dvb-ci.mmi.mode", FT_UINT8, BASE_HEX,
                 VALS(dvbci_mmi_mode), 0, NULL, HFILL } },
         { &hf_dvbci_disp_rep_id,
-            { "Reply ID", "dvbci.mmi.disp_rep_id", FT_UINT8, BASE_HEX,
+            { "Reply ID", "dvb-ci.mmi.disp_rep_id", FT_UINT8, BASE_HEX,
                 VALS(dvbci_disp_rep_id), 0, NULL, HFILL } },
         { &hf_dvbci_char_tbl,
-            { "Character table", "dvbci.mmi.char_tbl", FT_UINT8, BASE_HEX,
+            { "Character table", "dvb-ci.mmi.char_tbl", FT_UINT8, BASE_HEX,
                 VALS(dvbci_char_tbl), 0, NULL, HFILL } },
         { &hf_dvbci_blind_ans,
-            { "Blind answer flag", "dvbci.mmi.blind_ans", FT_UINT8, BASE_HEX,
+            { "Blind answer flag", "dvb-ci.mmi.blind_ans", FT_UINT8, BASE_HEX,
                 VALS(dvbci_blind_ans), 0x01, NULL, HFILL } },
         { &hf_dvbci_ans_txt_len,
-            { "Answer text length", "dvbci.mmi.ans_txt_len",
+            { "Answer text length", "dvb-ci.mmi.ans_txt_len",
                 FT_UINT8, BASE_DEC, NULL , 0, NULL, HFILL } },
         { &hf_dvbci_text_ctrl,
-            { "Text control code", "dvbci.mmi.text_ctrl", FT_UINT8, BASE_HEX,
+            { "Text control code", "dvb-ci.mmi.text_ctrl", FT_UINT8, BASE_HEX,
                 VALS(dvbci_text_ctrl), 0, NULL, HFILL } },
         { &hf_dvbci_ans_id,
-            { "Answer ID", "dvbci.mmi.ans_id", FT_UINT8, BASE_HEX,
+            { "Answer ID", "dvb-ci.mmi.ans_id", FT_UINT8, BASE_HEX,
                 VALS(dvbci_ans_id) , 0, NULL, HFILL } },
         { &hf_dvbci_choice_nb,
-            { "Number of menu items", "dvbci.mmi.choice_nb", FT_UINT8, BASE_DEC,
+            { "Number of menu items", "dvb-ci.mmi.choice_nb", FT_UINT8, BASE_DEC,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_choice_ref,
-            { "Selected item", "dvbci.mmi.choice_ref", FT_UINT8, BASE_DEC,
+            { "Selected item", "dvb-ci.mmi.choice_ref", FT_UINT8, BASE_DEC,
                 NULL, 0, NULL, HFILL } },
         { &hf_dvbci_item_nb,
-            { "Number of list items", "dvbci.mmi.item_nb", FT_UINT8, BASE_DEC,
+            { "Number of list items", "dvb-ci.mmi.item_nb", FT_UINT8, BASE_DEC,
                 NULL, 0, NULL, HFILL } }
     };