From Chris Maynard <christopher.maynard@gtech.com>:
authorrichardv <richardv@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 7 Oct 2007 23:46:44 +0000 (23:46 +0000)
committerrichardv <richardv@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 7 Oct 2007 23:46:44 +0000 (23:46 +0000)
With the exception of docsis's packet-tlv.c file, these are all simple problems
with the prefix not exactly set to PROTOABBREV.  For example, for
packet-bpkmattr.c, the field names are prefixed with "docsis.bpkmattr." instead
of "docsis_bpkmattr.".

packet-tlv.c had one mis-named field, namely "docsis.cos.sid".  It has been
changed to "docsis_tlv.cos.sid" in the patch to be attached, which includes
patches for 29 files in the plugins/docsis/ directory ...

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

29 files changed:
plugins/docsis/packet-bpkmattr.c
plugins/docsis/packet-bpkmreq.c
plugins/docsis/packet-bpkmrsp.c
plugins/docsis/packet-dccack.c
plugins/docsis/packet-dccreq.c
plugins/docsis/packet-dccrsp.c
plugins/docsis/packet-dcd.c
plugins/docsis/packet-dsaack.c
plugins/docsis/packet-dsareq.c
plugins/docsis/packet-dsarsp.c
plugins/docsis/packet-dscack.c
plugins/docsis/packet-dscreq.c
plugins/docsis/packet-dscrsp.c
plugins/docsis/packet-dsdreq.c
plugins/docsis/packet-dsdrsp.c
plugins/docsis/packet-intrngreq.c
plugins/docsis/packet-macmgmt.c
plugins/docsis/packet-map.c
plugins/docsis/packet-regack.c
plugins/docsis/packet-regreq.c
plugins/docsis/packet-regrsp.c
plugins/docsis/packet-rngreq.c
plugins/docsis/packet-rngrsp.c
plugins/docsis/packet-tlv.c
plugins/docsis/packet-type29ucd.c
plugins/docsis/packet-uccreq.c
plugins/docsis/packet-uccrsp.c
plugins/docsis/packet-ucd.c
plugins/docsis/packet-vendor.c

