From Micheal Mann via bug 2794: Fix some display filter field names.

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

diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index e7d55b83ba4423f88110749b6d81e4400319aaa2..545fad6a5ebc5bafb88e67055b6cd2a339dc9198 100644 (file)
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -2312,12 +2312,12 @@ void proto_register_batadv(void)
                    NULL, HFILL }
                },
                { &hf_msg_reassembled_in,
-                 {"Reassembled in", "msg.reassembled.in",
+                 {"Reassembled in", "batadv.msg.reassembled.in",
                    FT_FRAMENUM, BASE_NONE, NULL, 0x00,
                    NULL, HFILL }
                },
                { &hf_msg_reassembled_length,
-                 {"Reassembled length", "msg.reassembled.length",
+                 {"Reassembled length", "batadv.msg.reassembled.length",
                    FT_UINT32, BASE_DEC, NULL, 0x00,
                    NULL, HFILL }
                }

diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index cd31317ad31b9fa3ab7c268c8b068d482724636e..94fbdd9a53054a9a45475be6bce9d528c87177fd 100644 (file)
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -4401,8 +4401,8 @@ proto_register_fileexp (void)
     {&hf_fileexp_afsFid_volume_low, {"Volume Low", "fileexp.afsFid.volume_low", FT_UINT32, BASE_HEX, NULL, 0x0, "afsFid Volume Low", HFILL}},
     {&hf_fileexp_afsFid_Vnode, {"Vnode", "fileexp.afsFid.Vnode", FT_UINT32, BASE_HEX, NULL, 0x0, "afsFid Vnode", HFILL}},
     {&hf_fileexp_afsFid_Unique, {"Unique", "fileexp.afsFid.Unique", FT_UINT32, BASE_HEX, NULL, 0x0, "afsFid Unique", HFILL}},
-    {&hf_fileexp_afsNetAddr_type, {"Type", "afsNetAddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
-    {&hf_fileexp_afsNetAddr_data, {"IP Data", "afsNetAddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    {&hf_fileexp_afsNetAddr_type, {"Type", "fileexp.afsNetAddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    {&hf_fileexp_afsNetAddr_data, {"IP Data", "fileexp.afsNetAddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_position_high, {"Position High", "fileexp.position_high", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_position_low, {"Position Low", "fileexp.position_low", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsreturndesc_tokenid_high, {"Token id High", "fileexp.afsreturndesc_tokenid_high", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},

diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index 381d847e111376d3927f30f914b8d7332a44d2d7..6774387e8e92fd9bd54785c97d5555621a63973d 100644 (file)
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -136,7 +136,7 @@ proto_register_rs_acct (void)
        { &hf_rs_acct_lookup_rqst_key_size,
                { "Key Size", "rs_acct.lookup_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
        { &hf_rs_acct_lookup_rqst_key_t,
-               { "Key", "rs_lookup.get_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+               { "Key", "rs_acct.lookup_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
        { &hf_rs_acct_get_projlist_rqst_var1,
                { "Var1", "rs_acct.get_projlist_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
        { &hf_rs_acct_get_projlist_rqst_key_size,

diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c
index 782b41fac95026d2ba49d879d773008c5da4fb7b..08ecb2474dc1ba0f62d1a5287065cb3f2c2dbdc6 100644 (file)
--- a/epan/dissectors/packet-dcerpc-rs_repadm.c
+++ b/epan/dissectors/packet-dcerpc-rs_repadm.c
@@ -75,7 +75,7 @@ proto_register_rs_repadm (void)
 {
        static hf_register_info hf[] = {
        { &hf_rs_repadm_opnum,
-               { "Operation", "rs_repadmin.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}
+               { "Operation", "rs_repadm.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}
        };
 
        static gint *ett[] = {

diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index a701d3146abc3ea4fa0195f7d813acd67ebe3b73..2f1440653ae61ca9fd38bed47708f29a0811dd6b 100644 (file)
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -8356,25 +8356,25 @@ proto_register_dcerpc_spoolss(void)
                /* Security descriptor buffer */
 
                { &hf_secdescbuf_maxlen,
-                 { "Max len", "secdescbuf.max_len",
+                 { "Max len", "spoolss.secdescbuf.max_len",
                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                { &hf_secdescbuf_undoc,
-                 { "Undocumented", "secdescbuf.undoc",
+                 { "Undocumented", "spoolss.secdescbuf.undoc",
                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                { &hf_secdescbuf_len,
-                 { "Length", "secdescbuf.len",
+                 { "Length", "spoolss.secdescbuf.len",
                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                /* Spool printer info */
 
                { &hf_spool_printer_info_devmode_ptr,
-                 { "Devmode pointer", "spoolprinterinfo.devmode_ptr",
+                 { "Devmode pointer", "spoolss.spoolprinterinfo.devmode_ptr",
                    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
                { &hf_spool_printer_info_secdesc_ptr,
-                 { "Secdesc pointer", "spoolprinterinfo.secdesc_ptr",
+                 { "Secdesc pointer", "spoolss.spoolprinterinfo.secdesc_ptr",
                    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
                /* WritePrinter RPC */
@@ -8387,15 +8387,15 @@ proto_register_dcerpc_spoolss(void)
                /* Setprinterdataex RPC */
 
                { &hf_setprinterdataex_max_len,
-                 { "Max len", "setprinterdataex.max_len",
+                 { "Max len", "spoolss.setprinterdataex.max_len",
                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                { &hf_setprinterdataex_real_len,
-                 { "Real len", "setprinterdataex.real_len",
+                 { "Real len", "spoolss.setprinterdataex.real_len",
                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                { &hf_setprinterdataex_data,
-                 { "Data", "setprinterdataex.data",
+                 { "Data", "spoolss.setprinterdataex.data",
                    FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
                /* Specific access rights */

diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 127887b52f1ca25e37e825e1ab3b32af3953703e..2135241512a318539d9142ee3001d179627943ec 100644 (file)
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -5818,37 +5818,37 @@ proto_register_dcerpc (void)
         { &hf_dcerpc_cn_rts_commands_nb,
           { "RTS Number of Commands", "dcerpc.cn_rts_commands_nb", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command,
-          { "RTS Command", "dcerpc_cn_rts_command", FT_UINT32, BASE_HEX, VALS(rts_command_vals), 0x0, NULL, HFILL }},
+          { "RTS Command", "dcerpc.cn_rts_command", FT_UINT32, BASE_HEX, VALS(rts_command_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_receivewindowsize,
-          {"Receive Window Size", "dcerpc_cn_rts_command.receivewindowsize", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Receive Window Size", "dcerpc.cn_rts_command.receivewindowsize", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_fack_bytesreceived,
-          {"Bytes Received", "dcerpc_cn_rts_command.fack.bytesreceived", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Bytes Received", "dcerpc.cn_rts_command.fack.bytesreceived", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_fack_availablewindow,
-          {"Available Window", "dcerpc_cn_rts_command.fack.availablewindow", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Available Window", "dcerpc.cn_rts_command.fack.availablewindow", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_fack_channelcookie,
-          {"Channel Cookie", "dcerpc_cn_rts_command.fack.channelcookie", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          {"Channel Cookie", "dcerpc.cn_rts_command.fack.channelcookie", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_connectiontimeout,
-          {"Connection Timeout", "dcerpc_cn_rts_command.connectiontimeout", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          {"Connection Timeout", "dcerpc.cn_rts_command.connectiontimeout", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_cookie,
-          {"Cookie", "dcerpc_cn_rts_command.cookie", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          {"Cookie", "dcerpc.cn_rts_command.cookie", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_channellifetime,
-          {"Channel Lifetime", "dcerpc_cn_rts_command.channellifetime", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          {"Channel Lifetime", "dcerpc.cn_rts_command.channellifetime", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_clientkeepalive,
-          {"Client Keepalive", "dcerpc_cn_rts_command.clientkeepalive", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Client Keepalive", "dcerpc.cn_rts_command.clientkeepalive", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_version,
-          {"Version", "dcerpc_cn_rts_command.version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Version", "dcerpc.cn_rts_command.version", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_conformancecount,
-          {"Conformance Count", "dcerpc_cn_rts_command.padding.conformancecount", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Conformance Count", "dcerpc.cn_rts_command.padding.conformancecount", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_padding,
-          { "Padding", "dcerpc_cn_rts_command.padding.padding", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+          { "Padding", "dcerpc.cn_rts_command.padding.padding", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_dcerpc_cn_rts_command_addrtype,
-          { "Address Type", "dcerpc_cn_rts_command.addrtype", FT_UINT32, BASE_DEC, VALS(rts_addresstype_vals), 0x0, NULL, HFILL }},
+          { "Address Type", "dcerpc.cn_rts_command.addrtype", FT_UINT32, BASE_DEC, VALS(rts_addresstype_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_associationgroupid,
-          {"Association Group ID", "dcerpc_cn_rts_command.associationgroupid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          {"Association Group ID", "dcerpc.cn_rts_command.associationgroupid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_forwarddestination,
-          {"Forward Destination", "dcerpc_cn_rts_command.forwarddestination", FT_UINT32, BASE_DEC, VALS(rts_forward_destination_vals), 0x0, NULL, HFILL }},
+          {"Forward Destination", "dcerpc.cn_rts_command.forwarddestination", FT_UINT32, BASE_DEC, VALS(rts_forward_destination_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_rts_command_pingtrafficsentnotify,
-          {"Ping Traffic Sent Notify", "dcerpc_cn_rts_command.pingtrafficsentnotify", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          {"Ping Traffic Sent Notify", "dcerpc.cn_rts_command.pingtrafficsentnotify", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_dcerpc,

diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c
index 8bb106051ef4d54fe8c3305e393d7ed7c98ef8b2..07b76ad0246a77664091fa7d21b8bd4b84cf4caf 100644 (file)
--- a/epan/dissectors/packet-dcom-dispatch.c
+++ b/epan/dissectors/packet-dcom-dispatch.c
@@ -539,7 +539,7 @@ proto_register_dcom_dispatch(void)
 
     static hf_register_info hf_dispatch_array[] = {
         { &hf_dispatch_opnum,
-          { "Operation", "dispatch_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "Operation", "dispatch.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_riid,
           { "RIID", "dispatch.riid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},

diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index 169dae919f8551ec1bae5db3fd4eb903b17b3914..bdd07b751ca501c597cba406ce0e81b82399192a 100644 (file)
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -1182,19 +1182,19 @@ proto_register_dlm3(void)
         FT_UINT16, BASE_DEC, NULL, 0x0,
         NULL, HFILL }},
     { &hf_dlm3_rl_name,
-      { "Name of Resource", "dlm.rl.name",
+      { "Name of Resource", "dlm3.rl.name",
         FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_dlm3_rl_name_contents,
-      { "Contents actually occupying `name' field", "dlm.rl.name_contents",
+      { "Contents actually occupying `name' field", "dlm3.rl.name_contents",
         FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_dlm3_rl_name_padding,
-      { "Padding", "dlm.rl.name_padding",
+      { "Padding", "dlm3.rl.name_padding",
         FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_dlm3_rl_lvb,
-      { "Lock Value Block", "dlm.rl.lvb",
+      { "Lock Value Block", "dlm3.rl.lvb",
         FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }}
   };

diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index 83e6b11ccac34ceb44b3bc2f88dbe07bc6e47dc2..f68986a9db83270132ad94c1a3a488d987c4484c 100644 (file)
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -560,7 +560,7 @@ void proto_register_erldp(void) {
                         "Message Length", HFILL}},
 
     /*--- ETF  ---*/
-    { &hf_etf_tag,    { "Tag", "etf.tag",
+    { &hf_etf_tag,    { "Tag", "erldp.etf_tag",
                         FT_UINT8, BASE_DEC, VALS(etf_tag_vals), 0x0,
                         NULL, HFILL}},
   };

diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index 14d25cd3cbdb18a0da332436b1e78931b333f2ee..521d90a7fa01fb65f419e5b38122ede608392c12 100644 (file)
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -886,7 +886,7 @@ proto_register_jfif(void)
                /* Marker segment */
                { &hf_marker_segment,
                        {       "Marker segment",
-                               IMG_JFIF "marker_segment",
+                               IMG_JFIF ".marker_segment",
                                FT_NONE, BASE_NONE, NULL, 0x00,
                                NULL,
                                HFILL

diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c
index 193f1cfd4c17579bddf00f51d08a27010e360d5b..dd13d95c680db9fa4829451dfc6049f4ffb57130 100644 (file)
--- a/epan/dissectors/packet-lanforge.c
+++ b/epan/dissectors/packet-lanforge.c
@@ -174,7 +174,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_crc,
           {
-              "CRC", "LANforge.CRC",
+              "CRC", "lanforge.CRC",
               FT_UINT32, BASE_HEX, NULL, 0x0,
               "The LANforge CRC number", HFILL
           }
@@ -182,7 +182,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_magic,
           {
-              "Magic number", "LANforge.magic",
+              "Magic number", "lanforge.magic",
               FT_UINT32, BASE_HEX, NULL, 0x0,
               "The LANforge magic number", HFILL
           }
@@ -190,7 +190,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_src_session,
           {
-              "Source session ID", "LANforge.source-session-id",
+              "Source session ID", "lanforge.source-session-id",
               FT_UINT16, BASE_DEC, NULL, 0x0,
               "The LANforge source session ID", HFILL
           }
@@ -198,7 +198,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_dst_session,
           {
-              "Dest session ID", "LANforge.dest-session-id",
+              "Dest session ID", "lanforge.dest-session-id",
               FT_UINT16, BASE_DEC, NULL, 0x0,
               "The LANforge dest session ID", HFILL
           }
@@ -206,7 +206,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_pld_len_l,
           {
-              "Payload Length(L)", "LANforge.pld-len-L",
+              "Payload Length(L)", "lanforge.pld-len-L",
               FT_UINT16, BASE_DEC, NULL, 0x0,
               "The LANforge payload length (low bytes)", HFILL
           }
@@ -214,7 +214,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_pld_len_h,
           {
-              "Payload Length(H)", "LANforge.pld-len-H",
+              "Payload Length(H)", "lanforge.pld-len-H",
               FT_UINT8, BASE_DEC, NULL, 0x0,
               "The LANforge payload length (high byte)", HFILL
           }
@@ -222,7 +222,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_pld_len,
           {
-              "Payload Length", "LANforge.pld-length",
+              "Payload Length", "lanforge.pld-length",
               FT_UINT32, BASE_DEC, NULL, 0x0,
               "The LANforge payload length", HFILL
           }
@@ -230,7 +230,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_pld_pattern,
           {
-              "Payload Pattern", "LANforge.pld-pattern",
+              "Payload Pattern", "lanforge.pld-pattern",
               FT_UINT16, BASE_DEC, NULL, 0x0,
               "The LANforge payload pattern", HFILL
           }
@@ -238,7 +238,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_seq,
           {
-              "Sequence Number", "LANforge.seqno",
+              "Sequence Number", "lanforge.seqno",
               FT_UINT32, BASE_DEC, NULL, 0x0,
               "The LANforge Sequence Number", HFILL
           }
@@ -246,7 +246,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_tx_time_s,
           {
-              "Timestamp Secs", "LANforge.ts-secs",
+              "Timestamp Secs", "lanforge.ts-secs",
               FT_UINT32, BASE_DEC, NULL, 0x0,
               NULL, HFILL
           }
@@ -254,7 +254,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_tx_time_ns,
           {
-              "Timestamp nsecs", "LANforge.ts-nsecs",
+              "Timestamp nsecs", "lanforge.ts-nsecs",
               FT_UINT32, BASE_DEC, NULL, 0x0,
               NULL, HFILL
           }
@@ -262,7 +262,7 @@ void proto_register_lanforge(void)
 
         { &hf_lanforge_timestamp,
           {
-              "Timestamp", "LANforge.timestamp",
+              "Timestamp", "lanforge.timestamp",
               FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
               NULL, HFILL
           }

diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index f9c654df23a6cc933d9d99ad741b0d0e348ec674..225457825326c3b54fc98d0a9fa13b4a9bb43942 100644 (file)
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -150,79 +150,79 @@ proto_register_macctrl(void)
 {
   static hf_register_info hf[] = {
     { &hf_macctrl_opcode,
-      { "Opcode", "macctrl.opcode", FT_UINT16, BASE_HEX,
+      { "Opcode", "macc.opcode", FT_UINT16, BASE_HEX,
         VALS(opcode_vals), 0x0, "MAC Control opcode", HFILL}},
 
     { &hf_macctrl_pause_time,
-      { "pause_time", "macctrl.pause_time", FT_UINT16, BASE_DEC,
+      { "pause_time", "macc.pause_time", FT_UINT16, BASE_DEC,
         NULL, 0x0, "MAC control PAUSE frame pause_time", HFILL }},
 
     { &hf_macctrl_cbfc_enbv,
-      { "CBFC Class Enable Vector", "macctrl.cbfc.enbv", FT_UINT16, BASE_HEX,
+      { "CBFC Class Enable Vector", "macc.cbfc.enbv", FT_UINT16, BASE_HEX,
         NULL, 0x0, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c0,
-      { "C0", "macctrl.cbfc.enbv.c0", FT_BOOLEAN, 16,
+      { "C0", "macc.cbfc.enbv.c0", FT_BOOLEAN, 16,
         NULL, 0x01, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c1,
-      { "C1", "macctrl.cbfc.enbv.c1", FT_BOOLEAN, 16,
+      { "C1", "macc.cbfc.enbv.c1", FT_BOOLEAN, 16,
         NULL, 0x02, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c2,
-      { "C2", "macctrl.cbfc.enbv.c2", FT_BOOLEAN, 16,
+      { "C2", "macc.cbfc.enbv.c2", FT_BOOLEAN, 16,
         NULL, 0x04, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c3,
-      { "C3", "macctrl.cbfc.enbv.c3", FT_BOOLEAN, 16,
+      { "C3", "macc.cbfc.enbv.c3", FT_BOOLEAN, 16,
         NULL, 0x08, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c4,
-      { "C4", "macctrl.cbfc.enbv.c4", FT_BOOLEAN, 16,
+      { "C4", "macc.cbfc.enbv.c4", FT_BOOLEAN, 16,
         NULL, 0x10, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c5,
-      { "C5", "macctrl.cbfc.enbv.c5", FT_BOOLEAN, 16,
+      { "C5", "macc.cbfc.enbv.c5", FT_BOOLEAN, 16,
         NULL, 0x20, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c6,
-      { "C6", "macctrl.cbfc.enbv.c6", FT_BOOLEAN, 16,
+      { "C6", "macc.cbfc.enbv.c6", FT_BOOLEAN, 16,
         NULL, 0x40, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_enbv_c7,
-      { "C7", "macctrl.cbfc.enbv.c7", FT_BOOLEAN, 16,
+      { "C7", "macc.cbfc.enbv.c7", FT_BOOLEAN, 16,
         NULL, 0x80, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c0,
-      { "C0", "macctrl.cbfc.pause_time.c0", FT_UINT16, BASE_DEC,
+      { "C0", "macc.cbfc.pause_time.c0", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c1,
-      { "C1", "macctrl.cbfc.pause_time.c1", FT_UINT16, BASE_DEC,
+      { "C1", "macc.cbfc.pause_time.c1", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c2,
-      { "C2", "macctrl.cbfc.pause_time.c2", FT_UINT16, BASE_DEC,
+      { "C2", "macc.cbfc.pause_time.c2", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c3,
-      { "C3", "macctrl.cbfc.pause_time.c3", FT_UINT16, BASE_DEC,
+      { "C3", "macc.cbfc.pause_time.c3", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c4,
-      { "C4", "macctrl.cbfc.pause_time.c4", FT_UINT16, BASE_DEC,
+      { "C4", "macc.cbfc.pause_time.c4", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c5,
-      { "C5", "macctrl.cbfc.pause_time.c5", FT_UINT16, BASE_DEC,
+      { "C5", "macc.cbfc.pause_time.c5", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c6,
-      { "C6", "macctrl.cbfc.pause_time.c6", FT_UINT16, BASE_DEC,
+      { "C6", "macc.cbfc.pause_time.c6", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }},
 
     { &hf_macctrl_cbfc_pause_time_c7,
-      { "C7", "macctrl.cbfc.pause_time.c7", FT_UINT16, BASE_DEC,
+      { "C7", "macc.cbfc.pause_time.c7", FT_UINT16, BASE_DEC,
         NULL, 0x00, NULL, HFILL }}
 
   };