From Chris Maynard <christopher.maynard@gtech.com>:

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 ...


svn path=/trunk/; revision=23088

1 files changed, 29 insertions, 29 deletions

diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 77a5f92a06..3a0ccb5a54 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -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}
      },