index 77a5f92a066faf6eaa41dbfaaf06930aca3c30cc..3a0ccb5a5408d66d8ac6e35c56176a8244979a72 100644 (file)
@@ -398,147 +398,147 @@ proto_register_docsis_bpkmattr (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_bpkmattr,
-     {"BPKM Attributes", "docsis.bpkmattr",
+     {"BPKM Attributes", "docsis_bpkmattr",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "BPKM Attributes", HFILL}
      },
     {&hf_docsis_bpkmattr_serial_num,
-     {"1 Serial Number", "docsis.bpkmattr.serialnum",
+     {"1 Serial Number", "docsis_bpkmattr.serialnum",
       FT_STRING, BASE_DEC, NULL, 0x0,
       "Serial Number", HFILL}
      },
     {&hf_docsis_bpkmattr_manf_id,
-     {"2 Manufacturer Id", "docsis.bpkmattr.manfid",
+     {"2 Manufacturer Id", "docsis_bpkmattr.manfid",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Manufacturer Id", HFILL}
      },
     {&hf_docsis_bpkmattr_mac_addr,
-     {"3 Mac Address", "docsis.bpkmattr.macaddr",
+     {"3 Mac Address", "docsis_bpkmattr.macaddr",
       FT_ETHER, BASE_HEX, NULL, 0x0,
       "Mac Address", HFILL}
      },
     {&hf_docsis_bpkmattr_rsa_pub_key,
-     {"4 RSA Public Key", "docsis.bpkmattr.rsa_pub_key",
+     {"4 RSA Public Key", "docsis_bpkmattr.rsa_pub_key",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "RSA Public Key", HFILL}
      },
     {&hf_docsis_bpkmattr_cm_id,
-     {"5 CM Identification", "docsis.bpkmattr.cmid",
+     {"5 CM Identification", "docsis_bpkmattr.cmid",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "CM Identification", HFILL}
      },
     {&hf_docsis_bpkmattr_display_str,
-     {"6 Display String", "docsis.bpkmattr.dispstr",
+     {"6 Display String", "docsis_bpkmattr.dispstr",
       FT_STRING, BASE_DEC, NULL, 0x0,
       "Display String", HFILL}
      },
     {&hf_docsis_bpkmattr_auth_key,
-     {"7 Auth Key", "docsis.bpkmattr.auth_key",
+     {"7 Auth Key", "docsis_bpkmattr.auth_key",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Auth Key", HFILL}
      },
     {&hf_docsis_bpkmattr_tek,
-     {"8 Traffic Encryption Key", "docsis.bpkmattr.tek",
+     {"8 Traffic Encryption Key", "docsis_bpkmattr.tek",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Traffic Encryption Key", HFILL}
      },
     {&hf_docsis_bpkmattr_key_life,
-     {"9 Key Lifetime (s)", "docsis.bpkmattr.keylife",
+     {"9 Key Lifetime (s)", "docsis_bpkmattr.keylife",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Key Lifetime (s)", HFILL}
      },
     {&hf_docsis_bpkmattr_key_seq,
-     {"10 Key Sequence Number", "docsis.bpkmattr.keyseq",
+     {"10 Key Sequence Number", "docsis_bpkmattr.keyseq",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Key Sequence Number", HFILL}
      },
     {&hf_docsis_bpkmattr_hmac_digest,
-     {"11 HMAC Digest", "docsis.bpkmattr.hmacdigest",
+     {"11 HMAC Digest", "docsis_bpkmattr.hmacdigest",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "HMAC Digest", HFILL}
      },
     {&hf_docsis_bpkmattr_said,
-     {"12 SAID", "docsis.bpkmattr.said",
+     {"12 SAID", "docsis_bpkmattr.said",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Security Association ID", HFILL}
      },
     {&hf_docsis_bpkmattr_tek_params,
-     {"13 TEK Parameters", "docsis.bpkmattr.tekparams",
+     {"13 TEK Parameters", "docsis_bpkmattr.tekparams",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "TEK Parameters", HFILL}
      },
     {&hf_docsis_bpkmattr_cbc_iv,
-     {"14 CBC IV", "docsis.bpkmattr.cbciv",
+     {"14 CBC IV", "docsis_bpkmattr.cbciv",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Cypher Block Chaining", HFILL}
      },
     {&hf_docsis_bpkmattr_error_code,
-     {"16 Error Code", "docsis.bpkmattr.errcode",
+     {"16 Error Code", "docsis_bpkmattr.errcode",
       FT_UINT8, BASE_DEC, VALS (error_code_vals), 0x0,
       "Error Code", HFILL}
      },
     {&hf_docsis_bpkmattr_vendor_def,
-     {"127 Vendor Defined", "docsis.bpkmattr.vendordef",
+     {"127 Vendor Defined", "docsis_bpkmattr.vendordef",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Defined", HFILL}
      },
     {&hf_docsis_bpkmattr_ca_cert,
-     {"17 CA Certificate", "docsis.bpkmattr.cacert",
+     {"17 CA Certificate", "docsis_bpkmattr.cacert",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "CA Certificate", HFILL}
      },
     {&hf_docsis_bpkmattr_cm_cert,
-     {"18 CM Certificate", "docsis.bpkmattr.cmcert",
+     {"18 CM Certificate", "docsis_bpkmattr.cmcert",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "CM Certificate", HFILL}
      },
     {&hf_docsis_bpkmattr_security_cap,
-     {"19 Security Capabilities", "docsis.bpkmattr.seccap",
+     {"19 Security Capabilities", "docsis_bpkmattr.seccap",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Security Capabilities", HFILL}
      },
     {&hf_docsis_bpkmattr_crypto_suite,
-     {"20 Cryptographic Suite", "docsis.bpkmattr.cryptosuite",
+     {"20 Cryptographic Suite", "docsis_bpkmattr.cryptosuite",
       FT_UINT16, BASE_HEX, VALS(crypto_suite_attr_vals), 0x0,
       "Cryptographic Suite", HFILL}
      },
     {&hf_docsis_bpkmattr_crypto_suite_list,
-     {"21 Cryptographic Suite List", "docsis.bpkmattr.crypto_suite_lst",
+     {"21 Cryptographic Suite List", "docsis_bpkmattr.crypto_suite_lst",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Cryptographic Suite", HFILL}
      },
     {&hf_docsis_bpkmattr_bpi_version,
-     {"22 BPI Version", "docsis.bpkmattr.bpiver",
+     {"22 BPI Version", "docsis_bpkmattr.bpiver",
       FT_UINT8, BASE_DEC, VALS (bpi_ver_vals), 0x0,
       "BPKM Attributes", HFILL}
      },
     {&hf_docsis_bpkmattr_sa_descr,
-     {"23 SA Descriptor", "docsis.bpkmattr.sadescr",
+     {"23 SA Descriptor", "docsis_bpkmattr.sadescr",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SA Descriptor", HFILL}
      },
     {&hf_docsis_bpkmattr_sa_type,
-     {"24 SA Type", "docsis.bpkmattr.satype",
+     {"24 SA Type", "docsis_bpkmattr.satype",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "SA Type", HFILL}
      },
     {&hf_docsis_bpkmattr_sa_query,
-     {"25 SA Query", "docsis.bpkmattr.saquery",
+     {"25 SA Query", "docsis_bpkmattr.saquery",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SA Query", HFILL}
      },
     {&hf_docsis_bpkmattr_sa_query_type,
-     {"26 SA Query Type", "docsis.bpkmattr.saquery_type",
+     {"26 SA Query Type", "docsis_bpkmattr.saquery_type",
       FT_UINT8, BASE_HEX, NULL, 0x0,
       "SA Query Type", HFILL}
      },
     {&hf_docsis_bpkmattr_ip_address,
-     {"27 IP Address", "docsis.bpkmattr.ipaddr",
+     {"27 IP Address", "docsis_bpkmattr.ipaddr",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "IP Address", HFILL}
      },
     {&hf_docsis_bpkmattr_download_param,
-     {"28 Download Parameters", "docsis.bpkmattr.dnld_params",
+     {"28 Download Parameters", "docsis_bpkmattr.dnld_params",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Download Parameters", HFILL}
      },
index f8364b343ee18c81db6df09e657a9b7af5fe3fdc..1b9402d9cc7c36ef244d3af9554916fd3f4c064e 100644 (file)
@@ -128,22 +128,22 @@ proto_register_docsis_bpkmreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_bpkmreq,
-     {"BPKM Request Message", "docsis.bpkmreq",
+     {"BPKM Request Message", "docsis_bpkmreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "BPKM Request Message", HFILL}
      },
     {&hf_docsis_bpkmreq_code,
-     {"BPKM Code", "docsis.bpkmreq.code",
+     {"BPKM Code", "docsis_bpkmreq.code",
       FT_UINT8, BASE_DEC, VALS (code_field_vals), 0x0,
       "BPKM Request Message", HFILL}
      },
     {&hf_docsis_bpkmreq_ident,
-     {"BPKM Identifier", "docsis.bpkmreq.ident",
+     {"BPKM Identifier", "docsis_bpkmreq.ident",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "BPKM Identifier", HFILL}
      },
     {&hf_docsis_bpkmreq_length,
-     {"BPKM Length", "docsis.bpkmreq.length",
+     {"BPKM Length", "docsis_bpkmreq.length",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "BPKM Length", HFILL}
      },
index 4ee0c0d67692247ac1e1d7320024866b65ec4b3e..c98faa213ba84d83386f3198215c239e6bb45239 100644 (file)
@@ -129,22 +129,22 @@ proto_register_docsis_bpkmrsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_bpkmrsp,
-     {"BPKM Response Message", "docsis.bpkmrsp",
+     {"BPKM Response Message", "docsis_bpkmrsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "BPKM Response Message", HFILL}
      },
     {&hf_docsis_bpkmrsp_code,
-     {"BPKM Code", "docsis.bpkmrsp.code",
+     {"BPKM Code", "docsis_bpkmrsp.code",
       FT_UINT8, BASE_DEC, VALS (code_field_vals), 0x0,
       "BPKM Response Message", HFILL}
      },
     {&hf_docsis_bpkmrsp_ident,
-     {"BPKM Identifier", "docsis.bpkmrsp.ident",
+     {"BPKM Identifier", "docsis_bpkmrsp.ident",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "BPKM Identifier", HFILL}
      },
     {&hf_docsis_bpkmrsp_length,
-     {"BPKM Length", "docsis.bpkmrsp.length",
+     {"BPKM Length", "docsis_bpkmrsp.length",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "BPKM Length", HFILL}
      },
index edd5be45828027040ac38d5401d83c060a7c3b96..40f770dad337d3615c112eeed4269c618cd1f7a6 100644 (file)
@@ -129,7 +129,7 @@ proto_register_docsis_dccack (void)
     {&hf_docsis_dccack_tran_id ,
       {
       "Transaction ID ", 
-      "docsis.dccack.tran_id",
+      "docsis_dccack.tran_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction ID ", 
       HFILL
@@ -138,7 +138,7 @@ proto_register_docsis_dccack (void)
     {&hf_docsis_dccack_key_seq_num ,
       {
       "Auth Key Sequence Number ",
-      "docsis.dccack.key_seq_num",
+      "docsis_dccack.key_seq_num",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Auth Key Sequence Number ",
       HFILL
@@ -147,7 +147,7 @@ proto_register_docsis_dccack (void)
     {&hf_docsis_dccack_hmac_digest ,
       {
       "HMAC-DigestNumber ",
-      "docsis.dccack.hmac_digest",
+      "docsis_dccack.hmac_digest",
       FT_BYTES, BASE_DEC, NULL, 0x0,
       "HMAC-DigestNumber ",
       HFILL
index 3acf74bfd67f149b870ecede67dc2765db44586e..df33878a46f552889298719620e17ef249986eb7 100644 (file)
@@ -396,7 +396,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_tran_id ,
       {
       "Transaction ID ", 
-      "docsis.dccreq.tran_id",
+      "docsis_dccreq.tran_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction ID ", 
       HFILL
@@ -405,7 +405,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_up_chan_id ,
       {
       "Up Channel ID ", 
-      "docsis.dccreq.up_chan_id",
+      "docsis_dccreq.up_chan_id",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Up Channel ID ", 
       HFILL
@@ -414,7 +414,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_freq ,
       {
       "Frequency ", 
-      "docsis.dccreq.ds_freq",
+      "docsis_dccreq.ds_freq",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Frequency ", 
       HFILL
@@ -423,7 +423,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_mod_type ,
       {
       "Modulation Type ", 
-      "docsis.dccreq.ds_mod_type",
+      "docsis_dccreq.ds_mod_type",
       FT_UINT8, BASE_DEC, VALS (ds_mod_type_vals), 0x0,
       "Modulation Type ", 
       HFILL
@@ -432,7 +432,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_sym_rate ,
       {
       "Symbol Rate", 
-      "docsis.dccreq.ds_sym_rate",
+      "docsis_dccreq.ds_sym_rate",
       FT_UINT8, BASE_DEC, VALS (ds_sym_rate_vals), 0x0,
       "Symbol Rate", 
       HFILL
@@ -441,7 +441,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_intlv_depth_i ,
       {
       "Interleaver Depth I Value", 
-      "docsis.dccreq.ds_intlv_depth_i",
+      "docsis_dccreq.ds_intlv_depth_i",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Interleaver Depth I Value", 
       HFILL
@@ -450,7 +450,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_intlv_depth_j ,
       {
       "Interleaver Depth J Value", 
-      "docsis.dccreq.ds_intlv_depth_j",
+      "docsis_dccreq.ds_intlv_depth_j",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Interleaver Depth J Value", 
       HFILL
@@ -459,7 +459,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_chan_id ,
       {
       "Downstream Channel ID",
-      "docsis.dccreq.ds_chan_id",
+      "docsis_dccreq.ds_chan_id",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Downstream Channel ID",
       HFILL
@@ -468,7 +468,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ds_sync_sub ,
       {
       "SYNC Substitution",
-      "docsis.dccreq.ds_sync_sub",
+      "docsis_dccreq.ds_sync_sub",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "SYNC Substitution",
       HFILL
@@ -477,7 +477,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_init_tech ,
       {
       "Initialization Technique", 
-      "docsis.dccreq.init_tech",
+      "docsis_dccreq.init_tech",
       FT_UINT8, BASE_DEC, VALS (init_tech_vals), 0x0,
       "Initialization Technique", 
       HFILL
@@ -486,7 +486,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_ucd_sub ,
       {
       "UCD Substitution ", 
-      "docsis.dccreq.ucd_sub",
+      "docsis_dccreq.ucd_sub",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "UCD Substitution ", 
       HFILL
@@ -495,7 +495,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_said_sub_cur ,
       {
       "SAID Sub - Current Value",
-      "docsis.dccreq.said_sub_cur",
+      "docsis_dccreq.said_sub_cur",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "SAID Sub - Current Value",
       HFILL
@@ -504,7 +504,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_said_sub_new ,
       {
       "SAID Sub - New Value",
-      "docsis.dccreq.said_sub_new",
+      "docsis_dccreq.said_sub_new",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "SAID Sub - New Value",
       HFILL
@@ -513,7 +513,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_sf_sfid_cur ,
       {
       "SF Sub - SFID Current Value",
-      "docsis.dccreq.sf_sfid_cur",
+      "docsis_dccreq.sf_sfid_cur",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "SF Sub - SFID Current Value",
       HFILL
@@ -522,7 +522,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_sf_sfid_new ,
       {
       "SF Sub - SFID New Value",
-      "docsis.dccreq.sf_sfid_new",
+      "docsis_dccreq.sf_sfid_new",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "SF Sub - SFID New Value",
       HFILL
@@ -531,7 +531,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_sf_sid_cur ,
       {
       "SF Sub - SID Current Value",
-      "docsis.dccreq.sf_sid_cur",
+      "docsis_dccreq.sf_sid_cur",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "SF Sub - SID Current Value",
       HFILL
@@ -540,7 +540,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_sf_sid_new ,
       {
       "SF Sub - SID New Value",
-      "docsis.dccreq.sf_sid_new",
+      "docsis_dccreq.sf_sid_new",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "SF Sub - SID New Value",
       HFILL
@@ -549,7 +549,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_sf_unsol_grant_tref ,
       {
       "SF Sub - Unsolicited Grant Time Reference ",
-      "docsis.dccreq.sf_unsol_grant_tref",
+      "docsis_dccreq.sf_unsol_grant_tref",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "SF Sub - Unsolicited Grant Time Reference ",
       HFILL
@@ -558,7 +558,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_cmts_mac_addr ,
       {
       "CMTS Mac Address ",
-      "docsis.dccreq.cmts_mac_addr",
+      "docsis_dccreq.cmts_mac_addr",
       FT_ETHER, BASE_DEC, NULL, 0x0,
       "CMTS Mac Address ",
       HFILL
@@ -567,7 +567,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_key_seq_num ,
       {
       "Auth Key Sequence Number ",
-      "docsis.dccreq.key_seq_num",
+      "docsis_dccreq.key_seq_num",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Auth Key Sequence Number ",
       HFILL
@@ -576,7 +576,7 @@ proto_register_docsis_dccreq (void)
     {&hf_docsis_dccreq_hmac_digest ,
       {
       "HMAC-DigestNumber ",
-      "docsis.dccreq.hmac_digest",
+      "docsis_dccreq.hmac_digest",
       FT_BYTES, BASE_DEC, NULL, 0x0,
       "HMAC-DigestNumber ",
       HFILL
index 70ad4809a272dab868281a3246cd5aab84d8e8c0..6c10573f9f303d8d38498bb44d8138fd0127bd00 100644 (file)
@@ -189,7 +189,7 @@ proto_register_docsis_dccrsp (void)
     {&hf_docsis_dccrsp_tran_id ,
       {
       "Transaction ID ", 
-      "docsis.dccrsp.tran_id",
+      "docsis_dccrsp.tran_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction ID ", 
       HFILL
@@ -198,7 +198,7 @@ proto_register_docsis_dccrsp (void)
     {&hf_docsis_dccrsp_conf_code ,
       {
       "Confirmation Code ", 
-      "docsis.dccrsp.conf_code",
+      "docsis_dccrsp.conf_code",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Confirmation Code ", 
       HFILL
@@ -207,7 +207,7 @@ proto_register_docsis_dccrsp (void)
     {&hf_docsis_dccrsp_cm_jump_time_length ,
       {
       "Jump Time Length ", 
-      "docsis.dccrsp.cm_jump_time_length",
+      "docsis_dccrsp.cm_jump_time_length",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Jump Time Length ", 
       HFILL
@@ -216,7 +216,7 @@ proto_register_docsis_dccrsp (void)
     {&hf_docsis_dccrsp_cm_jump_time_start ,
       {
       "Jump Time Start ", 
-      "docsis.dccrsp.cm_jump_time_start",
+      "docsis_dccrsp.cm_jump_time_start",
       FT_UINT64, BASE_DEC, NULL, 0x0,
       "Jump Time Start ", 
       HFILL
@@ -225,7 +225,7 @@ proto_register_docsis_dccrsp (void)
     {&hf_docsis_dccrsp_key_seq_num ,
       {
       "Auth Key Sequence Number ",
-      "docsis.dccrsp.key_seq_num",
+      "docsis_dccrsp.key_seq_num",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Auth Key Sequence Number ",
       HFILL
@@ -234,7 +234,7 @@ proto_register_docsis_dccrsp (void)
     {&hf_docsis_dccrsp_hmac_digest ,
       {
       "HMAC-DigestNumber ",
-      "docsis.dccrsp.hmac_digest",
+      "docsis_dccrsp.hmac_digest",
       FT_BYTES, BASE_DEC, NULL, 0x0,
       "HMAC-DigestNumber ",
       HFILL
index ebfd5b7fca25db2d27dbfad6607315f19af33071..d5215923dee19eb79c3a05f07df89dd7a86e9b6e 100644 (file)
@@ -576,7 +576,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_config_ch_cnt,
       {
       "Configuration Change Count", 
-      "docsis.dcd.config_ch_cnt",
+      "docsis_dcd.config_ch_cnt",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Configuration Change Count", 
       HFILL
@@ -585,7 +585,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_num_of_frag,
       {
       "Number of Fragments", 
-      "docsis.dcd.num_of_frag",
+      "docsis_dcd.num_of_frag",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Number of Fragments", 
       HFILL
@@ -594,7 +594,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_frag_sequence_num,
       {
       "Fragment Sequence Number", 
-      "docsis.dcd.frag_sequence_num",
+      "docsis_dcd.frag_sequence_num",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Fragment Sequence Number", 
       HFILL
@@ -603,7 +603,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_id,
       {
       "Downstream Classifier Id", 
-      "docsis.dcd.cfr_id",
+      "docsis_dcd.cfr_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Downstream Classifier Id", 
       HFILL
@@ -612,7 +612,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_rule_pri,
       {
       "Downstream Classifier Rule Priority", 
-      "docsis.dcd.cfr_rule_pri",
+      "docsis_dcd.cfr_rule_pri",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Downstream Classifier Rule Priority", 
       HFILL
@@ -621,7 +621,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_ip_source_addr,
       {
       "Downstream Classifier IP Source Address", 
-      "docsis.dcd.cfr_ip_source_addr",
+      "docsis_dcd.cfr_ip_source_addr",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP Source Address", 
       HFILL
@@ -630,7 +630,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_ip_source_mask,
       {
       "Downstream Classifier IP Source Mask", 
-      "docsis.dcd.cfr_ip_source_mask",
+      "docsis_dcd.cfr_ip_source_mask",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP Source Mask", 
       HFILL
@@ -639,7 +639,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_ip_dest_addr,
       {
       "Downstream Classifier IP Destination Address", 
-      "docsis.dcd.cfr_ip_dest_addr",
+      "docsis_dcd.cfr_ip_dest_addr",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP Destination Address", 
       HFILL
@@ -648,7 +648,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_ip_dest_mask,
       {
       "Downstream Classifier IP Destination Mask", 
-      "docsis.dcd.cfr_ip_dest_mask",
+      "docsis_dcd.cfr_ip_dest_mask",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP Destination Address", 
       HFILL
@@ -657,7 +657,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_tcpudp_srcport_start,
       {
       "Downstream Classifier IP TCP/UDP Source Port Start", 
-      "docsis.dcd.cfr_ip_tcpudp_srcport_start",
+      "docsis_dcd.cfr_ip_tcpudp_srcport_start",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP TCP/UDP Source Port Start", 
       HFILL
@@ -666,7 +666,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_tcpudp_srcport_end,
       {
       "Downstream Classifier IP TCP/UDP Source Port End", 
-      "docsis.dcd.cfr_ip_tcpudp_srcport_end",
+      "docsis_dcd.cfr_ip_tcpudp_srcport_end",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP TCP/UDP Source Port End", 
       HFILL
@@ -675,7 +675,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_tcpudp_dstport_start,
       {
       "Downstream Classifier IP TCP/UDP Destination Port Start", 
-      "docsis.dcd.cfr_ip_tcpudp_dstport_start",
+      "docsis_dcd.cfr_ip_tcpudp_dstport_start",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP TCP/UDP Destination Port Start", 
       HFILL
@@ -684,7 +684,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfr_tcpudp_dstport_end,
       {
       "Downstream Classifier IP TCP/UDP Destination Port End", 
-      "docsis.dcd.cfr_ip_tcpudp_dstport_end",
+      "docsis_dcd.cfr_ip_tcpudp_dstport_end",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Downstream Classifier IP TCP/UDP Destination Port End", 
       HFILL
@@ -693,7 +693,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_rule_id,
       {
       "DSG Rule Id ", 
-      "docsis.dcd.rule_id",
+      "docsis_dcd.rule_id",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "DSG Rule Id ", 
       HFILL
@@ -702,7 +702,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_rule_pri,
       {
       "DSG Rule Priority ", 
-      "docsis.dcd.rule_pri",
+      "docsis_dcd.rule_pri",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "DSG Rule Priority ", 
       HFILL
@@ -711,7 +711,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_rule_ucid_list,
       {
       "DSG Rule UCID Range ", 
-      "docsis.dcd.rule_ucid_list",
+      "docsis_dcd.rule_ucid_list",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "DSG Rule UCID Range ", 
       HFILL
@@ -720,7 +720,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_clid_known_mac_addr,
       {
       "DSG Rule Client ID Known MAC Address ", 
-      "docsis.dcd.clid_known_mac_addr",
+      "docsis_dcd.clid_known_mac_addr",
       FT_ETHER, BASE_DEC, NULL, 0x0,
       "DSG Rule Client ID Known MAC Address ", 
       HFILL
@@ -729,7 +729,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_clid_ca_sys_id,
       {
       "DSG Rule Client ID CA System ID ", 
-      "docsis.dcd.clid_ca_sys_id",
+      "docsis_dcd.clid_ca_sys_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG Rule Client ID CA System ID ", 
       HFILL
@@ -738,7 +738,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_clid_app_id,
       {
       "DSG Rule Client ID Application ID ", 
-      "docsis.dcd.clid_app_id",
+      "docsis_dcd.clid_app_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG Rule Client ID Application ID ", 
       HFILL
@@ -747,7 +747,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_rule_tunl_addr,
       {
       "DSG Rule Tunnel MAC Address ", 
-      "docsis.dcd.rule_tunl_addr",
+      "docsis_dcd.rule_tunl_addr",
       FT_ETHER, BASE_DEC, NULL, 0x0,
       "DSG Rule Tunnel MAC Address ", 
       HFILL
@@ -756,7 +756,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_rule_cfr_id,
       {
       "DSG Rule Classifier ID", 
-      "docsis.dcd.rule_cfr_id",
+      "docsis_dcd.rule_cfr_id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG Rule Classifier ID", 
       HFILL
@@ -765,7 +765,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_rule_vendor_spec,
       {
       "DSG Rule Vendor Specific Parameters", 
-      "docsis.dcd.rule_vendor_spec",
+      "docsis_dcd.rule_vendor_spec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "DSG Rule Vendor Specific Parameters", 
       HFILL
@@ -774,7 +774,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfg_chan,
       {
       "DSG Configuration Channel", 
-      "docsis.dcd.cfg_chan",
+      "docsis_dcd.cfg_chan",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "DSG Configuration Channel", 
       HFILL
@@ -783,7 +783,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfg_tdsg1,
       {
       "DSG Initialization Timeout (Tdsg1) ", 
-      "docsis.dcd.cfg_tdsg1",
+      "docsis_dcd.cfg_tdsg1",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG Initialization Timeout (Tdsg1) ", 
       HFILL
@@ -792,7 +792,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfg_tdsg2,
       {
       "DSG Operational Timeout (Tdsg2) ", 
-      "docsis.dcd.cfg_tdsg2",
+      "docsis_dcd.cfg_tdsg2",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG Operational Timeout (Tdsg2) ", 
       HFILL
@@ -801,7 +801,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfg_tdsg3,
       {
       "DSG Two-Way Retry Timer (Tdsg3) ", 
-      "docsis.dcd.cfg_tdsg3",
+      "docsis_dcd.cfg_tdsg3",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG Two-Way Retry Timer (Tdsg3) ", 
       HFILL
@@ -810,7 +810,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfg_tdsg4,
       {
       "DSG One-Way Retry Timer (Tdsg4) ", 
-      "docsis.dcd.cfg_tdsg4",
+      "docsis_dcd.cfg_tdsg4",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "DSG One-Way Retry Timer (Tdsg4) ", 
       HFILL
@@ -819,7 +819,7 @@ proto_register_docsis_dcd (void)
     {&hf_docsis_dcd_cfg_vendor_spec,
       {
       "DSG Configuration Vendor Specific Parameters", 
-      "docsis.dcd.cfg_vendor_spec",
+      "docsis_dcd.cfg_vendor_spec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "DSG Configuration Vendor Specific Parameters", 
       HFILL
index a79fd302df4c470fa2ecd7071a77d3687bec09f1..1284d014dcbdf8199a3ad17da5c043e4e1605112 100644 (file)
@@ -106,17 +106,17 @@ proto_register_docsis_dsaack (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dsaack,
-     {"Dynamic Service Add Ack", "docsis.dsaack",
+     {"Dynamic Service Add Ack", "docsis_dsaack",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Add Request", HFILL}
      },
     {&hf_docsis_dsaack_tranid,
-     {"Transaction Id", "docsis.dsaack.tranid",
+     {"Transaction Id", "docsis_dsaack.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_dsaack_response,
-     {"Confirmation Code", "docsis.dsaack.confcode",
+     {"Confirmation Code", "docsis_dsaack.confcode",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Confirmation Code", HFILL}
      },
index 84e7dce3762e4fcb863f595832de692acab915b7..e3e4501374ea16778a1a63788706f0562db40b53 100644 (file)
@@ -99,12 +99,12 @@ proto_register_docsis_dsareq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dsareq,
-     {"Dynamic Service Addition Request", "docsis.dsareq",
+     {"Dynamic Service Addition Request", "docsis_dsareq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Addition Request", HFILL}
      },
     {&hf_docsis_dsareq_tranid,
-     {"Transaction Id", "docsis.dsareq.tranid",
+     {"Transaction Id", "docsis_dsareq.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction Id", HFILL}
      },
index 65bdd69eabf9f707b95e26d341c3dd3b7ef8f8d7..9f1be4bcf90980abfad0451c8bb9d2667d81e1e2 100644 (file)
@@ -109,17 +109,17 @@ proto_register_docsis_dsarsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dsarsp,
-     {"Dynamic Service Add Request", "docsis.dsarsp",
+     {"Dynamic Service Add Request", "docsis_dsarsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Add Request", HFILL}
      },
     {&hf_docsis_dsarsp_tranid,
-     {"Transaction Id", "docsis.dsarsp.tranid",
+     {"Transaction Id", "docsis_dsarsp.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_dsarsp_response,
-     {"Confirmation Code", "docsis.dsarsp.confcode",
+     {"Confirmation Code", "docsis_dsarsp.confcode",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Confirmation Code", HFILL}
      },
index 882c6b12adf63e93fa939bc50f1d5813c0e9cbad..529f8e2c1a97a7e7c1820a93ea4cd1f1cbf143ca 100644 (file)
@@ -108,17 +108,17 @@ proto_register_docsis_dscack (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dscack,
-     {"Dynamic Service Change Ack", "docsis.dscack",
+     {"Dynamic Service Change Ack", "docsis_dscack",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Add Request", HFILL}
      },
     {&hf_docsis_dscack_tranid,
-     {"Transaction Id", "docsis.dscack.tranid",
+     {"Transaction Id", "docsis_dscack.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_dscack_response,
-     {"Confirmation Code", "docsis.dscack.confcode",
+     {"Confirmation Code", "docsis_dscack.confcode",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Confirmation Code", HFILL}
      },
index 68fcdebec75e554687cbe6472f2dee3d7fb78f9f..fa6cbf04421905065c7e6230144119a7b5f829e7 100644 (file)
@@ -100,12 +100,12 @@ proto_register_docsis_dscreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dscreq,
-     {"Dynamic Service Change Request", "docsis.dscreq",
+     {"Dynamic Service Change Request", "docsis_dscreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Addition Request", HFILL}
      },
     {&hf_docsis_dscreq_tranid,
-     {"Transaction Id", "docsis.dscreq.tranid",
+     {"Transaction Id", "docsis_dscreq.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction Id", HFILL}
      },
index b24627ff127b92f9309dd019227cfa4b0e74d419..c70c92020345de2b7e248d38f5e5ee85fac865c7 100644 (file)
@@ -107,17 +107,17 @@ proto_register_docsis_dscrsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dscrsp,
-     {"Dynamic Service Change Request", "docsis.dscrsp",
+     {"Dynamic Service Change Request", "docsis_dscrsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Add Request", HFILL}
      },
     {&hf_docsis_dscrsp_tranid,
-     {"Transaction Id", "docsis.dscrsp.tranid",
+     {"Transaction Id", "docsis_dscrsp.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_dscrsp_response,
-     {"Confirmation Code", "docsis.dscrsp.confcode",
+     {"Confirmation Code", "docsis_dscrsp.confcode",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Confirmation Code", HFILL}
      },
index b24aa4e669ff1f83cfca836b30f38b4accfae394..26b76cd801eae985351c89bb632a7de22405d489 100644 (file)
@@ -104,22 +104,22 @@ proto_register_docsis_dsdreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dsdreq,
-     {"Dynamic Service Delete Request", "docsis.dsdreq",
+     {"Dynamic Service Delete Request", "docsis_dsdreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Delete Request", HFILL}
      },
     {&hf_docsis_dsdreq_tranid,
-     {"Transaction Id", "docsis.dsdreq.tranid",
+     {"Transaction Id", "docsis_dsdreq.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction Id", HFILL}
      },
     {&hf_docsis_dsdreq_rsvd,
-     {"Reserved", "docsis.dsdreq.rsvd",
+     {"Reserved", "docsis_dsdreq.rsvd",
       FT_UINT16, BASE_HEX, NULL, 0x0,
       "Reserved", HFILL}
      },
     {&hf_docsis_dsdreq_sfid,
-     {"Service Flow ID", "docsis.dsdreq.sfid",
+     {"Service Flow ID", "docsis_dsdreq.sfid",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Service Flow Id", HFILL}
      },
index ce0875158cf0db34b40d81c53e5fab188f67b15b..0e6865c83386e642f7a6a9c43481d4d7285edded 100644 (file)
@@ -103,22 +103,22 @@ proto_register_docsis_dsdrsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_dsdrsp,
-     {"Dynamic Service Delete Response", "docsis.dsdrsp",
+     {"Dynamic Service Delete Response", "docsis_dsdrsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Dynamic Service Delete Response", HFILL}
      },
     {&hf_docsis_dsdrsp_tranid,
-     {"Transaction Id", "docsis.dsdrsp.tranid",
+     {"Transaction Id", "docsis_dsdrsp.tranid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Transaction Id", HFILL}
      },
     {&hf_docsis_dsdrsp_confcode,
-     {"Confirmation Code", "docsis.dsdrsp.confcode",
+     {"Confirmation Code", "docsis_dsdrsp.confcode",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Confirmation Code", HFILL}
      },
     {&hf_docsis_dsdrsp_rsvd,
-     {"Reserved", "docsis.dsdrsp.rsvd",
+     {"Reserved", "docsis_dsdrsp.rsvd",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Reserved", HFILL}
      },
index cdd3d6e5281429bab33cf8184c35bd801d0010be..024eb0245594065f5932a12e6e4f40d16208e341 100644 (file)
@@ -100,22 +100,22 @@ proto_register_docsis_intrngreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_intrngreq,
-     {"RNG-REQ Message", "docsis.intrngreq",
+     {"RNG-REQ Message", "docsis_intrngreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Ranging Request Message", HFILL}
      },
     {&hf_docsis_intrngreq_sid,
-     {"Service Identifier", "docsis.intrngreq.sid",
+     {"Service Identifier", "docsis_intrngreq.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_intrngreq_down_chid,
-     {"Downstream Channel ID", "docsis.intrngreq.downchid",
+     {"Downstream Channel ID", "docsis_intrngreq.downchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Downstream Channel ID", HFILL}
      },
     {&hf_docsis_intrngreq_up_chid,
-     {"Upstream Channel ID", "docsis.intrngreq.upchid",
+     {"Upstream Channel ID", "docsis_intrngreq.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID", HFILL}
      },
index 67704181ce6cc385cee99f0bd8d8fedcc9c0056e..2208e5b68cabd8a705ff0fb93f9c7ab1a37e35f6 100644 (file)
@@ -203,52 +203,52 @@ proto_register_docsis_mgmt (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_mgt_hdr,
-     {"Mac Management Header", "docsis.mgmt",
+     {"Mac Management Header", "docsis_mgmt",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Mac Management Header", HFILL}
      },
     {&hf_docsis_mgt_dst_addr,
-     {"Destination Address", "docsis.mgmt.dst",
+     {"Destination Address", "docsis_mgmt.dst",
       FT_ETHER, BASE_HEX, NULL, 0x0,
       "Destination Address", HFILL}
      },
     {&hf_docsis_mgt_src_addr,
-     {"Source Address", "docsis.mgmt.src",
+     {"Source Address", "docsis_mgmt.src",
       FT_ETHER, BASE_HEX, NULL, 0x0,
       "Source Address", HFILL}
      },
     {&hf_docsis_mgt_msg_len,
-     {"Message Length - DSAP to End (Bytes)", "docsis.mgmt.msglen",
+     {"Message Length - DSAP to End (Bytes)", "docsis_mgmt.msglen",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Message Length", HFILL}
      },
     {&hf_docsis_mgt_dsap,
-     {"DSAP [0x00]", "docsis.mgmt.dsap",
+     {"DSAP [0x00]", "docsis_mgmt.dsap",
       FT_UINT8, BASE_HEX, NULL, 0x0,
       "Destination SAP", HFILL}
      },
     {&hf_docsis_mgt_ssap,
-     {"SSAP [0x00]", "docsis.mgmt.ssap",
+     {"SSAP [0x00]", "docsis_mgmt.ssap",
       FT_UINT8, BASE_HEX, NULL, 0x0,
       "Source SAP", HFILL}
      },
     {&hf_docsis_mgt_control,
-     {"Control [0x03]", "docsis.mgmt.control",
+     {"Control [0x03]", "docsis_mgmt.control",
       FT_UINT8, BASE_HEX, NULL, 0x0,
       "Control", HFILL}
      },
     {&hf_docsis_mgt_version,
-     {"Version", "docsis.mgmt.version",
+     {"Version", "docsis_mgmt.version",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Version", HFILL}
      },
     {&hf_docsis_mgt_type,
-     {"Type", "docsis.mgmt.type",
+     {"Type", "docsis_mgmt.type",
       FT_UINT8, BASE_DEC, VALS (mgmt_type_vals), 0x0,
       "Type", HFILL}
      },
     {&hf_docsis_mgt_rsvd,
-     {"Reserved [0x00]", "docsis.mgmt.rsvd",
+     {"Reserved [0x00]", "docsis_mgmt.rsvd",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Reserved", HFILL}
      },
index 49c1a50e748faf50a4ae70fd56fb4c69fff88bf5..c80e0a71e7017d9f6b6a1f65279283ea02ef607b 100644 (file)
@@ -187,77 +187,77 @@ proto_register_docsis_map (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_map,
-     {"Map Message", "docsis.map",
+     {"Map Message", "docsis_map",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "MAP Message", HFILL}
      },
     {&hf_docsis_map_ucd_count,
-     {"UCD Count", "docsis.map.ucdcount",
+     {"UCD Count", "docsis_map.ucdcount",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Map UCD Count", HFILL}
      },
     {&hf_docsis_map_upstream_chid,
-     {"Upstream Channel ID", "docsis.map.upchid",
+     {"Upstream Channel ID", "docsis_map.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID", HFILL}
      },
     {&hf_docsis_map_numie,
-     {"Number of IE's", "docsis.map.numie",
+     {"Number of IE's", "docsis_map.numie",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Number of Information Elements", HFILL}
      },
     {&hf_docsis_map_alloc_start,
-     {"Alloc Start Time (minislots)", "docsis.map.allocstart",
+     {"Alloc Start Time (minislots)", "docsis_map.allocstart",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Alloc Start Time (minislots)", HFILL}
      },
     {&hf_docsis_map_ack_time,
-     {"ACK Time (minislots)", "docsis.map.acktime",
+     {"ACK Time (minislots)", "docsis_map.acktime",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Ack Time (minislots)", HFILL}
      },
     {&hf_docsis_map_rng_start,
-     {"Ranging Backoff Start", "docsis.map.rng_start",
+     {"Ranging Backoff Start", "docsis_map.rng_start",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Ranging Backoff Start", HFILL}
      },
     {&hf_docsis_map_rng_end,
-     {"Ranging Backoff End", "docsis.map.rng_end",
+     {"Ranging Backoff End", "docsis_map.rng_end",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Ranging Backoff End", HFILL}
      },
     {&hf_docsis_map_data_start,
-     {"Data Backoff Start", "docsis.map.data_start",
+     {"Data Backoff Start", "docsis_map.data_start",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Data Backoff Start", HFILL}
      },
     {&hf_docsis_map_data_end,
-     {"Data Backoff End", "docsis.map.data_end",
+     {"Data Backoff End", "docsis_map.data_end",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Data Backoff End", HFILL}
      },
     {&hf_docsis_map_ie,
-     {"Information Element", "docsis.map.ie",
+     {"Information Element", "docsis_map.ie",
       FT_UINT32, BASE_HEX, NULL, 0x0,
       "Information Element", HFILL}
      },
     {&hf_docsis_map_rsvd,
-     {"Reserved [0x00]", "docsis.map.rsvd",
+     {"Reserved [0x00]", "docsis_map.rsvd",
       FT_UINT8, BASE_HEX, NULL, 0x0,
       "Reserved Byte", HFILL}
      },
     {&hf_docsis_map_sid,
-     {"Service Identifier", "docsis.map.sid",
+     {"Service Identifier", "docsis_map.sid",
       FT_UINT32, BASE_DEC, NULL, 0xFFFC0000,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_map_iuc,
-     {"Interval Usage Code", "docsis.map.iuc",
+     {"Interval Usage Code", "docsis_map.iuc",
       FT_UINT32, BASE_DEC, VALS(iuc_vals), 0x0003c000,
       "Interval Usage Code", HFILL}
      },
     {&hf_docsis_map_offset,
-     {"Offset", "docsis.map.offset",
+     {"Offset", "docsis_map.offset",
       FT_UINT32, BASE_DEC, NULL, 0x00003fff,
       "Offset", HFILL}
      },
index 7a2a3b86b714414fcc6dfe452594b89786f05ad0..33116581b5d0a918e3af9af25bf9041637305689 100644 (file)
@@ -106,17 +106,17 @@ proto_register_docsis_regack (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_regack,
-     {"Registration Request", "docsis.regack",
+     {"Registration Request", "docsis_regack",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Registration Request", HFILL}
      },
     {&hf_docsis_regack_sid,
-     {"Service Identifier", "docsis.regack.sid",
+     {"Service Identifier", "docsis_regack.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_regack_response,
-     {"Response Code", "docsis.regack.respnse",
+     {"Response Code", "docsis_regack.respnse",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Response Code", HFILL}
      },
index 57a06dd0b6ea9c207217b978afcd8f4054c3d746..4aed3f3ca8845af3c5fcc2311ca49b462a641e74 100644 (file)
@@ -101,12 +101,12 @@ proto_register_docsis_regreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_regreq,
-     {"Registration Request", "docsis.regreq",
+     {"Registration Request", "docsis_regreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Registration Request", HFILL}
      },
     {&hf_docsis_regreq_sid,
-     {"Service Identifier", "docsis.regreq.sid",
+     {"Service Identifier", "docsis_regreq.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
index 94471cee9ff6584e5fff578a77f959e3cafef5b5..3d592c34730fc586ea41ef96a6d32a914e153301 100644 (file)
@@ -104,17 +104,17 @@ proto_register_docsis_regrsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_regrsp,
-     {"Registration Response", "docsis.regrsp",
+     {"Registration Response", "docsis_regrsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Registration Request", HFILL}
      },
     {&hf_docsis_regrsp_sid,
-     {"Service Identifier", "docsis.regrsp.sid",
+     {"Service Identifier", "docsis_regrsp.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_regrsp_response,
-     {"Response Code", "docsis.regrsp.respnse",
+     {"Response Code", "docsis_regrsp.respnse",
       FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
       "Response Code", HFILL}
      },
index cb056ffcdf04d6b900181732e56cfe7b4d6fda8d..3053a07109d5686b55bbc754d21e441228885416 100644 (file)
@@ -104,22 +104,22 @@ proto_register_docsis_rngreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_rngreq,
-     {"RNG-REQ Message", "docsis.rngreq",
+     {"RNG-REQ Message", "docsis_rngreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Ranging Request Message", HFILL}
      },
     {&hf_docsis_rngreq_sid,
-     {"Service Identifier", "docsis.rngreq.sid",
+     {"Service Identifier", "docsis_rngreq.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_rngreq_down_chid,
-     {"Downstream Channel ID", "docsis.rngreq.downchid",
+     {"Downstream Channel ID", "docsis_rngreq.downchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Downstream Channel ID", HFILL}
      },
     {&hf_docsis_rngreq_pend_compl,
-     {"Pending Till Complete", "docsis.rngreq.pendcomp",
+     {"Pending Till Complete", "docsis_rngreq.pendcomp",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID", HFILL}
      },
index d2687f97077e9cf742d458cd26df674c114ac834..eee62a5285c6f9c55a3b0a64c62b5254faa31118 100644 (file)
@@ -211,52 +211,52 @@ proto_register_docsis_rngrsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_rngrsp,
-     {"RNG-RSP Message", "docsis.rngrsp",
+     {"RNG-RSP Message", "docsis_rngrsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Ranging Response Message", HFILL}
      },
     {&hf_docsis_rngrsp_sid,
-     {"Service Identifier", "docsis.rngrsp.sid",
+     {"Service Identifier", "docsis_rngrsp.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_rngrsp_upstream_chid,
-     {"Upstream Channel ID", "docsis.rngrsp.upchid",
+     {"Upstream Channel ID", "docsis_rngrsp.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID", HFILL}
      },
     {&hf_docsis_rngrsp_timing_adj,
-     {"Timing Adjust (6.25us/64)", "docsis.rngrsp.timingadj",
+     {"Timing Adjust (6.25us/64)", "docsis_rngrsp.timingadj",
       FT_INT32, BASE_DEC, NULL, 0x0,
       "Timing Adjust", HFILL}
      },
     {&hf_docsis_rngrsp_power_adj,
-     {"Power Level Adjust (0.25dB units)", "docsis.rngrsp.poweradj",
+     {"Power Level Adjust (0.25dB units)", "docsis_rngrsp.poweradj",
       FT_INT8, BASE_DEC, NULL, 0x0,
       "Power Level Adjust", HFILL}
      },
     {&hf_docsis_rngrsp_freq_adj,
-     {"Offset Freq Adjust (Hz)", "docsis.rngrsp.freqadj",
+     {"Offset Freq Adjust (Hz)", "docsis_rngrsp.freqadj",
       FT_INT16, BASE_DEC, NULL, 0x0,
       "Frequency Adjust", HFILL}
      },
     {&hf_docsis_rngrsp_xmit_eq_adj,
-     {"Transmit Equalisation Adjust", "docsis.rngrsp.xmit_eq_adj",
+     {"Transmit Equalisation Adjust", "docsis_rngrsp.xmit_eq_adj",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Timing Equalisation Adjust", HFILL}
      },
     {&hf_docsis_rngrsp_ranging_status,
-     {"Ranging Status", "docsis.rngrsp.rng_stat",
+     {"Ranging Status", "docsis_rngrsp.rng_stat",
       FT_UINT8, BASE_DEC, VALS (rng_stat_vals), 0x0,
       "Ranging Status", HFILL}
      },
     {&hf_docsis_rngrsp_down_freq_over,
-     {"Downstream Frequency Override (Hz)", "docsis.rngrsp.freq_over",
+     {"Downstream Frequency Override (Hz)", "docsis_rngrsp.freq_over",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Downstream Frequency Override", HFILL}
      },
     {&hf_docsis_rngrsp_upstream_ch_over,
-     {"Upstream Channel ID Override", "docsis.rngrsp.chid_override",
+     {"Upstream Channel ID Override", "docsis_rngrsp.chid_override",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID Override", HFILL}
      },
index ef1a35624712102287a8142400ecf0d10b180fbc..8d97310d5ce99ae204fae334feef3c0f3f273950 100644 (file)
@@ -2101,708 +2101,708 @@ proto_register_docsis_tlv (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_tlv,
-     {"TLV Data", "docsis.tlv",
+     {"TLV Data", "docsis_tlv",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "TLV Data", HFILL}
      },
     {&hf_docsis_tlv_down_freq,
-     {"1 Downstream Frequency", "docsis.tlv.downfreq",
+     {"1 Downstream Frequency", "docsis_tlv.downfreq",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Downstream Frequency", HFILL}
      },
     {&hf_docsis_tlv_upstream_chid,
-     {"2 Upstream Channel ID", "docsis.tlv.upchid",
+     {"2 Upstream Channel ID", "docsis_tlv.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_tlv_net_access,
-     {"3 Network Access", "docsis.tlv.netaccess",
+     {"3 Network Access", "docsis_tlv.netaccess",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "Network Access TLV", HFILL}
      },
     {&hf_docsis_tlv_cos,
-     {"4 COS Encodings", "docsis.tlv.cos",
+     {"4 COS Encodings", "docsis_tlv.cos",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "4 COS Encodings", HFILL}
      },
     {&hf_docsis_tlv_cos_id,
-     {".1 Class ID", "docsis.tlv.cos.id",
+     {".1 Class ID", "docsis_tlv.cos.id",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Class ID", HFILL}
      },
     {&hf_docsis_tlv_cos_sid,
-     {".2 Service ID", "docsis.cos.sid",
+     {".2 Service ID", "docsis_tlv.cos.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service ID", HFILL}
      },
     {&hf_docsis_tlv_cos_max_down,
-     {".2 Max Downstream Rate (bps)", "docsis.tlv.cos.maxdown",
+     {".2 Max Downstream Rate (bps)", "docsis_tlv.cos.maxdown",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Max Downstream Rate", HFILL}
      },
     {&hf_docsis_tlv_cos_max_up,
-     {".3 Max Upstream Rate (bps)", "docsis.tlv.cos.maxup",
+     {".3 Max Upstream Rate (bps)", "docsis_tlv.cos.maxup",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Max Upstream Rate", HFILL}
      },
     {&hf_docsis_tlv_cos_up_chnl_pri,
-     {".4 Upstream Channel Priority", "docsis.tlv.cos.upchnlpri",
+     {".4 Upstream Channel Priority", "docsis_tlv.cos.upchnlpri",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel Priority", HFILL}
      },
     {&hf_docsis_tlv_cos_min_grntd_up,
-     {".5 Guaranteed Upstream Rate", "docsis.tlv.cos.mingrntdup",
+     {".5 Guaranteed Upstream Rate", "docsis_tlv.cos.mingrntdup",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Guaranteed Minimum Upstream Data Rate", HFILL}
      },
     {&hf_docsis_tlv_cos_max_up_burst,
-     {".6 Maximum Upstream Burst", "docsis.tlv.cos.maxupburst",
+     {".6 Maximum Upstream Burst", "docsis_tlv.cos.maxupburst",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Maximum Upstream Burst", HFILL}
      },
     {&hf_docsis_tlv_cos_privacy_enable,
-     {".7 COS Privacy Enable", "docsis.tlv.cos.privacy_enable",
+     {".7 COS Privacy Enable", "docsis_tlv.cos.privacy_enable",
       FT_BOOLEAN, BASE_DEC, TFS (&ena_dis_tfs), 0x0,
       "Class of Service Privacy Enable", HFILL}
      },
     {&hf_docsis_tlv_mcap,
-     {"5 Modem Capabilities", "docsis.tlv.mcap",
+     {"5 Modem Capabilities", "docsis_tlv.mcap",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Modem Capabilities", HFILL}
      },
     {&hf_docsis_tlv_mcap_concat,
-     {".1 Concatenation Support", "docsis.tlv.mcap.concat",
+     {".1 Concatenation Support", "docsis_tlv.mcap.concat",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "Concatenation Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_docs_ver,
-     {".2 Docsis Version", "docsis.tlv.map.docsver",
+     {".2 Docsis Version", "docsis_tlv.map.docsver",
       FT_UINT8, BASE_DEC, VALS (docs_ver_vals), 0x0,
       "DOCSIS Version", HFILL}
      },
     {&hf_docsis_tlv_mcap_frag,
-     {".3 Fragmentation Support", "docsis.tlv.mcap.frag",
+     {".3 Fragmentation Support", "docsis_tlv.mcap.frag",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "Fragmentation Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_phs,
-     {".4 PHS Support", "docsis.tlv.mcap.phs",
+     {".4 PHS Support", "docsis_tlv.mcap.phs",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "PHS Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_igmp,
-     {".5 IGMP Support", "docsis.tlv.mcap.igmp",
+     {".5 IGMP Support", "docsis_tlv.mcap.igmp",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "IGMP Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_privacy,
-     {".6 Privacy Support", "docsis.tlv.mcap.privacy",
+     {".6 Privacy Support", "docsis_tlv.mcap.privacy",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "Privacy Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_down_said,
-     {".7 # Downstream SAIDs Supported", "docsis.tlv.mcap.downsaid",
+     {".7 # Downstream SAIDs Supported", "docsis_tlv.mcap.downsaid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Downstream Said Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_up_sid,
-     {".8 # Upstream SAIDs Supported", "docsis.tlv.mcap.upsid",
+     {".8 # Upstream SAIDs Supported", "docsis_tlv.mcap.upsid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream SID Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_8021P_filter,
-     {".9 802.1P Filtering Support", "docsis.tlv.mcap.dot1pfiltering",
+     {".9 802.1P Filtering Support", "docsis_tlv.mcap.dot1pfiltering",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x80,
       "802.1P Filtering Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_8021Q_filter,
-     {".9 802.1Q Filtering Support", "docsis.tlv.mcap.dot1qfilt",
+     {".9 802.1Q Filtering Support", "docsis_tlv.mcap.dot1qfilt",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x40,
       "802.1Q Filtering Support", HFILL}
      },
     {&hf_docsis_tlv_mcap_xmit_eq_taps_per_sym,
-     {".10 Xmit Equalizer Taps/Sym", "docsis.tlv.mcap.tapspersym",
+     {".10 Xmit Equalizer Taps/Sym", "docsis_tlv.mcap.tapspersym",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Transmit Equalizer Taps per Symbol", HFILL}
      },
     {&hf_docsis_tlv_mcap_xmit_eq_taps,
-     {".11 # Xmit Equalizer Taps", "docsis.tlv.mcap.numtaps",
+     {".11 # Xmit Equalizer Taps", "docsis_tlv.mcap.numtaps",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Number of Transmit Equalizer Taps", HFILL}
      },
     {&hf_docsis_tlv_mcap_dcc,
-     {".12 DCC Support", "docsis.tlv.mcap.dcc",
+     {".12 DCC Support", "docsis_tlv.mcap.dcc",
       FT_BOOLEAN, BASE_DEC, TFS (&on_off_tfs), 0x0,
       "DCC Support", HFILL}
      },
     {&hf_docsis_tlv_cm_mic,
-     {"6 CM MIC", "docsis.tlv.cmmic",
+     {"6 CM MIC", "docsis_tlv.cmmic",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Cable Modem Message Integrity Check", HFILL}
      },
     {&hf_docsis_tlv_cmts_mic,
-     {"7 CMTS MIC", "docsis.tlv.cmtsmic",
+     {"7 CMTS MIC", "docsis_tlv.cmtsmic",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "CMTS Message Integrity Check", HFILL}
      },
     {&hf_docsis_tlv_vendor_id,
-     {"8 Vendor ID", "docsis.tlv.vendorid",
+     {"8 Vendor ID", "docsis_tlv.vendorid",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Identifier", HFILL}
      },
     {&hf_docsis_tlv_sw_file,
-     {"9 Software Upgrade File", "docsis.tlv.sw_upg_file",
+     {"9 Software Upgrade File", "docsis_tlv.sw_upg_file",
       FT_STRINGZ, BASE_DEC, NULL, 0x0,
       "Software Upgrade File", HFILL}
      },
     {&hf_docsis_tlv_snmp_access,
-     {"10 SNMP Write Access", "docsis.tlv.snmp_access",
+     {"10 SNMP Write Access", "docsis_tlv.snmp_access",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SNMP Write Access", HFILL}
      },
     {&hf_docsis_tlv_snmp_obj,
-     {"11 SNMP Object", "docsis.tlv.snmp_obj",
+     {"11 SNMP Object", "docsis_tlv.snmp_obj",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SNMP Object", HFILL}
      },
     {&hf_docsis_tlv_modem_addr,
-     {"12 Modem IP Address", "docsis.tlv.modemaddr",
+     {"12 Modem IP Address", "docsis_tlv.modemaddr",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Modem IP Address", HFILL}
      },
     {&hf_docsis_tlv_svc_unavail,
-     {"13 Service Not Available Response", "docsis.tlv.svcunavail",
+     {"13 Service Not Available Response", "docsis_tlv.svcunavail",
       FT_BYTES, BASE_DEC, NULL, 0x0,
       "Service Not Available Response", HFILL}
      },
     {&hf_docsis_tlv_svc_unavail_classid,
-     {"Service Not Available: (Class ID)", "docsis.tlv.svcunavail.classid",
+     {"Service Not Available: (Class ID)", "docsis_tlv.svcunavail.classid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Service Not Available (Class ID)", HFILL}
      },
     {&hf_docsis_tlv_svc_unavail_type,
-     {"Service Not Available (Type)", "docsis.tlv.svcunavail.type",
+     {"Service Not Available (Type)", "docsis_tlv.svcunavail.type",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Service Not Available (Type)", HFILL}
      },
     {&hf_docsis_tlv_svc_unavail_code,
-     {"Service Not Available (Code)", "docsis.tlv.svcunavail.code",
+     {"Service Not Available (Code)", "docsis_tlv.svcunavail.code",
       FT_UINT8, BASE_DEC, VALS(docsis_conf_code), 0x0,
       "Service Not Available (Code)", HFILL}
      },
     {&hf_docsis_tlv_cpe_ethernet,
-     {"14 CPE Ethernet Addr", "docsis.tlv.cpe_ether",
+     {"14 CPE Ethernet Addr", "docsis_tlv.cpe_ether",
       FT_ETHER, BASE_DEC, NULL, 0x0,
       "CPE Ethernet Addr", HFILL}
      },
     {&hf_docsis_tlv_bpi,
-     {"17 Baseline Privacy Encoding", "docsis.tlv.bpi",
+     {"17 Baseline Privacy Encoding", "docsis_tlv.bpi",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Baseline Privacy Encoding", HFILL}
      },
     {&hf_docsis_tlv_max_cpe,
-     {"18 Max # of CPE's", "docsis.tlv.maxcpe",
+     {"18 Max # of CPE's", "docsis_tlv.maxcpe",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Max Number of CPE's", HFILL}
      },
     {&hf_docsis_tlv_tftp_server_timestamp,
-     {"19 TFTP Server Timestamp", "docsis.tlv.tftp_time",
+     {"19 TFTP Server Timestamp", "docsis_tlv.tftp_time",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "TFTP Server TimeStamp", HFILL}
      },
     {&hf_docsis_tlv_tftp_prov_modem_address,
-     {"20 TFTP Server Provisioned Modem Addr", "docsis.tlv.tftpmodemaddr",
+     {"20 TFTP Server Provisioned Modem Addr", "docsis_tlv.tftpmodemaddr",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "TFTP Server Provisioned Modem Addr", HFILL}
      },
     {&hf_docsis_tlv_sw_upg_srvr,
-     {"21 Software Upgrade Server", "docsis.tlv.sw_upg_srvr",
+     {"21 Software Upgrade Server", "docsis_tlv.sw_upg_srvr",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Software Upgrade Server", HFILL}
      },
     {&hf_docsis_tlv_upclsfr,
-     {"22 Upstream Classifier", "docsis.tlv.upclsfr",
+     {"22 Upstream Classifier", "docsis_tlv.upclsfr",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "22 Upstream Classifier", HFILL}
      },
     {&hf_docsis_tlv_downclsfr,
-     {"23 Downstream Classifier", "docsis.tlv.downclsfr",
+     {"23 Downstream Classifier", "docsis_tlv.downclsfr",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "23 Downstream Classifier", HFILL}
      },
     {&hf_docsis_tlv_clsfr_ref,
-     {".1 Classifier Ref", "docsis.tlv.clsfr.ref",
+     {".1 Classifier Ref", "docsis_tlv.clsfr.ref",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Classifier Reference", HFILL}
      },
     {&hf_docsis_tlv_clsfr_id,
-     {".2 Classifier ID", "docsis.tlv.clsfr.id",
+     {".2 Classifier ID", "docsis_tlv.clsfr.id",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Classifier ID", HFILL}
      },
     {&hf_docsis_tlv_clsfr_sflow_ref,
-     {".3 Service Flow Ref", "docsis.tlv.clsfr.sflowref",
+     {".3 Service Flow Ref", "docsis_tlv.clsfr.sflowref",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Flow Reference", HFILL}
      },
     {&hf_docsis_tlv_clsfr_sflow_id,
-     {".4 Service Flow ID", "docsis.tlv.clsfr.sflowid",
+     {".4 Service Flow ID", "docsis_tlv.clsfr.sflowid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Flow ID", HFILL}
      },
     {&hf_docsis_tlv_clsfr_rule_pri,
-     {".5 Rule Priority", "docsis.tlv.clsfr.rulepri",
+     {".5 Rule Priority", "docsis_tlv.clsfr.rulepri",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Rule Priority", HFILL}
      },
     {&hf_docsis_tlv_clsfr_act_state,
-     {".6 Activation State", "docsis.tlv.clsfr.actstate",
+     {".6 Activation State", "docsis_tlv.clsfr.actstate",
       FT_BOOLEAN, BASE_DEC, TFS (&activation_tfs), 0x0,
       "Classifier Activation State", HFILL}
      },
     {&hf_docsis_tlv_clsfr_dsc_act,
-     {".7 DSC Action", "docsis.tlv.clsfr.dscact",
+     {".7 DSC Action", "docsis_tlv.clsfr.dscact",
       FT_UINT8, BASE_DEC, VALS (dsc_act_vals), 0x0,
       "Dynamic Service Change Action", HFILL}
      },
     {&hf_docsis_tlv_clsfr_err,
-     {".8 Error Encodings", "docsis.tlv.clsfr.err",
+     {".8 Error Encodings", "docsis_tlv.clsfr.err",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Error Encodings", HFILL}
      },
     {&hf_docsis_tlv_clsfr_err_param,
-     {"..1 Param Subtype", "docsis.tlv.clsfr.err.param",
+     {"..1 Param Subtype", "docsis_tlv.clsfr.err.param",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Parameter Subtype", HFILL}
      },
     {&hf_docsis_tlv_clsfr_err_code,
-     {"..2 Error Code", "docsis.tlv.clsfr.err.code",
+     {"..2 Error Code", "docsis_tlv.clsfr.err.code",
       FT_UINT8, BASE_DEC, VALS(docsis_conf_code), 0x0,
       "TCP/UDP Destination Port End", HFILL}
      },
     {&hf_docsis_tlv_clsfr_err_msg,
-     {"..3 Error Message", "docsis.tlv.clsfr.err.msg",
+     {"..3 Error Message", "docsis_tlv.clsfr.err.msg",
       FT_STRINGZ, BASE_DEC, NULL, 0x0,
       "Error Message", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr,
-     {".9 IP Classifier Encodings", "docsis.tlv.clsfr.ip",
+     {".9 IP Classifier Encodings", "docsis_tlv.clsfr.ip",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "IP Classifier Encodings", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_tosmask,
-     {"..1 Type Of Service Mask", "docsis.tlv.clsfr.ip.tosmask",
+     {"..1 Type Of Service Mask", "docsis_tlv.clsfr.ip.tosmask",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Type Of Service Mask", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_ipproto,
-     {"..2 IP Protocol", "docsis.tlv.clsfr.ip.ipproto",
+     {"..2 IP Protocol", "docsis_tlv.clsfr.ip.ipproto",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "IP Protocol", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_src,
-     {"..3 Source Address", "docsis.tlv.clsfr.ip.src",
+     {"..3 Source Address", "docsis_tlv.clsfr.ip.src",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Source Address", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_dst,
-     {"..4 Destination Address", "docsis.tlv.clsfr.ip.dst",
+     {"..4 Destination Address", "docsis_tlv.clsfr.ip.dst",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Destination Address", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_srcmask,
-     {"..5 Source Mask", "docsis.tlv.clsfr.ip.smask",
+     {"..5 Source Mask", "docsis_tlv.clsfr.ip.smask",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Source Mask", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_dstmask,
-     {"..6 Destination Mask", "docsis.tlv.clsfr.ip.dmask",
+     {"..6 Destination Mask", "docsis_tlv.clsfr.ip.dmask",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Destination Mask", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_sport_start,
-     {"..7 Source Port Start", "docsis.tlv.clsfr.ip.sportstart",
+     {"..7 Source Port Start", "docsis_tlv.clsfr.ip.sportstart",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "TCP/UDP Source Port Start", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_sport_end,
-     {"..8 Source Port End", "docsis.tlv.clsfr.ip.sportend",
+     {"..8 Source Port End", "docsis_tlv.clsfr.ip.sportend",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "TCP/UDP Source Port End", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_dport_start,
-     {"..9 Dest Port Start", "docsis.tlv.clsfr.ip.dportstart",
+     {"..9 Dest Port Start", "docsis_tlv.clsfr.ip.dportstart",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "TCP/UDP Destination Port Start", HFILL}
      },
     {&hf_docsis_tlv_ipclsfr_dport_end,
-     {"..10 Dest Port End", "docsis.tlv.clsfr.ip.dportend",
+     {"..10 Dest Port End", "docsis_tlv.clsfr.ip.dportend",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "TCP/UDP Destination Port End", HFILL}
      },
     {&hf_docsis_tlv_ethclsfr,
-     {".10 Ethernet Classifier Encodings", "docsis.tlv.clsfr.eth",
+     {".10 Ethernet Classifier Encodings", "docsis_tlv.clsfr.eth",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Ethernet Classifier Encodings", HFILL}
      },
     {&hf_docsis_tlv_ethclsfr_dmac,
-     {"..1 Dest Mac Address", "docsis.tlv.clsfr.eth.dmac",
+     {"..1 Dest Mac Address", "docsis_tlv.clsfr.eth.dmac",
       FT_ETHER, BASE_DEC, NULL, 0x0,
       "Destination Mac Address", HFILL}
      },
     {&hf_docsis_tlv_ethclsfr_smac,
-     {"..2 Source Mac Address", "docsis.tlv.clsfr.eth.smac",
+     {"..2 Source Mac Address", "docsis_tlv.clsfr.eth.smac",
       FT_ETHER, BASE_DEC, NULL, 0x0,
       "Source Mac Address", HFILL}
      },
     {&hf_docsis_tlv_ethclsfr_ethertype,
-     {"..3 Ethertype", "docsis.tlv.clsfr.eth.ethertype",
+     {"..3 Ethertype", "docsis_tlv.clsfr.eth.ethertype",
       FT_UINT24, BASE_HEX, NULL, 0x0,
       "Ethertype", HFILL}
      },
     {&hf_docsis_tlv_dot1qclsfr,
-     {".11 802.1Q Classifier Encodings", "docsis.tlv.clsfr.dot1q",
+     {".11 802.1Q Classifier Encodings", "docsis_tlv.clsfr.dot1q",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "802.1Q Classifier Encodings", HFILL}
      },
     {&hf_docsis_tlv_dot1qclsfr_user_pri,
-     {"..1 User Priority", "docsis.tlv.clsfr.dot1q.userpri",
+     {"..1 User Priority", "docsis_tlv.clsfr.dot1q.userpri",
       FT_UINT16, BASE_HEX, NULL, 0x0,
       "User Priority", HFILL}
      },
     {&hf_docsis_tlv_dot1qclsfr_vlanid,
-     {"..2 VLAN id", "docsis.tlv.clsfr.dot1q.ethertype",
+     {"..2 VLAN id", "docsis_tlv.clsfr.dot1q.ethertype",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "VLAN Id", HFILL}
      },
     {&hf_docsis_tlv_dot1qclsfr_vendorspec,
-     {"..43 Vendor Specific Encodings", "docsis.tlv.clsfr.dot1q.vendorspec",
+     {"..43 Vendor Specific Encodings", "docsis_tlv.clsfr.dot1q.vendorspec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Specific Encodings", HFILL}
      },
     {&hf_docsis_tlv_clsfr_vendor_spc,
-     {".43 Vendor Specific Encodings", "docsis.tlv.clsfr.vendor",
+     {".43 Vendor Specific Encodings", "docsis_tlv.clsfr.vendor",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Specific Encodings", HFILL}
      },
     {&hf_docsis_tlv_upsflow,
-     {"24 Upstream Service Flow", "docsis.tlv.upsflow",
+     {"24 Upstream Service Flow", "docsis_tlv.upsflow",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "24 Upstream Service Flow", HFILL}
      },
     {&hf_docsis_tlv_downsflow,
-     {"25 Downstream Service Flow", "docsis.tlv.downsflow",
+     {"25 Downstream Service Flow", "docsis_tlv.downsflow",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "25 Downstream Service Flow", HFILL}
      },
     {&hf_docsis_tlv_sflow_ref,
-     {".1 Service Flow Ref", "docsis.tlv.sflow.ref",
+     {".1 Service Flow Ref", "docsis_tlv.sflow.ref",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Flow Reference", HFILL}
      },
     {&hf_docsis_tlv_sflow_id,
-     {".2 Service Flow Id", "docsis.tlv.sflow.id",
+     {".2 Service Flow Id", "docsis_tlv.sflow.id",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Service Flow Id", HFILL}
      },
     {&hf_docsis_tlv_sflow_sid,
-     {".3 Service Identifier", "docsis.tlv.sflow.sid",
+     {".3 Service Identifier", "docsis_tlv.sflow.sid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Identifier", HFILL}
      },
     {&hf_docsis_tlv_sflow_classname,
-     {".4 Service Class Name", "docsis.tlv.sflow.cname",
+     {".4 Service Class Name", "docsis_tlv.sflow.cname",
       FT_STRINGZ, BASE_HEX, NULL, 0x0,
       "Service Class Name", HFILL}
      },
     {&hf_docsis_tlv_sflow_err,
-     {".5 Error Encodings", "docsis.tlv.sflow.err",
+     {".5 Error Encodings", "docsis_tlv.sflow.err",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Error Encodings", HFILL}
      },
     {&hf_docsis_tlv_sflow_err_param,
-     {"..1 Param Subtype", "docsis.tlv.sflow.err.param",
+     {"..1 Param Subtype", "docsis_tlv.sflow.err.param",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Parameter Subtype", HFILL}
      },
     {&hf_docsis_tlv_sflow_err_code,
-     {"..2 Error Code", "docsis.tlv.sflow.err.code",
+     {"..2 Error Code", "docsis_tlv.sflow.err.code",
       FT_UINT8, BASE_DEC, VALS(docsis_conf_code), 0x0,
       "Error Code", HFILL}
      },
     {&hf_docsis_tlv_sflow_err_msg,
-     {"..3 Error Message", "docsis.tlv.sflow.err.msg",
+     {"..3 Error Message", "docsis_tlv.sflow.err.msg",
       FT_STRINGZ, BASE_DEC, NULL, 0x0,
       "Error Message", HFILL}
      },
     {&hf_docsis_tlv_sflow_qos_param,
-     {".6 QOS Parameter Set", "docsis.tlv.sflow.qos",
+     {".6 QOS Parameter Set", "docsis_tlv.sflow.qos",
       FT_UINT8, BASE_HEX, VALS (qos_param_vals), 0x0,
       "QOS Parameter Set", HFILL}
      },
     {&hf_docsis_tlv_sflow_traf_pri,
-     {".7 Traffic Priority", "docsis.tlv.sflow.trafpri",
+     {".7 Traffic Priority", "docsis_tlv.sflow.trafpri",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Traffic Priority", HFILL}
      },
     {&hf_docsis_tlv_sflow_max_sus,
      {".8 Maximum Sustained Traffic Rate (bps)",
-      "docsis.tlv.sflow.maxtrafrate",
+      "docsis_tlv.sflow.maxtrafrate",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Maximum Sustained Traffic Rate (bps)", HFILL}
      },
     {&hf_docsis_tlv_sflow_max_burst,
-     {".9 Maximum Burst (bps)", "docsis.tlv.sflow.maxburst",
+     {".9 Maximum Burst (bps)", "docsis_tlv.sflow.maxburst",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Maximum Burst (bps)", HFILL}
      },
     {&hf_docsis_tlv_sflow_min_traf,
-     {".10 Minimum Traffic Rate (bps)", "docsis.tlv.sflow.mintrafrate",
+     {".10 Minimum Traffic Rate (bps)", "docsis_tlv.sflow.mintrafrate",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Minimum Traffic Rate (bps)", HFILL}
      },
     {&hf_docsis_tlv_sflow_ass_min_pkt_size,
      {".11 Assumed Min Reserved Packet Size",
-      "docsis.tlv.sflow.assumed_min_pkt_size",
+      "docsis_tlv.sflow.assumed_min_pkt_size",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Assumed Minimum Reserved Packet Size", HFILL}
      },
     {&hf_docsis_tlv_sflow_timeout_active,
-     {".12 Timeout for Active Params (secs)", "docsis.tlv.sflow.act_timeout",
+     {".12 Timeout for Active Params (secs)", "docsis_tlv.sflow.act_timeout",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Timeout for Active Params (secs)", HFILL}
      },
     {&hf_docsis_tlv_sflow_timeout_admitted,
      {".13 Timeout for Admitted Params (secs)",
-      "docsis.tlv.sflow.adm_timeout",
+      "docsis_tlv.sflow.adm_timeout",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Timeout for Admitted Params (secs)", HFILL}
      },
     {&hf_docsis_tlv_sflow_max_down_latency,
      {".14 Maximum Downstream Latency (usec)",
-      "docsis.tlv.sflow.max_down_lat",
+      "docsis_tlv.sflow.max_down_lat",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Maximum Downstream Latency (usec)", HFILL}
      },
     {&hf_docsis_tlv_sflow_max_concat_burst,
-     {".14 Max Concat Burst", "docsis.tlv.sflow.maxconcat",
+     {".14 Max Concat Burst", "docsis_tlv.sflow.maxconcat",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Max Concatenated Burst", HFILL}
      },
     {&hf_docsis_tlv_sflow_sched_type,
-     {".15 Scheduling Type", "docsis.tlv.sflow.schedtype",
+     {".15 Scheduling Type", "docsis_tlv.sflow.schedtype",
       FT_UINT32, BASE_HEX, VALS (sched_type_vals), 0x0,
       "Scheduling Type", HFILL}
      },
     {&hf_docsis_tlv_sflow_reqxmit_pol,
-     {".16 Request/Transmission Policy", "docsis.tlv.sflow.reqxmitpol",
+     {".16 Request/Transmission Policy", "docsis_tlv.sflow.reqxmitpol",
       FT_UINT32, BASE_HEX, NULL, 0x0,
       "Request/Transmission Policy", HFILL}
      },
     {&hf_docsis_tlv_sflow_nominal_polling,
      {".17 Nominal Polling Interval(usec)",
-      "docsis.tlv.sflow.nominal_polling",
+      "docsis_tlv.sflow.nominal_polling",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Nominal Polling Interval(usec)", HFILL}
      },
     {&hf_docsis_tlv_sflow_tolerated_jitter,
-     {".18 Tolerated Poll Jitter (usec)", "docsis.tlv.sflow.toler_jitter",
+     {".18 Tolerated Poll Jitter (usec)", "docsis_tlv.sflow.toler_jitter",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Tolerated Poll Jitter (usec)", HFILL}
      },
     {&hf_docsis_tlv_sflow_ugs_size,
-     {".19 Unsolicited Grant Size (bytes)", "docsis.tlv.sflow.ugs_size",
+     {".19 Unsolicited Grant Size (bytes)", "docsis_tlv.sflow.ugs_size",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Unsolicited Grant Size (bytes)", HFILL}
      },
     {&hf_docsis_tlv_sflow_nom_grant_intvl,
-     {".20 Nominal Grant Interval (usec)", "docsis.tlv.sflow.nom_grant_intvl",
+     {".20 Nominal Grant Interval (usec)", "docsis_tlv.sflow.nom_grant_intvl",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Nominal Grant Interval (usec)", HFILL}
      },
     {&hf_docsis_tlv_sflow_tol_grant_jitter,
      {".21 Tolerated Grant Jitter (usec)",
-      "docsis.tlv.sflow.tol_grant_jitter",
+      "docsis_tlv.sflow.tol_grant_jitter",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Tolerated Grant Jitter (usec)", HFILL}
      },
     {&hf_docsis_tlv_sflow_grants_per_intvl,
-     {".22 Grants Per Interval", "docsis.tlv.sflow.grnts_per_intvl",
+     {".22 Grants Per Interval", "docsis_tlv.sflow.grnts_per_intvl",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Grants Per Interval", HFILL}
      },
     {&hf_docsis_tlv_sflow_ip_tos_overwrite,
-     {".23 IP TOS Overwrite", "docsis.tlv.sflow.iptos_overwrite",
+     {".23 IP TOS Overwrite", "docsis_tlv.sflow.iptos_overwrite",
       FT_UINT16, BASE_HEX, NULL, 0x0,
       "IP TOS Overwrite", HFILL}
      },
     {&hf_docsis_tlv_sflow_ugs_timeref,
-     {".24 UGS Time Reference", "docsis.tlv.sflow.ugs_timeref",
+     {".24 UGS Time Reference", "docsis_tlv.sflow.ugs_timeref",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "UGS Time Reference", HFILL}
      },
     {&hf_docsis_tlv_sflow_vendor_spec,
-     {".43 Vendor Specific Encodings", "docsis.tlv.sflow.vendorspec",
+     {".43 Vendor Specific Encodings", "docsis_tlv.sflow.vendorspec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Specific Encodings", HFILL}
      },
     {&hf_docsis_tlv_phs,
-     {"26 PHS Rules", "docsis.tlv.phs",
+     {"26 PHS Rules", "docsis_tlv.phs",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "PHS Rules", HFILL}
      },
     {&hf_docsis_tlv_phs_class_ref,
-     {".1 Classifier Reference", "docsis.tlv.phs.classref",
+     {".1 Classifier Reference", "docsis_tlv.phs.classref",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Classifier Reference", HFILL}
      },
     {&hf_docsis_tlv_phs_class_id,
-     {".2 Classifier Id", "docsis.tlv.phs.classid",
+     {".2 Classifier Id", "docsis_tlv.phs.classid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Classifier Id", HFILL}
      },
     {&hf_docsis_tlv_phs_sflow_ref,
-     {".3 Service flow reference", "docsis.tlv.phs.sflowref",
+     {".3 Service flow reference", "docsis_tlv.phs.sflowref",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Flow Reference", HFILL}
      },
     {&hf_docsis_tlv_phs_sflow_id,
-     {".4 Service flow Id", "docsis.tlv.phs.sflowid",
+     {".4 Service flow Id", "docsis_tlv.phs.sflowid",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Service Flow Id", HFILL}
      },
     {&hf_docsis_tlv_phs_dsc_action,
-     {".5 DSC Action", "docsis.tlv.phs.dscaction",
+     {".5 DSC Action", "docsis_tlv.phs.dscaction",
       FT_UINT8, BASE_DEC, VALS (action_vals), 0x0,
       "Dynamic Service Change Action", HFILL}
      },
     {&hf_docsis_tlv_phs_err,
-     {".6 Error Encodings", "docsis.tlv.phs.err",
+     {".6 Error Encodings", "docsis_tlv.phs.err",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Error Encodings", HFILL}
      },
     {&hf_docsis_tlv_phs_err_param,
-     {"..1 Param Subtype", "docsis.tlv.phs.err.param",
+     {"..1 Param Subtype", "docsis_tlv.phs.err.param",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Parameter Subtype", HFILL}
      },
     {&hf_docsis_tlv_phs_err_code,
-     {"..2 Error Code", "docsis.tlv.phs.err.code",
+     {"..2 Error Code", "docsis_tlv.phs.err.code",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Error Code", HFILL}
      },
     {&hf_docsis_tlv_phs_err_msg,
-     {"..3 Error Message", "docsis.tlv.phs.err.msg",
+     {"..3 Error Message", "docsis_tlv.phs.err.msg",
       FT_STRINGZ, BASE_DEC, NULL, 0x0,
       "Error Message", HFILL}
      },
     {&hf_docsis_tlv_phs_phsf,
-     {".7 PHS Field", "docsis.tlv.phs.phsf",
+     {".7 PHS Field", "docsis_tlv.phs.phsf",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "PHS Field", HFILL}
      },
     {&hf_docsis_tlv_phs_phsi,
-     {".8 PHS Index", "docsis.tlv.phs.phsi",
+     {".8 PHS Index", "docsis_tlv.phs.phsi",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "PHS Index", HFILL}
      },
     {&hf_docsis_tlv_phs_phsm,
-     {".9 PHS Mask", "docsis.tlv.phs.phsm",
+     {".9 PHS Mask", "docsis_tlv.phs.phsm",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "PHS Mask", HFILL}
      },
     {&hf_docsis_tlv_phs_phss,
-     {".10 PHS Size", "docsis.tlv.phs.phss",
+     {".10 PHS Size", "docsis_tlv.phs.phss",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "PHS Size", HFILL}
      },
     {&hf_docsis_tlv_phs_phsv,
-     {".11 PHS Verify", "docsis.tlv.phs.phsv",
+     {".11 PHS Verify", "docsis_tlv.phs.phsv",
       FT_BOOLEAN, BASE_DEC, TFS (&verify_tfs), 0x0,
       "PHS Verify", HFILL}
      },
     {&hf_docsis_tlv_phs_vendorspec,
-     {".43 PHS Vendor Specific", "docsis.tlv.phs.vendorspec",
+     {".43 PHS Vendor Specific", "docsis_tlv.phs.vendorspec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "PHS Vendor Specific", HFILL}
      },
     {&hf_docsis_tlv_hmac_digest,
-     {"27 HMAC Digest", "docsis.tlv.hmac_digest",
+     {"27 HMAC Digest", "docsis_tlv.hmac_digest",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "HMAC Digest", HFILL}
      },
     {&hf_docsis_tlv_max_classifiers,
-     {"28 Max # of Classifiers", "docsis.tlv.maxclass",
+     {"28 Max # of Classifiers", "docsis_tlv.maxclass",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Max # of Classifiers", HFILL}
      },
     {&hf_docsis_tlv_privacy_enable,
-     {"29 Privacy Enable", "docsis.tlv.bpi_en",
+     {"29 Privacy Enable", "docsis_tlv.bpi_en",
       FT_BOOLEAN, BASE_DEC, TFS (&ena_dis_tfs), 0x0,
       "Privacy Enable", HFILL}
      },
     {&hf_docsis_tlv_auth_block,
-     {"30 Auth Block", "docsis.tlv.auth_block",
+     {"30 Auth Block", "docsis_tlv.auth_block",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Auth Block", HFILL}
      },
     {&hf_docsis_tlv_key_seq_num,
-     {"31 Key Sequence Number", "docsis.tlv.key_seq",
+     {"31 Key Sequence Number", "docsis_tlv.key_seq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Key Sequence Number", HFILL}
      },
     {&hf_docsis_tlv_mfgr_cvc,
-     {"32 Manufacturer CVC", "docsis.tlv.mfgr_cvc",
+     {"32 Manufacturer CVC", "docsis_tlv.mfgr_cvc",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Manufacturer CVC", HFILL}
      },
     {&hf_docsis_tlv_cosign_cvc,
-     {"33 Co-Signer CVC", "docsis.tlv.cosign_cvc",
+     {"33 Co-Signer CVC", "docsis_tlv.cosign_cvc",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Co-Signer CVC", HFILL}
      },
     {&hf_docsis_tlv_snmpv3_kick,
-     {"34 SNMPv3 Kickstart Value", "docsis.tlv.snmpv3",
+     {"34 SNMPv3 Kickstart Value", "docsis_tlv.snmpv3",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SNMPv3 Kickstart Value", HFILL}
      },
     {&hf_docsis_tlv_snmpv3_kick_name,
-     {".1 SNMPv3 Kickstart Security Name", "docsis.tlv.snmpv3.secname",
+     {".1 SNMPv3 Kickstart Security Name", "docsis_tlv.snmpv3.secname",
       FT_STRING, BASE_DEC, NULL, 0x0,
       "SNMPv3 Kickstart Security Name", HFILL}
      },
     {&hf_docsis_tlv_snmpv3_kick_publicnum,
-     {".2 SNMPv3 Kickstart Manager Public Number", "docsis.tlv.snmpv3.publicnum",
+     {".2 SNMPv3 Kickstart Manager Public Number", "docsis_tlv.snmpv3.publicnum",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SNMPv3 Kickstart Value Manager Public Number", HFILL}
      },
     {&hf_docsis_tlv_subs_mgmt_ctrl,
-     {"35 Subscriber Management Control", "docsis.tlv.subsmgmtctrl",
+     {"35 Subscriber Management Control", "docsis_tlv.subsmgmtctrl",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Subscriber Management Control", HFILL}
      },
     {&hf_docsis_tlv_subs_mgmt_ip_table,
-     {"36 Subscriber Management CPE IP Table", "docsis.tlv.subsiptable",
+     {"36 Subscriber Management CPE IP Table", "docsis_tlv.subsiptable",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Subscriber Management CPE IP Table", HFILL}
      },
     {&hf_docsis_tlv_subs_mgmt_ip_entry,
-     {"Subscriber Management CPE IP Entry", "docsis.tlv.subsipentry",
+     {"Subscriber Management CPE IP Entry", "docsis_tlv.subsipentry",
       FT_IPv4, BASE_DEC, NULL, 0x0,
       "Subscriber Management CPE IP Entry", HFILL}
      },
     {&hf_docsis_tlv_subs_mgmt_filter_grps,
-     {"37 Subscriber Management Filter Groups", "docsis.tlv.subsfltrgrps",
+     {"37 Subscriber Management Filter Groups", "docsis_tlv.subsfltrgrps",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Subscriber Management Filter Groups", HFILL}
      },
     {&hf_docsis_tlv_vendor_spec,
-     {"43 Vendor Specific Encodings", "docsis.tlv.vendorspec",
+     {"43 Vendor Specific Encodings", "docsis_tlv.vendorspec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Specific Encodings", HFILL}
      },
     {&hf_docsis_tlv_rng_tech,
-     {"Ranging Technique", "docsis.tlv.rng_tech",
+     {"Ranging Technique", "docsis_tlv.rng_tech",
       FT_UINT8, BASE_DEC, VALS (rng_tech_vals), 0x0,
       "Ranging Technique", HFILL}
      },
index 81ff2de83f5c3ebd147dff8cbf57a713215e0f90..ea7c9a0f2cbd5b312a761f45fbd10e8a6c1f1070 100644 (file)
@@ -836,97 +836,97 @@ proto_register_docsis_type29ucd (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_type29ucd_upstream_chid,
-     {"Upstream Channel ID", "docsis.type29ucd.upchid",
+     {"Upstream Channel ID", "docsis_type29ucd.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID", HFILL}
      },
     {&hf_docsis_type29ucd_config_ch_cnt,
-     {"Config Change Count", "docsis.type29ucd.confcngcnt",
+     {"Config Change Count", "docsis_type29ucd.confcngcnt",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Configuration Change Count", HFILL}
      },
     {&hf_docsis_type29ucd_mini_slot_size,
-     {"Mini Slot Size (6.25us TimeTicks)", "docsis.type29ucd.mslotsize",
+     {"Mini Slot Size (6.25us TimeTicks)", "docsis_type29ucd.mslotsize",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Mini Slot Size (6.25us TimeTicks)", HFILL}
      },
     {&hf_docsis_type29ucd_down_chid,
-     {"Downstream Channel ID", "docsis.type29ucd.downchid",
+     {"Downstream Channel ID", "docsis_type29ucd.downchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Management Message", HFILL}
      },
     {&hf_docsis_type29ucd_symbol_rate,
-     {"1 Symbol Rate (ksym/sec)", "docsis.type29ucd.symrate",
+     {"1 Symbol Rate (ksym/sec)", "docsis_type29ucd.symrate",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Symbol Rate", HFILL}
      },
     {&hf_docsis_type29ucd_frequency,
-     {"2 Frequency (Hz)", "docsis.type29ucd.freq",
+     {"2 Frequency (Hz)", "docsis_type29ucd.freq",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Upstream Center Frequency", HFILL}
      },
     {&hf_docsis_type29ucd_preamble_pat,
-     {"3 Preamble Pattern", "docsis.type29ucd.preamble",
+     {"3 Preamble Pattern", "docsis_type29ucd.preamble",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Preamble Superstring", HFILL}
      },
     {&hf_docsis_type29ucd_iuc,
-     {"Interval Usage Code", "docsis.type29ucd.iuc",
+     {"Interval Usage Code", "docsis_type29ucd.iuc",
       FT_UINT8, BASE_DEC, VALS (iuc_vals2), 0x0,
       "Interval Usage Code", HFILL}
      },
     {&hf_docsis_burst_mod_type,
-     {"1 Modulation Type", "docsis.type29ucd.burst.modtype",
+     {"1 Modulation Type", "docsis_type29ucd.burst.modtype",
       FT_UINT8, BASE_DEC, VALS (mod_vals2), 0x0,
       "Modulation Type", HFILL}
      },
     {&hf_docsis_burst_diff_encoding,
-     {"2 Differential Encoding", "docsis.type29ucd.burst.diffenc",
+     {"2 Differential Encoding", "docsis_type29ucd.burst.diffenc",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "Differential Encoding", HFILL}
      },
     {&hf_docsis_burst_preamble_len,
-     {"3 Preamble Length (Bits)", "docsis.type29ucd.burst.preamble_len",
+     {"3 Preamble Length (Bits)", "docsis_type29ucd.burst.preamble_len",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Preamble Length (Bits)", HFILL}
      },
     {&hf_docsis_burst_preamble_val_off,
-     {"4 Preamble Offset (Bits)", "docsis.type29ucd.burst.preamble_off",
+     {"4 Preamble Offset (Bits)", "docsis_type29ucd.burst.preamble_off",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Preamble Offset (Bits)", HFILL}
      },
     {&hf_docsis_burst_fec,
-     {"5 FEC (T)", "docsis.type29ucd.burst.fec",
+     {"5 FEC (T)", "docsis_type29ucd.burst.fec",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "FEC (T) Codeword Parity Bits = 2^T", HFILL}
      },
     {&hf_docsis_burst_fec_codeword,
-     {"6 FEC Codeword Info bytes (k)", "docsis.type29ucd.burst.fec_codeword",
+     {"6 FEC Codeword Info bytes (k)", "docsis_type29ucd.burst.fec_codeword",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "FEC Codeword Info Bytes (k)", HFILL}
      },
     {&hf_docsis_burst_scrambler_seed,
-     {"7 Scrambler Seed", "docsis.type29ucd.burst.scrambler_seed",
+     {"7 Scrambler Seed", "docsis_type29ucd.burst.scrambler_seed",
       FT_UINT16, BASE_HEX, NULL, 0x0,
       "Burst Descriptor", HFILL}
      },
     {&hf_docsis_burst_max_burst,
-     {"8 Max Burst Size (Minislots)", "docsis.type29ucd.burst.maxburst",
+     {"8 Max Burst Size (Minislots)", "docsis_type29ucd.burst.maxburst",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Max Burst Size (Minislots)", HFILL}
      },
     {&hf_docsis_burst_guard_time,
-     {"9 Guard Time Size (Symbol Times)", "docsis.type29ucd.burst.guardtime",
+     {"9 Guard Time Size (Symbol Times)", "docsis_type29ucd.burst.guardtime",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Guard Time Size", HFILL}
      },
     {&hf_docsis_burst_last_cw_len,
-     {"10 Last Codeword Length", "docsis.type29ucd.burst.last_cw_len",
+     {"10 Last Codeword Length", "docsis_type29ucd.burst.last_cw_len",
       FT_UINT8, BASE_DEC, VALS (last_cw_len_vals), 0x0,
       "Last Codeword Length", HFILL}
      },
     {&hf_docsis_burst_scrambler_onoff,
-     {"11 Scrambler On/Off", "docsis.type29ucd.burst.scrambleronoff",
+     {"11 Scrambler On/Off", "docsis_type29ucd.burst.scrambleronoff",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "Scrambler On/Off", HFILL}
      },
@@ -944,57 +944,57 @@ proto_register_docsis_type29ucd (void)
  *  * #define type29ucd_RANGING_REQUIRED 16
  *  */
     {&hf_docsis_type29ucd_ext_preamble,
-     {"6 Extended Preamble Pattern", "docsis.type29ucd.extpreamble",
+     {"6 Extended Preamble Pattern", "docsis_type29ucd.extpreamble",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Extended Preamble Pattern", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_mode_enable,
-     {"7 SCDMA Mode Enable", "docsis.type29ucd.scdmaenable",
+     {"7 SCDMA Mode Enable", "docsis_type29ucd.scdmaenable",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA Mode Enable", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_spreading_interval,
-     {"8 SCDMA Spreading Interval", "docsis.type29ucd.scdmaspreadinginterval",
+     {"8 SCDMA Spreading Interval", "docsis_type29ucd.scdmaspreadinginterval",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA Spreading Interval", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_codes_per_mini_slot,
-     {"9 SCDMA Codes per mini slot", "docsis.type29ucd.scdmacodesperminislot",
+     {"9 SCDMA Codes per mini slot", "docsis_type29ucd.scdmacodesperminislot",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA Codes per mini slot", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_active_codes,
-     {"10 SCDMA Active Codes", "docsis.type29ucd.scdmaactivecodes",
+     {"10 SCDMA Active Codes", "docsis_type29ucd.scdmaactivecodes",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA Active Codes", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_code_hopping_seed,
-     {"11 SCDMA Code Hopping Seed", "docsis.type29ucd.scdmacodehoppingseed",
+     {"11 SCDMA Code Hopping Seed", "docsis_type29ucd.scdmacodehoppingseed",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA Code Hopping Seed", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_us_ratio_num,
-     {"12 SCDMA US Ratio Numerator", "docsis.type29ucd.scdmausrationum",
+     {"12 SCDMA US Ratio Numerator", "docsis_type29ucd.scdmausrationum",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA US Ratio Numerator", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_us_ratio_denom,
-     {"13 SCDMA US Ratio Denominator", "docsis.type29ucd.scdmausratiodenom",
+     {"13 SCDMA US Ratio Denominator", "docsis_type29ucd.scdmausratiodenom",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA US Ratio Denominator", HFILL}
      },
     {&hf_docsis_type29ucd_scdma_timestamp_snapshot,
-     {"14 SCDMA Timestamp Snapshot", "docsis.type29ucd.scdmatimestamp",
+     {"14 SCDMA Timestamp Snapshot", "docsis_type29ucd.scdmatimestamp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "SCDMA Timestamp Snapshot", HFILL}
      },
     {&hf_docsis_type29ucd_maintain_power_spectral_density,
-     {"15 Maintain power spectral density", "docsis.type29ucd.maintainpowerspectraldensity",
+     {"15 Maintain power spectral density", "docsis_type29ucd.maintainpowerspectraldensity",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Maintain power spectral density", HFILL}
      },
     {&hf_docsis_type29ucd_ranging_required,
-     {"16 Ranging Required", "docsis.type29ucd.rangingrequired",
+     {"16 Ranging Required", "docsis_type29ucd.rangingrequired",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Ranging Required", HFILL}
      },
@@ -1007,37 +1007,37 @@ proto_register_docsis_type29ucd (void)
  * #define type29ucd_TCM_ENABLED 18
  */
     {&hf_docsis_rs_int_depth,
-     {"12 Scrambler On/Off", "docsis.type29ucd.burst.rsintdepth",
+     {"12 Scrambler On/Off", "docsis_type29ucd.burst.rsintdepth",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "R-S Interleaver Depth", HFILL}
      },
     {&hf_docsis_rs_int_block,
-     {"13 Scrambler On/Off", "docsis.type29ucd.burst.rsintblock",
+     {"13 Scrambler On/Off", "docsis_type29ucd.burst.rsintblock",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "R-S Interleaver Block", HFILL}
      },
     {&hf_docsis_preamble_type,
-     {"14 Scrambler On/Off", "docsis.type29ucd.burst.preambletype",
+     {"14 Scrambler On/Off", "docsis_type29ucd.burst.preambletype",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Preamble Type", HFILL}
      },
     {&hf_docsis_scdma_scrambler_onoff,
-     {"15 Scrambler On/Off", "docsis.type29ucd.burst.scdmascrambleronoff",
+     {"15 Scrambler On/Off", "docsis_type29ucd.burst.scdmascrambleronoff",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "SCDMA Scrambler On/Off", HFILL}
      },
     {&hf_docsis_scdma_codes_per_subframe,
-     {"16 Scrambler On/Off", "docsis.type29ucd.burst.scdmacodespersubframe",
+     {"16 Scrambler On/Off", "docsis_type29ucd.burst.scdmacodespersubframe",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "SCDMA Codes per Subframe", HFILL}
      },
     {&hf_docsis_scdma_framer_int_step_size,
-     {"17 Scrambler On/Off", "docsis.type29ucd.burst.scdmaframerintstepsize",
+     {"17 Scrambler On/Off", "docsis_type29ucd.burst.scdmaframerintstepsize",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "SCDMA Framer Interleaving Step Size", HFILL}
      },
     {&hf_docsis_tcm_enabled,
-     {"18 Scrambler On/Off", "docsis.type29ucd.burst.tcmenabled",
+     {"18 Scrambler On/Off", "docsis_type29ucd.burst.tcmenabled",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "TCM Enabled", HFILL}
      },
index 07fee12ffdfc555de5570ef7ffcd9a7649c2c6cb..af0c6f2eb036e2e065e9d93a270ac6c8f4fdcff8 100644 (file)
@@ -101,12 +101,12 @@ proto_register_docsis_uccreq (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_uccreq,
-     {"Upstream Channel Change Request", "docsis.uccreq",
+     {"Upstream Channel Change Request", "docsis_uccreq",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Upstream Channel Change Request", HFILL}
      },
     {&hf_docsis_uccreq_upchid,
-     {"Upstream Channel Id", "docsis.uccreq.upchid",
+     {"Upstream Channel Id", "docsis_uccreq.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel Id", HFILL}
      },
index da7bd6fbe9e2eeca22eca1d2d2fc8fef22aa5af1..f5e79b254fa252d86c70e0048841e1ed79eca0e3 100644 (file)
@@ -94,12 +94,12 @@ proto_register_docsis_uccrsp (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_uccrsp,
-     {"Upstream Channel Change Request", "docsis.uccrsp",
+     {"Upstream Channel Change Request", "docsis_uccrsp",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Upstream Channel Change Request", HFILL}
      },
     {&hf_docsis_uccrsp_upchid,
-     {"Upstream Channel Id", "docsis.uccrsp.upchid",
+     {"Upstream Channel Id", "docsis_uccrsp.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel Id", HFILL}
      },
index 83be89b58867a3f5d3547bfe0b55a0161016d1a1..c7230796b66e13a4ee4b3a680de4faa9f202e9e8 100644 (file)
@@ -662,142 +662,142 @@ proto_register_docsis_ucd (void)
    /* Setup list of header fields  See Section 1.6.1 for details*/
    static hf_register_info hf[] = {
     {&hf_docsis_ucd_upstream_chid,
-     {"Upstream Channel ID", "docsis.ucd.upchid",
+     {"Upstream Channel ID", "docsis_ucd.upchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Upstream Channel ID", HFILL}
      },
     {&hf_docsis_ucd_config_ch_cnt,
-     {"Config Change Count", "docsis.ucd.confcngcnt",
+     {"Config Change Count", "docsis_ucd.confcngcnt",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Configuration Change Count", HFILL}
      },
     {&hf_docsis_ucd_mini_slot_size,
-     {"Mini Slot Size (6.25us TimeTicks)", "docsis.ucd.mslotsize",
+     {"Mini Slot Size (6.25us TimeTicks)", "docsis_ucd.mslotsize",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Mini Slot Size (6.25us TimeTicks)", HFILL}
      },
     {&hf_docsis_ucd_down_chid,
-     {"Downstream Channel ID", "docsis.ucd.downchid",
+     {"Downstream Channel ID", "docsis_ucd.downchid",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Management Message", HFILL}
      },
     {&hf_docsis_ucd_type,
-     {"TLV Type", "docsis.ucd.type",
+     {"TLV Type", "docsis_ucd.type",
       FT_UINT8, BASE_DEC, VALS(channel_tlv_vals), 0x0,
       "Channel TLV type", HFILL}
      },
     {&hf_docsis_ucd_length,
-     {"TLV Length", "docsis.ucd.length",
+     {"TLV Length", "docsis_ucd.length",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Channel TLV length", HFILL}
      },
     {&hf_docsis_ucd_symbol_rate,
-     {"Symbol Rate (ksym/sec)", "docsis.ucd.symrate",
+     {"Symbol Rate (ksym/sec)", "docsis_ucd.symrate",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Symbol Rate", HFILL}
      },
     {&hf_docsis_ucd_frequency,
-     {"Frequency (Hz)", "docsis.ucd.freq",
+     {"Frequency (Hz)", "docsis_ucd.freq",
       FT_UINT32, BASE_DEC, NULL, 0x0,
       "Upstream Center Frequency", HFILL}
      },
     {&hf_docsis_ucd_preamble_pat,
-     {"Preamble Pattern", "docsis.ucd.preamble",
+     {"Preamble Pattern", "docsis_ucd.preamble",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Preamble Superstring", HFILL}
      },
     {&hf_docsis_ucd_iuc,
-     {"Interval Usage Code", "docsis.ucd.iuc",
+     {"Interval Usage Code", "docsis_ucd.iuc",
       FT_UINT8, BASE_DEC, VALS (iuc_vals), 0x0,
       "Interval Usage Code", HFILL}
      },
     {&hf_docsis_burst_mod_type,
-     {"1 Modulation Type", "docsis.ucd.burst.modtype",
+     {"1 Modulation Type", "docsis_ucd.burst.modtype",
       FT_UINT8, BASE_DEC, VALS (mod_vals), 0x0,
       "Modulation Type", HFILL}
      },
     {&hf_docsis_burst_diff_encoding,
-     {"2 Differential Encoding", "docsis.ucd.burst.diffenc",
+     {"2 Differential Encoding", "docsis_ucd.burst.diffenc",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "Differential Encoding", HFILL}
      },
     {&hf_docsis_burst_preamble_len,
-     {"3 Preamble Length (Bits)", "docsis.ucd.burst.preamble_len",
+     {"3 Preamble Length (Bits)", "docsis_ucd.burst.preamble_len",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Preamble Length (Bits)", HFILL}
      },
     {&hf_docsis_burst_preamble_val_off,
-     {"4 Preamble Offset (Bits)", "docsis.ucd.burst.preamble_off",
+     {"4 Preamble Offset (Bits)", "docsis_ucd.burst.preamble_off",
       FT_UINT16, BASE_DEC, NULL, 0x0,
       "Preamble Offset (Bits)", HFILL}
      },
     {&hf_docsis_burst_fec,
-     {"5 FEC (T)", "docsis.ucd.burst.fec",
+     {"5 FEC (T)", "docsis_ucd.burst.fec",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "FEC (T) Codeword Parity Bits = 2^T", HFILL}
      },
     {&hf_docsis_burst_fec_codeword,
-     {"6 FEC Codeword Info bytes (k)", "docsis.ucd.burst.fec_codeword",
+     {"6 FEC Codeword Info bytes (k)", "docsis_ucd.burst.fec_codeword",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "FEC Codeword Info Bytes (k)", HFILL}
      },
     {&hf_docsis_burst_scrambler_seed,
-     {"7 Scrambler Seed", "docsis.ucd.burst.scrambler_seed",
+     {"7 Scrambler Seed", "docsis_ucd.burst.scrambler_seed",
       FT_UINT16, BASE_HEX, NULL, 0x0,
       "Burst Descriptor", HFILL}
      },
     {&hf_docsis_burst_max_burst,
-     {"8 Max Burst Size (Minislots)", "docsis.ucd.burst.maxburst",
+     {"8 Max Burst Size (Minislots)", "docsis_ucd.burst.maxburst",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Max Burst Size (Minislots)", HFILL}
      },
     {&hf_docsis_burst_guard_time,
-     {"9 Guard Time Size (Symbol Times)", "docsis.ucd.burst.guardtime",
+     {"9 Guard Time Size (Symbol Times)", "docsis_ucd.burst.guardtime",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Guard Time Size", HFILL}
      },
     {&hf_docsis_burst_last_cw_len,
-     {"10 Last Codeword Length", "docsis.ucd.burst.last_cw_len",
+     {"10 Last Codeword Length", "docsis_ucd.burst.last_cw_len",
       FT_UINT8, BASE_DEC, VALS (last_cw_len_vals), 0x0,
       "Last Codeword Length", HFILL}
      },
     {&hf_docsis_burst_scrambler_onoff,
-     {"11 Scrambler On/Off", "docsis.ucd.burst.scrambleronoff",
+     {"11 Scrambler On/Off", "docsis_ucd.burst.scrambleronoff",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "Scrambler On/Off", HFILL}
      },
     {&hf_docsis_rs_int_depth,
-     {"12 RS Interleaver Depth", "docsis.ucd.burst.rsintdepth",
+     {"12 RS Interleaver Depth", "docsis_ucd.burst.rsintdepth",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "R-S Interleaver Depth", HFILL}
     },
     {&hf_docsis_rs_int_block,
-     {"13 RS Interleaver Block Size", "docsis.ucd.burst.rsintblock",
+     {"13 RS Interleaver Block Size", "docsis_ucd.burst.rsintblock",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "R-S Interleaver Block", HFILL}
     },
     {&hf_docsis_preamble_type,
-     {"14 Preamble Type", "docsis.ucd.burst.preambletype",
+     {"14 Preamble Type", "docsis_ucd.burst.preambletype",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Preamble Type", HFILL}
     },
     {&hf_docsis_scdma_scrambler_onoff,
-     {"15 SCDMA Scrambler On/Off", "docsis.ucd.burst.scdmascrambleronoff",
+     {"15 SCDMA Scrambler On/Off", "docsis_ucd.burst.scdmascrambleronoff",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "SCDMA Scrambler On/Off", HFILL}
     },
     {&hf_docsis_scdma_codes_per_subframe,
-     {"16 SCDMA Codes per Subframe", "docsis.ucd.burst.scdmacodespersubframe",
+     {"16 SCDMA Codes per Subframe", "docsis_ucd.burst.scdmacodespersubframe",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "SCDMA Codes per Subframe", HFILL}
     },
     {&hf_docsis_scdma_framer_int_step_size,
-     {"17 SDMA Framer Int Step Size", "docsis.ucd.burst.scdmaframerintstepsize",
+     {"17 SDMA Framer Int Step Size", "docsis_ucd.burst.scdmaframerintstepsize",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "SCDMA Framer Interleaving Step Size", HFILL}
     },
     {&hf_docsis_tcm_enabled,
-     {"18 TCM Enable", "docsis.ucd.burst.tcmenabled",
+     {"18 TCM Enable", "docsis_ucd.burst.tcmenabled",
       FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x0,
       "TCM Enabled", HFILL}
     },
index 00b157ece3da66d151bdf20417af21c8718b2d8e..6c6d96ac8c00d1c13cd581491f3751ad186b28d4 100644 (file)
@@ -238,42 +238,42 @@ proto_register_docsis_vsif (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
   static hf_register_info hf[] = {
     {&hf_docsis_vsif,
-     {"VSIF Encodings", "docsis.vsif",
+     {"VSIF Encodings", "docsis_vsif",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Vendor Specific Encodings", HFILL}
      },
     {&hf_docsis_vsif_vendorid,
-     {"Vendor Id", "docsis.vsif.vendorid",
+     {"Vendor Id", "docsis_vsif.vendorid",
       FT_UINT24, BASE_HEX, VALS(vendorid_vals), 0x0,
       "Vendor Identifier", HFILL}
      },
     {&hf_docsis_vsif_vendor_unknown,
-     {"VSIF Encodings", "docsis.vsif.unknown",
+     {"VSIF Encodings", "docsis_vsif.unknown",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "Unknown Vendor", HFILL}
      },
     {&hf_docsis_vsif_cisco_numphones,
-     {"Number of phone lines", "docsis.vsif.cisco.numphones",
+     {"Number of phone lines", "docsis_vsif.cisco.numphones",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "Number of phone lines", HFILL}
      },
     {&hf_docsis_vsif_cisco_ipprec,
-     {"IP Precedence Encodings", "docsis.vsif.cisco.ipprec",
+     {"IP Precedence Encodings", "docsis_vsif.cisco.ipprec",
       FT_BYTES, BASE_HEX, NULL, 0x0,
       "IP Precedence Encodings", HFILL}
      },
     {&hf_docsis_vsif_cisco_ipprec_val,
-     {"IP Precedence Value", "docsis.vsif.cisco.ipprec.value",
+     {"IP Precedence Value", "docsis_vsif.cisco.ipprec.value",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "IP Precedence Value", HFILL}
      },
     {&hf_docsis_vsif_cisco_ipprec_bw,
-     {"IP Precedence Bandwidth", "docsis.vsif.cisco.ipprec.bw",
+     {"IP Precedence Bandwidth", "docsis_vsif.cisco.ipprec.bw",
       FT_UINT8, BASE_DEC, NULL, 0x0,
       "IP Precedence Bandwidth", HFILL}
      },
     {&hf_docsis_vsif_cisco_config_file,
-     {"IOS Config File", "docsis.vsif.cisco.iosfile",
+     {"IOS Config File", "docsis_vsif.cisco.iosfile",
       FT_STRING, BASE_DEC, NULL, 0x0,
       "IOS Config File", HFILL}
      },