diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 23:22:10 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 23:22:10 +0000 |
| commit | 2bba6be84fe612e272d9b0388c0f51e8c4ef3ba8 (patch) | |
| tree | d7cb349eff025f305ee5fcf93b4a95d7bca3a117 /plugins/docsis | |
| parent | b228488bc0b9d5e0c63b15814836f7332f35ce04 (diff) | |
| download | wireshark-2bba6be84fe612e272d9b0388c0f51e8c4ef3ba8.tar.gz wireshark-2bba6be84fe612e272d9b0388c0f51e8c4ef3ba8.tar.bz2 wireshark-2bba6be84fe612e272d9b0388c0f51e8c4ef3ba8.zip | |
From Kovarththanan Rajaratnam via bug 3548:
Cleanup header_field_info in plugins.
svn path=/trunk/; revision=28771
Diffstat (limited to 'plugins/docsis')
34 files changed, 305 insertions, 305 deletions
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index 3a0ccb5a54..570c3b68c1 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -399,17 +399,17 @@ proto_register_docsis_bpkmattr (void) static hf_register_info hf[] = { {&hf_docsis_bpkmattr, {"BPKM Attributes", "docsis_bpkmattr", - FT_BYTES, BASE_HEX, NULL, 0x0, - "BPKM Attributes", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_bpkmattr_serial_num, {"1 Serial Number", "docsis_bpkmattr.serialnum", - FT_STRING, BASE_DEC, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Serial Number", HFILL} }, {&hf_docsis_bpkmattr_manf_id, {"2 Manufacturer Id", "docsis_bpkmattr.manfid", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Manufacturer Id", HFILL} }, {&hf_docsis_bpkmattr_mac_addr, @@ -419,27 +419,27 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_rsa_pub_key, {"4 RSA Public Key", "docsis_bpkmattr.rsa_pub_key", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "RSA Public Key", HFILL} }, {&hf_docsis_bpkmattr_cm_id, {"5 CM Identification", "docsis_bpkmattr.cmid", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "CM Identification", HFILL} }, {&hf_docsis_bpkmattr_display_str, {"6 Display String", "docsis_bpkmattr.dispstr", - FT_STRING, BASE_DEC, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "Display String", HFILL} }, {&hf_docsis_bpkmattr_auth_key, {"7 Auth Key", "docsis_bpkmattr.auth_key", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Auth Key", HFILL} }, {&hf_docsis_bpkmattr_tek, {"8 Traffic Encryption Key", "docsis_bpkmattr.tek", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Traffic Encryption Key", HFILL} }, {&hf_docsis_bpkmattr_key_life, @@ -454,7 +454,7 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_hmac_digest, {"11 HMAC Digest", "docsis_bpkmattr.hmacdigest", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "HMAC Digest", HFILL} }, {&hf_docsis_bpkmattr_said, @@ -464,12 +464,12 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_tek_params, {"13 TEK Parameters", "docsis_bpkmattr.tekparams", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "TEK Parameters", HFILL} }, {&hf_docsis_bpkmattr_cbc_iv, {"14 CBC IV", "docsis_bpkmattr.cbciv", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Cypher Block Chaining", HFILL} }, {&hf_docsis_bpkmattr_error_code, @@ -479,22 +479,22 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_vendor_def, {"127 Vendor Defined", "docsis_bpkmattr.vendordef", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Defined", HFILL} }, {&hf_docsis_bpkmattr_ca_cert, {"17 CA Certificate", "docsis_bpkmattr.cacert", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "CA Certificate", HFILL} }, {&hf_docsis_bpkmattr_cm_cert, {"18 CM Certificate", "docsis_bpkmattr.cmcert", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "CM Certificate", HFILL} }, {&hf_docsis_bpkmattr_security_cap, {"19 Security Capabilities", "docsis_bpkmattr.seccap", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Security Capabilities", HFILL} }, {&hf_docsis_bpkmattr_crypto_suite, @@ -504,7 +504,7 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_crypto_suite_list, {"21 Cryptographic Suite List", "docsis_bpkmattr.crypto_suite_lst", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Cryptographic Suite", HFILL} }, {&hf_docsis_bpkmattr_bpi_version, @@ -514,7 +514,7 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_sa_descr, {"23 SA Descriptor", "docsis_bpkmattr.sadescr", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SA Descriptor", HFILL} }, {&hf_docsis_bpkmattr_sa_type, @@ -524,7 +524,7 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_sa_query, {"25 SA Query", "docsis_bpkmattr.saquery", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SA Query", HFILL} }, {&hf_docsis_bpkmattr_sa_query_type, @@ -534,12 +534,12 @@ proto_register_docsis_bpkmattr (void) }, {&hf_docsis_bpkmattr_ip_address, {"27 IP Address", "docsis_bpkmattr.ipaddr", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "IP Address", HFILL} }, {&hf_docsis_bpkmattr_download_param, {"28 Download Parameters", "docsis_bpkmattr.dnld_params", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Download Parameters", HFILL} }, }; diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c index 1b9402d9cc..8d0702da71 100644 --- a/plugins/docsis/packet-bpkmreq.c +++ b/plugins/docsis/packet-bpkmreq.c @@ -129,8 +129,8 @@ proto_register_docsis_bpkmreq (void) static hf_register_info hf[] = { {&hf_docsis_bpkmreq, {"BPKM Request Message", "docsis_bpkmreq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "BPKM Request Message", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_bpkmreq_code, {"BPKM Code", "docsis_bpkmreq.code", @@ -140,12 +140,12 @@ proto_register_docsis_bpkmreq (void) {&hf_docsis_bpkmreq_ident, {"BPKM Identifier", "docsis_bpkmreq.ident", FT_UINT8, BASE_DEC, NULL, 0x0, - "BPKM Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_bpkmreq_length, {"BPKM Length", "docsis_bpkmreq.length", FT_UINT16, BASE_DEC, NULL, 0x0, - "BPKM Length", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c index c98faa213b..6daab3df2f 100644 --- a/plugins/docsis/packet-bpkmrsp.c +++ b/plugins/docsis/packet-bpkmrsp.c @@ -130,8 +130,8 @@ proto_register_docsis_bpkmrsp (void) static hf_register_info hf[] = { {&hf_docsis_bpkmrsp, {"BPKM Response Message", "docsis_bpkmrsp", - FT_BYTES, BASE_HEX, NULL, 0x0, - "BPKM Response Message", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_bpkmrsp_code, {"BPKM Code", "docsis_bpkmrsp.code", @@ -141,12 +141,12 @@ proto_register_docsis_bpkmrsp (void) {&hf_docsis_bpkmrsp_ident, {"BPKM Identifier", "docsis_bpkmrsp.ident", FT_UINT8, BASE_DEC, NULL, 0x0, - "BPKM Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_bpkmrsp_length, {"BPKM Length", "docsis_bpkmrsp.length", FT_UINT16, BASE_DEC, NULL, 0x0, - "BPKM Length", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index 40f770dad3..59ea3feeee 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -128,28 +128,28 @@ proto_register_docsis_dccack (void) static hf_register_info hf[] = { {&hf_docsis_dccack_tran_id , { - "Transaction ID ", + "Transaction ID", "docsis_dccack.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction ID ", + NULL, HFILL } }, {&hf_docsis_dccack_key_seq_num , { - "Auth Key Sequence Number ", + "Auth Key Sequence Number", "docsis_dccack.key_seq_num", FT_UINT8, BASE_DEC, NULL, 0x0, - "Auth Key Sequence Number ", + NULL, HFILL } }, {&hf_docsis_dccack_hmac_digest , { - "HMAC-DigestNumber ", + "HMAC-DigestNumber", "docsis_dccack.hmac_digest", - FT_BYTES, BASE_DEC, NULL, 0x0, - "HMAC-DigestNumber ", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c index df33878a46..900126e838 100644 --- a/plugins/docsis/packet-dccreq.c +++ b/plugins/docsis/packet-dccreq.c @@ -395,37 +395,37 @@ proto_register_docsis_dccreq (void) static hf_register_info hf[] = { {&hf_docsis_dccreq_tran_id , { - "Transaction ID ", + "Transaction ID", "docsis_dccreq.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction ID ", + NULL, HFILL } }, {&hf_docsis_dccreq_up_chan_id , { - "Up Channel ID ", + "Up Channel ID", "docsis_dccreq.up_chan_id", FT_UINT8, BASE_DEC, NULL, 0x0, - "Up Channel ID ", + NULL, HFILL } }, {&hf_docsis_dccreq_ds_freq , { - "Frequency ", + "Frequency", "docsis_dccreq.ds_freq", FT_UINT32, BASE_DEC, NULL, 0x0, - "Frequency ", + NULL, HFILL } }, {&hf_docsis_dccreq_ds_mod_type , { - "Modulation Type ", + "Modulation Type", "docsis_dccreq.ds_mod_type", FT_UINT8, BASE_DEC, VALS (ds_mod_type_vals), 0x0, - "Modulation Type ", + NULL, HFILL } }, @@ -434,7 +434,7 @@ proto_register_docsis_dccreq (void) "Symbol Rate", "docsis_dccreq.ds_sym_rate", FT_UINT8, BASE_DEC, VALS (ds_sym_rate_vals), 0x0, - "Symbol Rate", + NULL, HFILL } }, @@ -443,7 +443,7 @@ proto_register_docsis_dccreq (void) "Interleaver Depth I Value", "docsis_dccreq.ds_intlv_depth_i", FT_UINT8, BASE_DEC, NULL, 0x0, - "Interleaver Depth I Value", + NULL, HFILL } }, @@ -452,7 +452,7 @@ proto_register_docsis_dccreq (void) "Interleaver Depth J Value", "docsis_dccreq.ds_intlv_depth_j", FT_UINT8, BASE_DEC, NULL, 0x0, - "Interleaver Depth J Value", + NULL, HFILL } }, @@ -461,7 +461,7 @@ proto_register_docsis_dccreq (void) "Downstream Channel ID", "docsis_dccreq.ds_chan_id", FT_UINT8, BASE_DEC, NULL, 0x0, - "Downstream Channel ID", + NULL, HFILL } }, @@ -470,7 +470,7 @@ proto_register_docsis_dccreq (void) "SYNC Substitution", "docsis_dccreq.ds_sync_sub", FT_UINT8, BASE_DEC, NULL, 0x0, - "SYNC Substitution", + NULL, HFILL } }, @@ -479,16 +479,16 @@ proto_register_docsis_dccreq (void) "Initialization Technique", "docsis_dccreq.init_tech", FT_UINT8, BASE_DEC, VALS (init_tech_vals), 0x0, - "Initialization Technique", + NULL, HFILL } }, {&hf_docsis_dccreq_ucd_sub , { - "UCD Substitution ", + "UCD Substitution", "docsis_dccreq.ucd_sub", - FT_BYTES, BASE_HEX, NULL, 0x0, - "UCD Substitution ", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, @@ -497,7 +497,7 @@ proto_register_docsis_dccreq (void) "SAID Sub - Current Value", "docsis_dccreq.said_sub_cur", FT_UINT16, BASE_DEC, NULL, 0x0, - "SAID Sub - Current Value", + NULL, HFILL } }, @@ -506,7 +506,7 @@ proto_register_docsis_dccreq (void) "SAID Sub - New Value", "docsis_dccreq.said_sub_new", FT_UINT16, BASE_DEC, NULL, 0x0, - "SAID Sub - New Value", + NULL, HFILL } }, @@ -515,7 +515,7 @@ proto_register_docsis_dccreq (void) "SF Sub - SFID Current Value", "docsis_dccreq.sf_sfid_cur", FT_UINT32, BASE_DEC, NULL, 0x0, - "SF Sub - SFID Current Value", + NULL, HFILL } }, @@ -524,7 +524,7 @@ proto_register_docsis_dccreq (void) "SF Sub - SFID New Value", "docsis_dccreq.sf_sfid_new", FT_UINT32, BASE_DEC, NULL, 0x0, - "SF Sub - SFID New Value", + NULL, HFILL } }, @@ -533,7 +533,7 @@ proto_register_docsis_dccreq (void) "SF Sub - SID Current Value", "docsis_dccreq.sf_sid_cur", FT_UINT16, BASE_DEC, NULL, 0x0, - "SF Sub - SID Current Value", + NULL, HFILL } }, @@ -542,43 +542,43 @@ proto_register_docsis_dccreq (void) "SF Sub - SID New Value", "docsis_dccreq.sf_sid_new", FT_UINT16, BASE_DEC, NULL, 0x0, - "SF Sub - SID New Value", + NULL, HFILL } }, {&hf_docsis_dccreq_sf_unsol_grant_tref , { - "SF Sub - Unsolicited Grant Time Reference ", + "SF Sub - Unsolicited Grant Time Reference", "docsis_dccreq.sf_unsol_grant_tref", FT_UINT32, BASE_DEC, NULL, 0x0, - "SF Sub - Unsolicited Grant Time Reference ", + NULL, HFILL } }, {&hf_docsis_dccreq_cmts_mac_addr , { - "CMTS Mac Address ", + "CMTS Mac Address", "docsis_dccreq.cmts_mac_addr", FT_ETHER, BASE_DEC, NULL, 0x0, - "CMTS Mac Address ", + NULL, HFILL } }, {&hf_docsis_dccreq_key_seq_num , { - "Auth Key Sequence Number ", + "Auth Key Sequence Number", "docsis_dccreq.key_seq_num", FT_UINT8, BASE_DEC, NULL, 0x0, - "Auth Key Sequence Number ", + NULL, HFILL } }, {&hf_docsis_dccreq_hmac_digest , { - "HMAC-DigestNumber ", + "HMAC-DigestNumber", "docsis_dccreq.hmac_digest", - FT_BYTES, BASE_DEC, NULL, 0x0, - "HMAC-DigestNumber ", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c index 6c10573f9f..d1f1f523ed 100644 --- a/plugins/docsis/packet-dccrsp.c +++ b/plugins/docsis/packet-dccrsp.c @@ -188,55 +188,55 @@ proto_register_docsis_dccrsp (void) static hf_register_info hf[] = { {&hf_docsis_dccrsp_tran_id , { - "Transaction ID ", + "Transaction ID", "docsis_dccrsp.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction ID ", + NULL, HFILL } }, {&hf_docsis_dccrsp_conf_code , { - "Confirmation Code ", + "Confirmation Code", "docsis_dccrsp.conf_code", FT_UINT8, BASE_DEC, NULL, 0x0, - "Confirmation Code ", + NULL, HFILL } }, {&hf_docsis_dccrsp_cm_jump_time_length , { - "Jump Time Length ", + "Jump Time Length", "docsis_dccrsp.cm_jump_time_length", FT_UINT32, BASE_DEC, NULL, 0x0, - "Jump Time Length ", + NULL, HFILL } }, {&hf_docsis_dccrsp_cm_jump_time_start , { - "Jump Time Start ", + "Jump Time Start", "docsis_dccrsp.cm_jump_time_start", FT_UINT64, BASE_DEC, NULL, 0x0, - "Jump Time Start ", + NULL, HFILL } }, {&hf_docsis_dccrsp_key_seq_num , { - "Auth Key Sequence Number ", + "Auth Key Sequence Number", "docsis_dccrsp.key_seq_num", FT_UINT8, BASE_DEC, NULL, 0x0, - "Auth Key Sequence Number ", + NULL, HFILL } }, {&hf_docsis_dccrsp_hmac_digest , { - "HMAC-DigestNumber ", + "HMAC-DigestNumber", "docsis_dccrsp.hmac_digest", - FT_BYTES, BASE_DEC, NULL, 0x0, - "HMAC-DigestNumber ", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c index d5215923de..230adbc2d2 100644 --- a/plugins/docsis/packet-dcd.c +++ b/plugins/docsis/packet-dcd.c @@ -578,7 +578,7 @@ proto_register_docsis_dcd (void) "Configuration Change Count", "docsis_dcd.config_ch_cnt", FT_UINT8, BASE_DEC, NULL, 0x0, - "Configuration Change Count", + NULL, HFILL } }, @@ -587,7 +587,7 @@ proto_register_docsis_dcd (void) "Number of Fragments", "docsis_dcd.num_of_frag", FT_UINT8, BASE_DEC, NULL, 0x0, - "Number of Fragments", + NULL, HFILL } }, @@ -596,7 +596,7 @@ proto_register_docsis_dcd (void) "Fragment Sequence Number", "docsis_dcd.frag_sequence_num", FT_UINT8, BASE_DEC, NULL, 0x0, - "Fragment Sequence Number", + NULL, HFILL } }, @@ -605,7 +605,7 @@ proto_register_docsis_dcd (void) "Downstream Classifier Id", "docsis_dcd.cfr_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "Downstream Classifier Id", + NULL, HFILL } }, @@ -614,7 +614,7 @@ proto_register_docsis_dcd (void) "Downstream Classifier Rule Priority", "docsis_dcd.cfr_rule_pri", FT_UINT8, BASE_DEC, NULL, 0x0, - "Downstream Classifier Rule Priority", + NULL, HFILL } }, @@ -622,8 +622,8 @@ proto_register_docsis_dcd (void) { "Downstream Classifier IP Source Address", "docsis_dcd.cfr_ip_source_addr", - FT_IPv4, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP Source Address", + FT_IPv4, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, @@ -631,8 +631,8 @@ proto_register_docsis_dcd (void) { "Downstream Classifier IP Source Mask", "docsis_dcd.cfr_ip_source_mask", - FT_IPv4, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP Source Mask", + FT_IPv4, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, @@ -640,8 +640,8 @@ proto_register_docsis_dcd (void) { "Downstream Classifier IP Destination Address", "docsis_dcd.cfr_ip_dest_addr", - FT_IPv4, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP Destination Address", + FT_IPv4, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, @@ -649,7 +649,7 @@ proto_register_docsis_dcd (void) { "Downstream Classifier IP Destination Mask", "docsis_dcd.cfr_ip_dest_mask", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Downstream Classifier IP Destination Address", HFILL } @@ -659,7 +659,7 @@ proto_register_docsis_dcd (void) "Downstream Classifier IP TCP/UDP Source Port Start", "docsis_dcd.cfr_ip_tcpudp_srcport_start", FT_UINT16, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP TCP/UDP Source Port Start", + NULL, HFILL } }, @@ -668,7 +668,7 @@ proto_register_docsis_dcd (void) "Downstream Classifier IP TCP/UDP Source Port End", "docsis_dcd.cfr_ip_tcpudp_srcport_end", FT_UINT16, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP TCP/UDP Source Port End", + NULL, HFILL } }, @@ -677,7 +677,7 @@ proto_register_docsis_dcd (void) "Downstream Classifier IP TCP/UDP Destination Port Start", "docsis_dcd.cfr_ip_tcpudp_dstport_start", FT_UINT16, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP TCP/UDP Destination Port Start", + NULL, HFILL } }, @@ -686,70 +686,70 @@ proto_register_docsis_dcd (void) "Downstream Classifier IP TCP/UDP Destination Port End", "docsis_dcd.cfr_ip_tcpudp_dstport_end", FT_UINT16, BASE_DEC, NULL, 0x0, - "Downstream Classifier IP TCP/UDP Destination Port End", + NULL, HFILL } }, {&hf_docsis_dcd_rule_id, { - "DSG Rule Id ", + "DSG Rule Id", "docsis_dcd.rule_id", FT_UINT8, BASE_DEC, NULL, 0x0, - "DSG Rule Id ", + NULL, HFILL } }, {&hf_docsis_dcd_rule_pri, { - "DSG Rule Priority ", + "DSG Rule Priority", "docsis_dcd.rule_pri", FT_UINT8, BASE_DEC, NULL, 0x0, - "DSG Rule Priority ", + NULL, HFILL } }, {&hf_docsis_dcd_rule_ucid_list, { - "DSG Rule UCID Range ", + "DSG Rule UCID Range", "docsis_dcd.rule_ucid_list", - FT_BYTES, BASE_HEX, NULL, 0x0, - "DSG Rule UCID Range ", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, {&hf_docsis_dcd_clid_known_mac_addr, { - "DSG Rule Client ID Known MAC Address ", + "DSG Rule Client ID Known MAC Address", "docsis_dcd.clid_known_mac_addr", FT_ETHER, BASE_DEC, NULL, 0x0, - "DSG Rule Client ID Known MAC Address ", + NULL, HFILL } }, {&hf_docsis_dcd_clid_ca_sys_id, { - "DSG Rule Client ID CA System ID ", + "DSG Rule Client ID CA System ID", "docsis_dcd.clid_ca_sys_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG Rule Client ID CA System ID ", + NULL, HFILL } }, {&hf_docsis_dcd_clid_app_id, { - "DSG Rule Client ID Application ID ", + "DSG Rule Client ID Application ID", "docsis_dcd.clid_app_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG Rule Client ID Application ID ", + NULL, HFILL } }, {&hf_docsis_dcd_rule_tunl_addr, { - "DSG Rule Tunnel MAC Address ", + "DSG Rule Tunnel MAC Address", "docsis_dcd.rule_tunl_addr", FT_ETHER, BASE_DEC, NULL, 0x0, - "DSG Rule Tunnel MAC Address ", + NULL, HFILL } }, @@ -758,7 +758,7 @@ proto_register_docsis_dcd (void) "DSG Rule Classifier ID", "docsis_dcd.rule_cfr_id", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG Rule Classifier ID", + NULL, HFILL } }, @@ -766,8 +766,8 @@ proto_register_docsis_dcd (void) { "DSG Rule Vendor Specific Parameters", "docsis_dcd.rule_vendor_spec", - FT_BYTES, BASE_HEX, NULL, 0x0, - "DSG Rule Vendor Specific Parameters", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, @@ -776,43 +776,43 @@ proto_register_docsis_dcd (void) "DSG Configuration Channel", "docsis_dcd.cfg_chan", FT_UINT32, BASE_DEC, NULL, 0x0, - "DSG Configuration Channel", + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg1, { - "DSG Initialization Timeout (Tdsg1) ", + "DSG Initialization Timeout (Tdsg1)", "docsis_dcd.cfg_tdsg1", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG Initialization Timeout (Tdsg1) ", + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg2, { - "DSG Operational Timeout (Tdsg2) ", + "DSG Operational Timeout (Tdsg2)", "docsis_dcd.cfg_tdsg2", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG Operational Timeout (Tdsg2) ", + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg3, { - "DSG Two-Way Retry Timer (Tdsg3) ", + "DSG Two-Way Retry Timer (Tdsg3)", "docsis_dcd.cfg_tdsg3", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG Two-Way Retry Timer (Tdsg3) ", + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg4, { - "DSG One-Way Retry Timer (Tdsg4) ", + "DSG One-Way Retry Timer (Tdsg4)", "docsis_dcd.cfg_tdsg4", FT_UINT16, BASE_DEC, NULL, 0x0, - "DSG One-Way Retry Timer (Tdsg4) ", + NULL, HFILL } }, @@ -820,8 +820,8 @@ proto_register_docsis_dcd (void) { "DSG Configuration Vendor Specific Parameters", "docsis_dcd.cfg_vendor_spec", - FT_BYTES, BASE_HEX, NULL, 0x0, - "DSG Configuration Vendor Specific Parameters", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 2e17c8cd46..1876181b92 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -614,7 +614,7 @@ proto_register_docsis (void) {&hf_docsis_concat_cnt, {"Number of Concatenated Frames", "docsis.macparm", FT_UINT8, BASE_DEC, NULL, 0x0, - "Number of Concatenated Frames", HFILL} + NULL, HFILL} }, {&hf_docsis_ehdrlen, {"Extended Header Length (bytes)", "docsis.macparm", @@ -638,23 +638,23 @@ proto_register_docsis (void) }, {&hf_docsis_eh_val, {"Value", "docsis.ehdr.value", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "TLV Value", HFILL} }, {&hf_docsis_frag_rsvd, {"Reserved", "docsis.frag_rsvd", FT_UINT8, BASE_DEC, NULL, 0xC0, - "Reserved", HFILL} + NULL, HFILL} }, {&hf_docsis_frag_first, {"First Frame", "docsis.frag_first", FT_BOOLEAN, 8, NULL, 0x20, - "First Frame", HFILL} + NULL, HFILL} }, {&hf_docsis_frag_last, {"Last Frame", "docsis.frag_last", FT_BOOLEAN, 8, NULL, 0x10, - "Last Frame", HFILL} + NULL, HFILL} }, {&hf_docsis_frag_seq, {"Fragmentation Sequence #", "docsis.frag_seq", @@ -684,32 +684,32 @@ proto_register_docsis (void) {&hf_docsis_key_seq, {"Key Sequence", "docsis.ehdr.keyseq", FT_UINT8, BASE_DEC, NULL, 0xF0, - "Key Sequence", HFILL} + NULL, HFILL} }, {&hf_docsis_ehdr_ver, {"Version", "docsis.ehdr.ver", FT_UINT8, BASE_DEC, NULL, 0x0F, - "Version", HFILL} + NULL, HFILL} }, {&hf_docsis_ehdr_phsi, {"Payload Header Suppression Index", "docsis.ehdr.phsi", FT_UINT8, BASE_DEC, NULL, 0x0, - "Payload Header Suppression Index", HFILL} + NULL, HFILL} }, {&hf_docsis_ehdr_qind, {"Queue Indicator", "docsis.ehdr.qind", FT_BOOLEAN, 8, TFS(&qind_tfs), 0x80, - "Queue Indicator", HFILL} + NULL, HFILL} }, {&hf_docsis_ehdr_grants, {"Active Grants", "docsis.ehdr.act_grants", FT_UINT8, BASE_DEC, NULL, 0x7F, - "Active Grants", HFILL} + NULL, HFILL} }, {&hf_docsis_hcs, {"Header check sequence", "docsis.hcs", FT_UINT16, BASE_HEX, NULL, 0x0, - "Header check sequence", HFILL}, + NULL, HFILL}, }, {&hf_docsis_bpi_en, {"Encryption", "docsis.bpi_en", @@ -719,7 +719,7 @@ proto_register_docsis (void) {&hf_docsis_toggle_bit, {"Toggle", "docsis.toggle_bit", FT_BOOLEAN, 8, TFS (&odd_even_tfs), 0x40, - "Toggle", HFILL}, + NULL, HFILL}, }, }; diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c index 1284d014dc..d9b6b4d868 100644 --- a/plugins/docsis/packet-dsaack.c +++ b/plugins/docsis/packet-dsaack.c @@ -107,7 +107,7 @@ proto_register_docsis_dsaack (void) static hf_register_info hf[] = { {&hf_docsis_dsaack, {"Dynamic Service Add Ack", "docsis_dsaack", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Dynamic Service Add Request", HFILL} }, {&hf_docsis_dsaack_tranid, @@ -118,7 +118,7 @@ proto_register_docsis_dsaack (void) {&hf_docsis_dsaack_response, {"Confirmation Code", "docsis_dsaack.confcode", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Confirmation Code", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c index e3e4501374..f7670b7ed5 100644 --- a/plugins/docsis/packet-dsareq.c +++ b/plugins/docsis/packet-dsareq.c @@ -100,13 +100,13 @@ proto_register_docsis_dsareq (void) static hf_register_info hf[] = { {&hf_docsis_dsareq, {"Dynamic Service Addition Request", "docsis_dsareq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Dynamic Service Addition Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_dsareq_tranid, {"Transaction Id", "docsis_dsareq.tranid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction Id", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c index 9f1be4bcf9..6d4a177ddc 100644 --- a/plugins/docsis/packet-dsarsp.c +++ b/plugins/docsis/packet-dsarsp.c @@ -110,8 +110,8 @@ proto_register_docsis_dsarsp (void) static hf_register_info hf[] = { {&hf_docsis_dsarsp, {"Dynamic Service Add Request", "docsis_dsarsp", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Dynamic Service Add Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_dsarsp_tranid, {"Transaction Id", "docsis_dsarsp.tranid", @@ -121,7 +121,7 @@ proto_register_docsis_dsarsp (void) {&hf_docsis_dsarsp_response, {"Confirmation Code", "docsis_dsarsp.confcode", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Confirmation Code", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index 529f8e2c1a..a7b27e7762 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -109,7 +109,7 @@ proto_register_docsis_dscack (void) static hf_register_info hf[] = { {&hf_docsis_dscack, {"Dynamic Service Change Ack", "docsis_dscack", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Dynamic Service Add Request", HFILL} }, {&hf_docsis_dscack_tranid, @@ -120,7 +120,7 @@ proto_register_docsis_dscack (void) {&hf_docsis_dscack_response, {"Confirmation Code", "docsis_dscack.confcode", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Confirmation Code", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c index fa6cbf0442..18ada3e02c 100644 --- a/plugins/docsis/packet-dscreq.c +++ b/plugins/docsis/packet-dscreq.c @@ -101,13 +101,13 @@ proto_register_docsis_dscreq (void) static hf_register_info hf[] = { {&hf_docsis_dscreq, {"Dynamic Service Change Request", "docsis_dscreq", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Dynamic Service Addition Request", HFILL} }, {&hf_docsis_dscreq_tranid, {"Transaction Id", "docsis_dscreq.tranid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction Id", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c index c70c920203..68d7f52a72 100644 --- a/plugins/docsis/packet-dscrsp.c +++ b/plugins/docsis/packet-dscrsp.c @@ -108,7 +108,7 @@ proto_register_docsis_dscrsp (void) static hf_register_info hf[] = { {&hf_docsis_dscrsp, {"Dynamic Service Change Request", "docsis_dscrsp", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Dynamic Service Add Request", HFILL} }, {&hf_docsis_dscrsp_tranid, @@ -119,7 +119,7 @@ proto_register_docsis_dscrsp (void) {&hf_docsis_dscrsp_response, {"Confirmation Code", "docsis_dscrsp.confcode", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Confirmation Code", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 26b76cd801..0be18a9f73 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -105,18 +105,18 @@ proto_register_docsis_dsdreq (void) static hf_register_info hf[] = { {&hf_docsis_dsdreq, {"Dynamic Service Delete Request", "docsis_dsdreq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Dynamic Service Delete Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_dsdreq_tranid, {"Transaction Id", "docsis_dsdreq.tranid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction Id", HFILL} + NULL, HFILL} }, {&hf_docsis_dsdreq_rsvd, {"Reserved", "docsis_dsdreq.rsvd", FT_UINT16, BASE_HEX, NULL, 0x0, - "Reserved", HFILL} + NULL, HFILL} }, {&hf_docsis_dsdreq_sfid, {"Service Flow ID", "docsis_dsdreq.sfid", diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c index 0e6865c833..89a7333b14 100644 --- a/plugins/docsis/packet-dsdrsp.c +++ b/plugins/docsis/packet-dsdrsp.c @@ -104,23 +104,23 @@ proto_register_docsis_dsdrsp (void) static hf_register_info hf[] = { {&hf_docsis_dsdrsp, {"Dynamic Service Delete Response", "docsis_dsdrsp", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Dynamic Service Delete Response", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_dsdrsp_tranid, {"Transaction Id", "docsis_dsdrsp.tranid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Transaction Id", HFILL} + NULL, HFILL} }, {&hf_docsis_dsdrsp_confcode, {"Confirmation Code", "docsis_dsdrsp.confcode", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Confirmation Code", HFILL} + NULL, HFILL} }, {&hf_docsis_dsdrsp_rsvd, {"Reserved", "docsis_dsdrsp.rsvd", FT_UINT8, BASE_DEC, NULL, 0x0, - "Reserved", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c index 024eb02455..d0eec7d7a3 100644 --- a/plugins/docsis/packet-intrngreq.c +++ b/plugins/docsis/packet-intrngreq.c @@ -101,23 +101,23 @@ proto_register_docsis_intrngreq (void) static hf_register_info hf[] = { {&hf_docsis_intrngreq, {"RNG-REQ Message", "docsis_intrngreq", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Ranging Request Message", HFILL} }, {&hf_docsis_intrngreq_sid, {"Service Identifier", "docsis_intrngreq.sid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Service Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_intrngreq_down_chid, {"Downstream Channel ID", "docsis_intrngreq.downchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Downstream Channel ID", HFILL} + NULL, HFILL} }, {&hf_docsis_intrngreq_up_chid, {"Upstream Channel ID", "docsis_intrngreq.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel ID", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 2208e5b68c..38693c7cca 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -204,18 +204,18 @@ proto_register_docsis_mgmt (void) static hf_register_info hf[] = { {&hf_docsis_mgt_hdr, {"Mac Management Header", "docsis_mgmt", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Mac Management Header", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_mgt_dst_addr, {"Destination Address", "docsis_mgmt.dst", FT_ETHER, BASE_HEX, NULL, 0x0, - "Destination Address", HFILL} + NULL, HFILL} }, {&hf_docsis_mgt_src_addr, {"Source Address", "docsis_mgmt.src", FT_ETHER, BASE_HEX, NULL, 0x0, - "Source Address", HFILL} + NULL, HFILL} }, {&hf_docsis_mgt_msg_len, {"Message Length - DSAP to End (Bytes)", "docsis_mgmt.msglen", @@ -240,12 +240,12 @@ proto_register_docsis_mgmt (void) {&hf_docsis_mgt_version, {"Version", "docsis_mgmt.version", FT_UINT8, BASE_DEC, NULL, 0x0, - "Version", HFILL} + NULL, HFILL} }, {&hf_docsis_mgt_type, {"Type", "docsis_mgmt.type", FT_UINT8, BASE_DEC, VALS (mgmt_type_vals), 0x0, - "Type", HFILL} + NULL, HFILL} }, {&hf_docsis_mgt_rsvd, {"Reserved [0x00]", "docsis_mgmt.rsvd", diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index dc37e3ca21..e530c964bf 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -191,7 +191,7 @@ proto_register_docsis_map (void) static hf_register_info hf[] = { {&hf_docsis_map, {"Map Message", "docsis_map", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "MAP Message", HFILL} }, {&hf_docsis_map_ucd_count, @@ -202,7 +202,7 @@ proto_register_docsis_map (void) {&hf_docsis_map_upstream_chid, {"Upstream Channel ID", "docsis_map.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel ID", HFILL} + NULL, HFILL} }, {&hf_docsis_map_numie, {"Number of IE's", "docsis_map.numie", @@ -212,7 +212,7 @@ proto_register_docsis_map (void) {&hf_docsis_map_alloc_start, {"Alloc Start Time (minislots)", "docsis_map.allocstart", FT_UINT32, BASE_DEC, NULL, 0x0, - "Alloc Start Time (minislots)", HFILL} + NULL, HFILL} }, {&hf_docsis_map_ack_time, {"ACK Time (minislots)", "docsis_map.acktime", @@ -222,27 +222,27 @@ proto_register_docsis_map (void) {&hf_docsis_map_rng_start, {"Ranging Backoff Start", "docsis_map.rng_start", FT_UINT8, BASE_DEC, NULL, 0x0, - "Ranging Backoff Start", HFILL} + NULL, HFILL} }, {&hf_docsis_map_rng_end, {"Ranging Backoff End", "docsis_map.rng_end", FT_UINT8, BASE_DEC, NULL, 0x0, - "Ranging Backoff End", HFILL} + NULL, HFILL} }, {&hf_docsis_map_data_start, {"Data Backoff Start", "docsis_map.data_start", FT_UINT8, BASE_DEC, NULL, 0x0, - "Data Backoff Start", HFILL} + NULL, HFILL} }, {&hf_docsis_map_data_end, {"Data Backoff End", "docsis_map.data_end", FT_UINT8, BASE_DEC, NULL, 0x0, - "Data Backoff End", HFILL} + NULL, HFILL} }, {&hf_docsis_map_ie, {"Information Element", "docsis_map.ie", FT_UINT32, BASE_HEX, NULL, 0x0, - "Information Element", HFILL} + NULL, HFILL} }, {&hf_docsis_map_rsvd, {"Reserved [0x00]", "docsis_map.rsvd", @@ -252,17 +252,17 @@ proto_register_docsis_map (void) {&hf_docsis_map_sid, {"Service Identifier", "docsis_map.sid", FT_UINT32, BASE_DEC, NULL, 0xFFFC0000, - "Service Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_map_iuc, {"Interval Usage Code", "docsis_map.iuc", FT_UINT32, BASE_DEC, VALS(iuc_vals), 0x0003c000, - "Interval Usage Code", HFILL} + NULL, HFILL} }, {&hf_docsis_map_offset, {"Offset", "docsis_map.offset", FT_UINT32, BASE_DEC, NULL, 0x00003fff, - "Offset", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index d871a67a5e..7181a703b7 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -551,7 +551,7 @@ void proto_register_docsis_mdd (void) static hf_register_info hf[] = { {&hf_docsis_mdd, {"Map Message", "docsis_mdd", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "MAP Message", HFILL} }, {&hf_docsis_mdd_ccc, diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c index 33116581b5..a4fca36253 100644 --- a/plugins/docsis/packet-regack.c +++ b/plugins/docsis/packet-regack.c @@ -107,18 +107,18 @@ proto_register_docsis_regack (void) static hf_register_info hf[] = { {&hf_docsis_regack, {"Registration Request", "docsis_regack", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Registration Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_regack_sid, {"Service Identifier", "docsis_regack.sid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Service Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_regack_response, {"Response Code", "docsis_regack.respnse", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Response Code", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c index 4aed3f3ca8..a5a13541e1 100644 --- a/plugins/docsis/packet-regreq.c +++ b/plugins/docsis/packet-regreq.c @@ -102,13 +102,13 @@ proto_register_docsis_regreq (void) static hf_register_info hf[] = { {&hf_docsis_regreq, {"Registration Request", "docsis_regreq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Registration Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_regreq_sid, {"Service Identifier", "docsis_regreq.sid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Service Identifier", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c index 2346ca0662..663b1fc8a6 100644 --- a/plugins/docsis/packet-regreqmp.c +++ b/plugins/docsis/packet-regreqmp.c @@ -98,8 +98,8 @@ proto_register_docsis_regreqmp (void) static hf_register_info hf[] = { {&hf_docsis_regreqmp, {"REG-REQ-MP Message", "docsis_regreqmp", - FT_BYTES, BASE_HEX, NULL, 0x0, - "REG-REQ-MP Message", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_regreqmp_sid, {"Sid", "docsis_regreqmp.sid", diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c index 3d592c3473..aa51d1767e 100644 --- a/plugins/docsis/packet-regrsp.c +++ b/plugins/docsis/packet-regrsp.c @@ -105,18 +105,18 @@ proto_register_docsis_regrsp (void) static hf_register_info hf[] = { {&hf_docsis_regrsp, {"Registration Response", "docsis_regrsp", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Registration Request", HFILL} }, {&hf_docsis_regrsp_sid, {"Service Identifier", "docsis_regrsp.sid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Service Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_regrsp_response, {"Response Code", "docsis_regrsp.respnse", FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0, - "Response Code", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c index 3ca42eb99d..e3403895b5 100644 --- a/plugins/docsis/packet-regrspmp.c +++ b/plugins/docsis/packet-regrspmp.c @@ -105,8 +105,8 @@ proto_register_docsis_regrspmp (void) static hf_register_info hf[] = { {&hf_docsis_regrspmp, {"REG-RSP-MP Message", "docsis_regrspmp", - FT_BYTES, BASE_HEX, NULL, 0x0, - "REG-RSP-MP Message", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_regrspmp_sid, {"Sid", "docsis_regrspmp.sid", diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c index 3053a07109..7677f504ca 100644 --- a/plugins/docsis/packet-rngreq.c +++ b/plugins/docsis/packet-rngreq.c @@ -105,18 +105,18 @@ proto_register_docsis_rngreq (void) static hf_register_info hf[] = { {&hf_docsis_rngreq, {"RNG-REQ Message", "docsis_rngreq", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Ranging Request Message", HFILL} }, {&hf_docsis_rngreq_sid, {"Service Identifier", "docsis_rngreq.sid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Service Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_rngreq_down_chid, {"Downstream Channel ID", "docsis_rngreq.downchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Downstream Channel ID", HFILL} + NULL, HFILL} }, {&hf_docsis_rngreq_pend_compl, {"Pending Till Complete", "docsis_rngreq.pendcomp", diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c index eee62a5285..e65d406b24 100644 --- a/plugins/docsis/packet-rngrsp.c +++ b/plugins/docsis/packet-rngrsp.c @@ -212,18 +212,18 @@ proto_register_docsis_rngrsp (void) static hf_register_info hf[] = { {&hf_docsis_rngrsp, {"RNG-RSP Message", "docsis_rngrsp", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Ranging Response Message", HFILL} }, {&hf_docsis_rngrsp_sid, {"Service Identifier", "docsis_rngrsp.sid", FT_UINT16, BASE_DEC, NULL, 0x0, - "Service Identifier", HFILL} + NULL, HFILL} }, {&hf_docsis_rngrsp_upstream_chid, {"Upstream Channel ID", "docsis_rngrsp.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel ID", HFILL} + NULL, HFILL} }, {&hf_docsis_rngrsp_timing_adj, {"Timing Adjust (6.25us/64)", "docsis_rngrsp.timingadj", @@ -242,13 +242,13 @@ proto_register_docsis_rngrsp (void) }, {&hf_docsis_rngrsp_xmit_eq_adj, {"Transmit Equalisation Adjust", "docsis_rngrsp.xmit_eq_adj", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Timing Equalisation Adjust", HFILL} }, {&hf_docsis_rngrsp_ranging_status, {"Ranging Status", "docsis_rngrsp.rng_stat", FT_UINT8, BASE_DEC, VALS (rng_stat_vals), 0x0, - "Ranging Status", HFILL} + NULL, HFILL} }, {&hf_docsis_rngrsp_down_freq_over, {"Downstream Frequency Override (Hz)", "docsis_rngrsp.freq_over", @@ -258,7 +258,7 @@ proto_register_docsis_rngrsp (void) {&hf_docsis_rngrsp_upstream_ch_over, {"Upstream Channel ID Override", "docsis_rngrsp.chid_override", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel ID Override", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c index 4e2668f8bd..758317f83a 100644 --- a/plugins/docsis/packet-sync.c +++ b/plugins/docsis/packet-sync.c @@ -83,8 +83,8 @@ proto_register_docsis_sync (void) static hf_register_info hf[] = { {&hf_docsis_sync, {"SYNC Message", "docsis_sync", - FT_BYTES, BASE_HEX, NULL, 0x0, - "SYNC Message", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_sync_cmts_timestamp, {"CMTS Timestamp", "docsis_sync.cmts_timestamp", diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index c799e90bde..ee53fca30a 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -2102,8 +2102,8 @@ proto_register_docsis_tlv (void) static hf_register_info hf[] = { {&hf_docsis_tlv, {"TLV Data", "docsis_tlv", - FT_BYTES, BASE_HEX, NULL, 0x0, - "TLV Data", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_down_freq, {"1 Downstream Frequency", "docsis_tlv.downfreq", @@ -2122,8 +2122,8 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_cos, {"4 COS Encodings", "docsis_tlv.cos", - FT_BYTES, BASE_HEX, NULL, 0x0, - "4 COS Encodings", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_cos_id, {".1 Class ID", "docsis_tlv.cos.id", @@ -2167,7 +2167,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_mcap, {"5 Modem Capabilities", "docsis_tlv.mcap", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Modem Capabilities", HFILL} }, {&hf_docsis_tlv_mcap_concat, @@ -2237,42 +2237,42 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_cm_mic, {"6 CM MIC", "docsis_tlv.cmmic", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Cable Modem Message Integrity Check", HFILL} }, {&hf_docsis_tlv_cmts_mic, {"7 CMTS MIC", "docsis_tlv.cmtsmic", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "CMTS Message Integrity Check", HFILL} }, {&hf_docsis_tlv_vendor_id, {"8 Vendor ID", "docsis_tlv.vendorid", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Identifier", HFILL} }, {&hf_docsis_tlv_sw_file, {"9 Software Upgrade File", "docsis_tlv.sw_upg_file", - FT_STRINGZ, BASE_DEC, NULL, 0x0, + FT_STRINGZ, BASE_NONE, NULL, 0x0, "Software Upgrade File", HFILL} }, {&hf_docsis_tlv_snmp_access, {"10 SNMP Write Access", "docsis_tlv.snmp_access", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SNMP Write Access", HFILL} }, {&hf_docsis_tlv_snmp_obj, {"11 SNMP Object", "docsis_tlv.snmp_obj", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SNMP Object", HFILL} }, {&hf_docsis_tlv_modem_addr, {"12 Modem IP Address", "docsis_tlv.modemaddr", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Modem IP Address", HFILL} }, {&hf_docsis_tlv_svc_unavail, {"13 Service Not Available Response", "docsis_tlv.svcunavail", - FT_BYTES, BASE_DEC, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Service Not Available Response", HFILL} }, {&hf_docsis_tlv_svc_unavail_classid, @@ -2283,12 +2283,12 @@ proto_register_docsis_tlv (void) {&hf_docsis_tlv_svc_unavail_type, {"Service Not Available (Type)", "docsis_tlv.svcunavail.type", FT_UINT8, BASE_DEC, NULL, 0x0, - "Service Not Available (Type)", HFILL} + NULL, HFILL} }, {&hf_docsis_tlv_svc_unavail_code, {"Service Not Available (Code)", "docsis_tlv.svcunavail.code", FT_UINT8, BASE_DEC, VALS(docsis_conf_code), 0x0, - "Service Not Available (Code)", HFILL} + NULL, HFILL} }, {&hf_docsis_tlv_cpe_ethernet, {"14 CPE Ethernet Addr", "docsis_tlv.cpe_ether", @@ -2297,7 +2297,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_bpi, {"17 Baseline Privacy Encoding", "docsis_tlv.bpi", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Baseline Privacy Encoding", HFILL} }, {&hf_docsis_tlv_max_cpe, @@ -2312,23 +2312,23 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_tftp_prov_modem_address, {"20 TFTP Server Provisioned Modem Addr", "docsis_tlv.tftpmodemaddr", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "TFTP Server Provisioned Modem Addr", HFILL} }, {&hf_docsis_tlv_sw_upg_srvr, {"21 Software Upgrade Server", "docsis_tlv.sw_upg_srvr", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Software Upgrade Server", HFILL} }, {&hf_docsis_tlv_upclsfr, {"22 Upstream Classifier", "docsis_tlv.upclsfr", - FT_BYTES, BASE_HEX, NULL, 0x0, - "22 Upstream Classifier", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_downclsfr, {"23 Downstream Classifier", "docsis_tlv.downclsfr", - FT_BYTES, BASE_HEX, NULL, 0x0, - "23 Downstream Classifier", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_clsfr_ref, {".1 Classifier Ref", "docsis_tlv.clsfr.ref", @@ -2367,7 +2367,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_clsfr_err, {".8 Error Encodings", "docsis_tlv.clsfr.err", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Error Encodings", HFILL} }, {&hf_docsis_tlv_clsfr_err_param, @@ -2382,17 +2382,17 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_clsfr_err_msg, {"..3 Error Message", "docsis_tlv.clsfr.err.msg", - FT_STRINGZ, BASE_DEC, NULL, 0x0, + FT_STRINGZ, BASE_NONE, NULL, 0x0, "Error Message", HFILL} }, {&hf_docsis_tlv_ipclsfr, {".9 IP Classifier Encodings", "docsis_tlv.clsfr.ip", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "IP Classifier Encodings", HFILL} }, {&hf_docsis_tlv_ipclsfr_tosmask, {"..1 Type Of Service Mask", "docsis_tlv.clsfr.ip.tosmask", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Type Of Service Mask", HFILL} }, {&hf_docsis_tlv_ipclsfr_ipproto, @@ -2402,22 +2402,22 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_ipclsfr_src, {"..3 Source Address", "docsis_tlv.clsfr.ip.src", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Source Address", HFILL} }, {&hf_docsis_tlv_ipclsfr_dst, {"..4 Destination Address", "docsis_tlv.clsfr.ip.dst", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Destination Address", HFILL} }, {&hf_docsis_tlv_ipclsfr_srcmask, {"..5 Source Mask", "docsis_tlv.clsfr.ip.smask", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Source Mask", HFILL} }, {&hf_docsis_tlv_ipclsfr_dstmask, {"..6 Destination Mask", "docsis_tlv.clsfr.ip.dmask", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "Destination Mask", HFILL} }, {&hf_docsis_tlv_ipclsfr_sport_start, @@ -2442,7 +2442,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_ethclsfr, {".10 Ethernet Classifier Encodings", "docsis_tlv.clsfr.eth", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Ethernet Classifier Encodings", HFILL} }, {&hf_docsis_tlv_ethclsfr_dmac, @@ -2462,7 +2462,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_dot1qclsfr, {".11 802.1Q Classifier Encodings", "docsis_tlv.clsfr.dot1q", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "802.1Q Classifier Encodings", HFILL} }, {&hf_docsis_tlv_dot1qclsfr_user_pri, @@ -2477,23 +2477,23 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_dot1qclsfr_vendorspec, {"..43 Vendor Specific Encodings", "docsis_tlv.clsfr.dot1q.vendorspec", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Specific Encodings", HFILL} }, {&hf_docsis_tlv_clsfr_vendor_spc, {".43 Vendor Specific Encodings", "docsis_tlv.clsfr.vendor", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Specific Encodings", HFILL} }, {&hf_docsis_tlv_upsflow, {"24 Upstream Service Flow", "docsis_tlv.upsflow", - FT_BYTES, BASE_HEX, NULL, 0x0, - "24 Upstream Service Flow", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_downsflow, {"25 Downstream Service Flow", "docsis_tlv.downsflow", - FT_BYTES, BASE_HEX, NULL, 0x0, - "25 Downstream Service Flow", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_sflow_ref, {".1 Service Flow Ref", "docsis_tlv.sflow.ref", @@ -2512,12 +2512,12 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_sflow_classname, {".4 Service Class Name", "docsis_tlv.sflow.cname", - FT_STRINGZ, BASE_HEX, NULL, 0x0, + FT_STRINGZ, BASE_NONE, NULL, 0x0, "Service Class Name", HFILL} }, {&hf_docsis_tlv_sflow_err, {".5 Error Encodings", "docsis_tlv.sflow.err", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Error Encodings", HFILL} }, {&hf_docsis_tlv_sflow_err_param, @@ -2532,7 +2532,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_sflow_err_msg, {"..3 Error Message", "docsis_tlv.sflow.err.msg", - FT_STRINGZ, BASE_DEC, NULL, 0x0, + FT_STRINGZ, BASE_NONE, NULL, 0x0, "Error Message", HFILL} }, {&hf_docsis_tlv_sflow_qos_param, @@ -2643,12 +2643,12 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_sflow_vendor_spec, {".43 Vendor Specific Encodings", "docsis_tlv.sflow.vendorspec", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Specific Encodings", HFILL} }, {&hf_docsis_tlv_phs, {"26 PHS Rules", "docsis_tlv.phs", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "PHS Rules", HFILL} }, {&hf_docsis_tlv_phs_class_ref, @@ -2678,7 +2678,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_phs_err, {".6 Error Encodings", "docsis_tlv.phs.err", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Error Encodings", HFILL} }, {&hf_docsis_tlv_phs_err_param, @@ -2693,12 +2693,12 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_phs_err_msg, {"..3 Error Message", "docsis_tlv.phs.err.msg", - FT_STRINGZ, BASE_DEC, NULL, 0x0, + FT_STRINGZ, BASE_NONE, NULL, 0x0, "Error Message", HFILL} }, {&hf_docsis_tlv_phs_phsf, {".7 PHS Field", "docsis_tlv.phs.phsf", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "PHS Field", HFILL} }, {&hf_docsis_tlv_phs_phsi, @@ -2708,7 +2708,7 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_phs_phsm, {".9 PHS Mask", "docsis_tlv.phs.phsm", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "PHS Mask", HFILL} }, {&hf_docsis_tlv_phs_phss, @@ -2723,12 +2723,12 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_phs_vendorspec, {".43 PHS Vendor Specific", "docsis_tlv.phs.vendorspec", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "PHS Vendor Specific", HFILL} }, {&hf_docsis_tlv_hmac_digest, {"27 HMAC Digest", "docsis_tlv.hmac_digest", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "HMAC Digest", HFILL} }, {&hf_docsis_tlv_max_classifiers, @@ -2743,68 +2743,68 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_auth_block, {"30 Auth Block", "docsis_tlv.auth_block", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Auth Block", HFILL} }, {&hf_docsis_tlv_key_seq_num, {"31 Key Sequence Number", "docsis_tlv.key_seq", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Key Sequence Number", HFILL} }, {&hf_docsis_tlv_mfgr_cvc, {"32 Manufacturer CVC", "docsis_tlv.mfgr_cvc", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Manufacturer CVC", HFILL} }, {&hf_docsis_tlv_cosign_cvc, {"33 Co-Signer CVC", "docsis_tlv.cosign_cvc", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Co-Signer CVC", HFILL} }, {&hf_docsis_tlv_snmpv3_kick, {"34 SNMPv3 Kickstart Value", "docsis_tlv.snmpv3", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SNMPv3 Kickstart Value", HFILL} }, {&hf_docsis_tlv_snmpv3_kick_name, {".1 SNMPv3 Kickstart Security Name", "docsis_tlv.snmpv3.secname", - FT_STRING, BASE_DEC, NULL, 0x0, + FT_STRING, BASE_NONE, NULL, 0x0, "SNMPv3 Kickstart Security Name", HFILL} }, {&hf_docsis_tlv_snmpv3_kick_publicnum, {".2 SNMPv3 Kickstart Manager Public Number", "docsis_tlv.snmpv3.publicnum", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SNMPv3 Kickstart Value Manager Public Number", HFILL} }, {&hf_docsis_tlv_subs_mgmt_ctrl, {"35 Subscriber Management Control", "docsis_tlv.subsmgmtctrl", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Subscriber Management Control", HFILL} }, {&hf_docsis_tlv_subs_mgmt_ip_table, {"36 Subscriber Management CPE IP Table", "docsis_tlv.subsiptable", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Subscriber Management CPE IP Table", HFILL} }, {&hf_docsis_tlv_subs_mgmt_ip_entry, {"Subscriber Management CPE IP Entry", "docsis_tlv.subsipentry", - FT_IPv4, BASE_DEC, NULL, 0x0, - "Subscriber Management CPE IP Entry", HFILL} + FT_IPv4, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_tlv_subs_mgmt_filter_grps, {"37 Subscriber Management Filter Groups", "docsis_tlv.subsfltrgrps", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Subscriber Management Filter Groups", HFILL} }, {&hf_docsis_tlv_vendor_spec, {"43 Vendor Specific Encodings", "docsis_tlv.vendorspec", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Specific Encodings", HFILL} }, {&hf_docsis_tlv_rng_tech, {"Ranging Technique", "docsis_tlv.rng_tech", FT_UINT8, BASE_DEC, VALS (rng_tech_vals), 0x0, - "Ranging Technique", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index ea7c9a0f2c..c9d2257936 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -838,7 +838,7 @@ proto_register_docsis_type29ucd (void) {&hf_docsis_type29ucd_upstream_chid, {"Upstream Channel ID", "docsis_type29ucd.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel ID", HFILL} + NULL, HFILL} }, {&hf_docsis_type29ucd_config_ch_cnt, {"Config Change Count", "docsis_type29ucd.confcngcnt", @@ -848,7 +848,7 @@ proto_register_docsis_type29ucd (void) {&hf_docsis_type29ucd_mini_slot_size, {"Mini Slot Size (6.25us TimeTicks)", "docsis_type29ucd.mslotsize", FT_UINT8, BASE_DEC, NULL, 0x0, - "Mini Slot Size (6.25us TimeTicks)", HFILL} + NULL, HFILL} }, {&hf_docsis_type29ucd_down_chid, {"Downstream Channel ID", "docsis_type29ucd.downchid", @@ -867,13 +867,13 @@ proto_register_docsis_type29ucd (void) }, {&hf_docsis_type29ucd_preamble_pat, {"3 Preamble Pattern", "docsis_type29ucd.preamble", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Preamble Superstring", HFILL} }, {&hf_docsis_type29ucd_iuc, {"Interval Usage Code", "docsis_type29ucd.iuc", FT_UINT8, BASE_DEC, VALS (iuc_vals2), 0x0, - "Interval Usage Code", HFILL} + NULL, HFILL} }, {&hf_docsis_burst_mod_type, {"1 Modulation Type", "docsis_type29ucd.burst.modtype", @@ -945,57 +945,57 @@ proto_register_docsis_type29ucd (void) * */ {&hf_docsis_type29ucd_ext_preamble, {"6 Extended Preamble Pattern", "docsis_type29ucd.extpreamble", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Extended Preamble Pattern", HFILL} }, {&hf_docsis_type29ucd_scdma_mode_enable, {"7 SCDMA Mode Enable", "docsis_type29ucd.scdmaenable", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA Mode Enable", HFILL} }, {&hf_docsis_type29ucd_scdma_spreading_interval, {"8 SCDMA Spreading Interval", "docsis_type29ucd.scdmaspreadinginterval", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA Spreading Interval", HFILL} }, {&hf_docsis_type29ucd_scdma_codes_per_mini_slot, {"9 SCDMA Codes per mini slot", "docsis_type29ucd.scdmacodesperminislot", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA Codes per mini slot", HFILL} }, {&hf_docsis_type29ucd_scdma_active_codes, {"10 SCDMA Active Codes", "docsis_type29ucd.scdmaactivecodes", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA Active Codes", HFILL} }, {&hf_docsis_type29ucd_scdma_code_hopping_seed, {"11 SCDMA Code Hopping Seed", "docsis_type29ucd.scdmacodehoppingseed", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA Code Hopping Seed", HFILL} }, {&hf_docsis_type29ucd_scdma_us_ratio_num, {"12 SCDMA US Ratio Numerator", "docsis_type29ucd.scdmausrationum", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA US Ratio Numerator", HFILL} }, {&hf_docsis_type29ucd_scdma_us_ratio_denom, {"13 SCDMA US Ratio Denominator", "docsis_type29ucd.scdmausratiodenom", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA US Ratio Denominator", HFILL} }, {&hf_docsis_type29ucd_scdma_timestamp_snapshot, {"14 SCDMA Timestamp Snapshot", "docsis_type29ucd.scdmatimestamp", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "SCDMA Timestamp Snapshot", HFILL} }, {&hf_docsis_type29ucd_maintain_power_spectral_density, {"15 Maintain power spectral density", "docsis_type29ucd.maintainpowerspectraldensity", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Maintain power spectral density", HFILL} }, {&hf_docsis_type29ucd_ranging_required, {"16 Ranging Required", "docsis_type29ucd.rangingrequired", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Ranging Required", HFILL} }, /* #define type29ucd_RS_INT_DEPTH 12 diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c index af0c6f2eb0..781496813f 100644 --- a/plugins/docsis/packet-uccreq.c +++ b/plugins/docsis/packet-uccreq.c @@ -102,13 +102,13 @@ proto_register_docsis_uccreq (void) static hf_register_info hf[] = { {&hf_docsis_uccreq, {"Upstream Channel Change Request", "docsis_uccreq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Upstream Channel Change Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_uccreq_upchid, {"Upstream Channel Id", "docsis_uccreq.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel Id", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c index f5e79b254f..1b7006bd36 100644 --- a/plugins/docsis/packet-uccrsp.c +++ b/plugins/docsis/packet-uccrsp.c @@ -95,13 +95,13 @@ proto_register_docsis_uccrsp (void) static hf_register_info hf[] = { {&hf_docsis_uccrsp, {"Upstream Channel Change Request", "docsis_uccrsp", - FT_BYTES, BASE_HEX, NULL, 0x0, - "Upstream Channel Change Request", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_uccrsp_upchid, {"Upstream Channel Id", "docsis_uccrsp.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel Id", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index c7230796b6..58afce1b62 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -664,7 +664,7 @@ proto_register_docsis_ucd (void) {&hf_docsis_ucd_upstream_chid, {"Upstream Channel ID", "docsis_ucd.upchid", FT_UINT8, BASE_DEC, NULL, 0x0, - "Upstream Channel ID", HFILL} + NULL, HFILL} }, {&hf_docsis_ucd_config_ch_cnt, {"Config Change Count", "docsis_ucd.confcngcnt", @@ -674,7 +674,7 @@ proto_register_docsis_ucd (void) {&hf_docsis_ucd_mini_slot_size, {"Mini Slot Size (6.25us TimeTicks)", "docsis_ucd.mslotsize", FT_UINT8, BASE_DEC, NULL, 0x0, - "Mini Slot Size (6.25us TimeTicks)", HFILL} + NULL, HFILL} }, {&hf_docsis_ucd_down_chid, {"Downstream Channel ID", "docsis_ucd.downchid", @@ -703,13 +703,13 @@ proto_register_docsis_ucd (void) }, {&hf_docsis_ucd_preamble_pat, {"Preamble Pattern", "docsis_ucd.preamble", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Preamble Superstring", HFILL} }, {&hf_docsis_ucd_iuc, {"Interval Usage Code", "docsis_ucd.iuc", FT_UINT8, BASE_DEC, VALS (iuc_vals), 0x0, - "Interval Usage Code", HFILL} + NULL, HFILL} }, {&hf_docsis_burst_mod_type, {"1 Modulation Type", "docsis_ucd.burst.modtype", diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c index 6c6d96ac8c..deab7afb7a 100644 --- a/plugins/docsis/packet-vendor.c +++ b/plugins/docsis/packet-vendor.c @@ -239,7 +239,7 @@ proto_register_docsis_vsif (void) static hf_register_info hf[] = { {&hf_docsis_vsif, {"VSIF Encodings", "docsis_vsif", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Specific Encodings", HFILL} }, {&hf_docsis_vsif_vendorid, @@ -249,33 +249,33 @@ proto_register_docsis_vsif (void) }, {&hf_docsis_vsif_vendor_unknown, {"VSIF Encodings", "docsis_vsif.unknown", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "Unknown Vendor", HFILL} }, {&hf_docsis_vsif_cisco_numphones, {"Number of phone lines", "docsis_vsif.cisco.numphones", FT_UINT8, BASE_DEC, NULL, 0x0, - "Number of phone lines", HFILL} + NULL, HFILL} }, {&hf_docsis_vsif_cisco_ipprec, {"IP Precedence Encodings", "docsis_vsif.cisco.ipprec", - FT_BYTES, BASE_HEX, NULL, 0x0, - "IP Precedence Encodings", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, {&hf_docsis_vsif_cisco_ipprec_val, {"IP Precedence Value", "docsis_vsif.cisco.ipprec.value", FT_UINT8, BASE_DEC, NULL, 0x0, - "IP Precedence Value", HFILL} + NULL, HFILL} }, {&hf_docsis_vsif_cisco_ipprec_bw, {"IP Precedence Bandwidth", "docsis_vsif.cisco.ipprec.bw", FT_UINT8, BASE_DEC, NULL, 0x0, - "IP Precedence Bandwidth", HFILL} + NULL, HFILL} }, {&hf_docsis_vsif_cisco_config_file, {"IOS Config File", "docsis_vsif.cisco.iosfile", - FT_STRING, BASE_DEC, NULL, 0x0, - "IOS Config File", HFILL} + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, }; |