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 | |
| parent | b228488bc0b9d5e0c63b15814836f7332f35ce04 (diff) | |
From Kovarththanan Rajaratnam via bug 3548:
Cleanup header_field_info in plugins.
svn path=/trunk/; revision=28771
56 files changed, 1486 insertions, 1486 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} }, }; diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 84d810c91d..5dd83278b9 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -875,327 +875,327 @@ void proto_register_ams(void) { &hf_ams_sendernetid, { "AMS Sender Net Id", "ams.sendernetid", FT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_senderport, { "AMS Sender port", "ams.senderport", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_targetnetid, { "AMS Target Net Id", "ams.targetnetid", FT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_targetport, { "AMS Target port", "ams.targetport", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_cmdid, { "CmdId", "ams.cmdid", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_stateflags, { "StateFlags", "ams.stateflags", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_stateresponse, { "RESPONSE", "ams.state_response", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_RESPONSE, - "", HFILL } + NULL, HFILL } }, { &hf_ams_statenoreturn, { "NO RETURN", "ams.state_noreturn", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_NORETURN, - "", HFILL } + NULL, HFILL } }, { &hf_ams_stateadscmd, { "ADS COMMAND", "ams.state_adscmd", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_ADSCMD, - "", HFILL } + NULL, HFILL } }, { &hf_ams_statesyscmd, { "SYSTEM COMMAND", "ams.state_syscmd", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_SYSCMD, - "", HFILL } + NULL, HFILL } }, { &hf_ams_statehighprio, { "HIGH PRIORITY COMMAND", "ams.state_highprio", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_HIGHPRIO, - "", HFILL } + NULL, HFILL } }, { &hf_ams_statetimestampadded, { "TIMESTAMP ADDED", "ams.state_timestampadded", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_TIMESTAMPADDED, - "", HFILL } + NULL, HFILL } }, { &hf_ams_stateudp, { "UDP COMMAND", "ams.state_udp", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_UDP, - "", HFILL } + NULL, HFILL } }, { &hf_ams_stateinitcmd, { "INIT COMMAND", "ams.state_initcmd", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_INITCMD, - "", HFILL } + NULL, HFILL } }, { &hf_ams_statebroadcast, { "BROADCAST", "ams.state_broadcast", FT_BOOLEAN, 16, TFS(&flags_set_truth), AMSCMDSF_BROADCAST, - "", HFILL } + NULL, HFILL } }, { &hf_ams_cbdata, { "cbData", "ams.cbdata", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_errorcode, { "ErrorCode", "ams.errorcode", FT_UINT32, BASE_HEX, VALS(ErrorCode), 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_invokeid, { "InvokeId", "ams.invokeid", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdata, { "Data", "ams.ads_data", - FT_NONE, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, { &hf_ams_data, { "Data", "ams.data", - FT_NONE, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, { &hf_ams_adsindexgroup, { "IndexGroup", "ams.ads_indexgroup", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsindexoffset, { "IndexOffset", "ams.ads_indexoffset", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adscblength, { "CbLength", "ams.ads_cblength", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreadrequest, { "ADS Read Request", "ams.ads_read_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreadresponse, { "ADS Read Response", "ams.ads_read_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsinvokeid, { "InvokeId", "ams.ads_invokeid", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsresult, { "Result", "ams.adsresult", FT_UINT32, BASE_HEX, VALS(AdsErrorMode), 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adswriterequest, { "ADS Write Request", "ams.ads_write_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adswriteresponse, { "ADS Write Response", "ams.ads_write_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreadwriterequest, { "ADS ReadWrite Request", "ams.ads_readwrite_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreadwriteresponse, { "ADS ReadWrite Response", "ams.ads_readwrite_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adscbreadlength, { "CBReadLength", "ams.ads_cbreadlength", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adscbwritelength, { "CBWriteLength", "ams.ads_cbwritelength", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsstate, { "AdsState", "ams.ads_state", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdevicestate, { "DeviceState", "ams.ads_devicestate", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsnotificationhandle, { "NotificationHandle", "ams.ads_notificationhandle", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreadstaterequest, { "ADS Read State Request", "ams.ads_readstate_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreadstateresponse, { "ADS Read State Response", "ams.ads_readstate_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adswritectrlrequest, { "ADS Write Ctrl Request", "ams.ads_writectrl_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adswritectrlresponse, { "ADS Write Ctrl Response", "ams.ads_writectrl_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreaddinforequest, { "ADS Read Device Info Request", "ams.ads_readdinfo_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsreaddinforesponse, { "ADS Read Device Info Response", "ams.ads_readdinfo_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsadddnrequest, { "ADS Add Device Notification Request", "ams.ads_adddn_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsadddnresponse, { "ADS Add Device Notification Response", "ams.ads_adddn_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdeldnrequest, { "ADS Delete Device Notification Request", "ams.ads_deldn_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdeldnresponse, { "ADS Delete Device Notification Response", "ams.ads_deldn_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdnrequest, { "ADS Device Notification Request", "ams.ads_dn_req", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdnresponse, { "ADS Device Notification Response", "ams.ads_dn_res", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsnoteattrib, { "InvokeId", "ams.ads_noteattrib", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsnoteblocks, { "InvokeId", "ams.ads_noteblocks", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsversion, { "ADS Version", "ams.ads_version", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsdevicename, { "Device Name","ams.ads_devicename", FT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsversionversion, { "ADS Major Version", "ams.ads_versionversion", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsversionrevision, { "ADS Minor Version", "ams.ads_versionrevision", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsversionbuild, { "ADS Version Build", "ams.ads_versionbuild", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsnoteblocksstamps, { "Count of Stamps", "ams.ads_noteblocksstamps", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsnoteblocksstamp, { "Notification Stamp", "ams.ads_noteblocksstamp", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adstimestamp, { "Time Stamp", "ams.ads_timestamp", FT_UINT64, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adssamplecnt, { "Count of Stamps", "ams.ads_samplecnt", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsnoteblockssample, { "Notification Sample", "ams.ads_noteblockssample", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adstransmode, { "Trans Mode", "ams.ads_transmode", FT_UINT32, BASE_DEC, VALS(TransMode), 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adsmaxdelay, { "Max Delay", "ams.ads_maxdelay", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adscycletime, { "Cycle Time", "ams.ads_cycletime", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adscmpmax, { "Cmp Mad", "ams.ads_cmpmax", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ams_adscmpmin, { "Cmp Min", "ams.ads_cmpmin", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } } }; diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 7c87c28840..a770e914eb 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -1403,638 +1403,638 @@ void proto_register_ecat_mailbox(void) static hf_register_info hf[] = { { &hf_ecat_mailbox, - { "Mbx: ", "ecat_mailbox", + { "Mbx:", "ecat_mailbox", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailboxlength, - { "Length ", "ecat_mailbox.length", + { "Length", "ecat_mailbox.length", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailboxaddress, - { "Address ", "ecat_mailbox.address", + { "Address", "ecat_mailbox.address", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_eoe, { "EoE Fragment", "ecat_mailbox.eoe", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_eoe_fraghead, { "Eoe Frag Header", "ecat_mailbox.eoe.fraghead", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_eoe_type, { "EoE"/*"Type*/, "ecat_mailbox.eoe.type", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_fragno, { "EoE"/*"FragNo*/, "ecat_mailbox.eoe.fragno", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_offset, { "EoE"/*"Offset"*/, "ecat_mailbox.eoe.offset", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} }, { &hf_ecat_mailbox_eoe_frame, { "EoE"/*"FrameNo"*/, "ecat_mailbox.eoe.frame", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_last, { "Last Fragment"/*"Last Fragment"*/, "ecat_mailbox.eoe.last", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_timestampapp, { "Last Fragment"/*"Last Fragment"*/, "ecat_mailbox.eoe.timestampapp", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_timestampreq, { "Last Fragment"/*"Last Fragment"*/, "ecat_mailbox.eoe.timestampreq", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_fragment, { "EoE Frag Data", "ecat_mailbox.eoe.fragment", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init, { "Init", "ecat_mailbox.eoe.init", - FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL } + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_contains_macaddr, { "MacAddr", "ecat_mailbox.eoe.init.contains_macaddr", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000001, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000001, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_contains_ipaddr, { "IpAddr", "ecat_mailbox.eoe.init.contains_ipaddr", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000002, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000002, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_contains_subnetmask, { "SubnetMask", "ecat_mailbox.eoe.init.contains_subnetmask", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000004, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000004, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_contains_defaultgateway, { "DefaultGateway", "ecat_mailbox.eoe.init.contains_defaultgateway", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000008, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000008, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_contains_dnsserver, { "DnsServer", "ecat_mailbox.eoe.init.contains_dnsserver", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000010, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000010, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_contains_dnsname, { "DnsName", "ecat_mailbox.eoe.init.contains_dnsname", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000020, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00000020, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_append_timestamp, { "AppendTimeStamp", "ecat_mailbox.eoe.init.append_timestamp", - FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00010000, "", HFILL } + FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x00010000, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_macaddr, { "Mac Addr", "ecat_mailbox.eoe.init.macaddr", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_ipaddr, { "Ip Addr", "ecat_mailbox.eoe.init.ipaddr", - FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL } + FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_subnetmask, { "Subnet Mask", "ecat_mailbox.eoe.init.subnetmask", - FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL } + FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_defaultgateway, { "Default Gateway", "ecat_mailbox.eoe.init.defaultgateway", - FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL } + FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_dnsserver, { "Dns Server", "ecat_mailbox.eoe.init.dnsserver", - FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL } + FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_init_dnsname, { "Dns Name", "ecat_mailbox.eoe.init.dnsname", - FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter, { "Mac Filter", "ecat_mailbox.eoe.macfilter", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_macfiltercount, { "Mac Filter Count", "ecat_mailbox.eoe.macfilter.macfiltercount", - FT_UINT8, 16, NULL, 0x0, "", 0x0000000F, 0, 0, 0, NULL, NULL } + FT_UINT8, 16, NULL, 0x0, NULL, 0x0000000F, 0, 0, 0, NULL, NULL } }, { &hf_ecat_mailbox_eoe_macfilter_maskcount, { "Mac Filter Mask Count", "ecat_mailbox.eoe.macfilter.maskcount", - FT_UINT8, 16, NULL, 0x0, "", 0x00000030, 0, 0, 0, NULL, NULL } + FT_UINT8, 16, NULL, 0x0, NULL, 0x00000030, 0, 0, 0, NULL, NULL } }, { &hf_ecat_mailbox_eoe_macfilter_nobroadcasts, { "No Broadcasts", "ecat_mailbox.eoe.macfilter.nobroadcasts", - FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0, "", 0x00000080, 0, 0, 0, NULL, NULL } + FT_BOOLEAN, BASE_NONE, TFS(&flags_set_truth), 0x0, NULL, 0x00000080, 0, 0, 0, NULL, NULL } }, { &hf_ecat_mailbox_eoe_macfilter_filter, { "Filter", "ecat_mailbox.eoe.macfilter.filter", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[0], { "Filter 0", "ecat_mailbox.eoe.macfilter.filter0", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[1], { "Filter 1", "ecat_mailbox.eoe.macfilter.filter1", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[2], { "Filter 2", "ecat_mailbox.eoe.macfilter.filter2", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[3], { "Filter 3", "ecat_mailbox.eoe.macfilter.filter3", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[4], { "Filter 4", "ecat_mailbox.eoe.macfilter.filter4", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[5], { "Filter 5", "ecat_mailbox.eoe.macfilter.filter5", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[6], { "Filter 6", "ecat_mailbox.eoe.macfilter.filter6", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[7], { "Filter 7", "ecat_mailbox.eoe.macfilter.filter7", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[8], { "Filter 8", "ecat_mailbox.eoe.macfilter.filter8", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[9], { "Filter 9", "ecat_mailbox.eoe.macfilter.filter9", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[10], { "Filter 10", "ecat_mailbox.eoe.macfilter.filter10", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[11], { "Filter 11", "ecat_mailbox.eoe.macfilter.filter11", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[12], { "Filter 12", "ecat_mailbox.eoe.macfilter.filter12", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[13], { "Filter 13", "ecat_mailbox.eoe.macfilter.filter13", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[14], { "Filter 14", "ecat_mailbox.eoe.macfilter.filter14", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filters[15], { "Filter 15", "ecat_mailbox.eoe.macfilter.filter15", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filtermask, { "Filter Mask", "ecat_mailbox.eoe.macfilter.filtermask", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filtermasks[0], { "Mask 0", "ecat_mailbox.eoe.macfilter.filtermask0", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filtermasks[1], { "Mask 1", "ecat_mailbox.eoe.macfilter.filtermask1", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filtermasks[2], { "Mask 2", "ecat_mailbox.eoe.macfilter.filtermask2", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_macfilter_filtermasks[3], { "Mask 3", "ecat_mailbox.eoe.macfilter.filtermask3", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL } + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_eoe_timestamp, { "Time Stamp", "ecat_mailbox.eoe.timestamp", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_coe, { "CoE", "ecat_mailbox.coe", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_coe_number, { "Number", "ecat_mailbox.coe.number", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_coe_type, - { "Type ", "ecat_mailbox.coe.type", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + { "Type", "ecat_mailbox.coe.type", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoreq, { "SDO Req", "ecat_mailbox.coe.sdoreq", - FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsid, { "Initiate Download", "ecat_mailbox.coe.sdoccsid", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsid_sizeind, { "Size Ind.", "ecat_mailbox.coe.sdoccsid.sizeind", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsid_expedited, { "Expedited", "ecat_mailbox.coe.sdoccsid.expedited", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000002, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsid_size0, { "Bytes", "ecat_mailbox.coe.sdoccsid.size0", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000004, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsid_size1, { "Bytes", "ecat_mailbox.coe.sdoccsid.size1", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000008, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsid_complete, { "Access", "ecat_mailbox.coe.sdoccsid.complete", FT_BOOLEAN, 8, TFS(&tfs_complete), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsds, { "Download Segment", "ecat_mailbox.coe.sdoccsds", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsds_lastseg, { "Last Segment", "ecat_mailbox.coe.sdoccsds.lastseg", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsds_size, { "Size", "ecat_mailbox.coe.sdoccsds.size", FT_UINT8, BASE_DEC, NULL, 0x0000000E, - "", 0x0000000E, 0, 0, 0, NULL, NULL } + NULL, 0x0000000E, 0, 0, 0, NULL, NULL } }, { &hf_ecat_mailbox_coe_sdoccsds_toggle, { "Toggle Bit", "ecat_mailbox.coe.sdoccsds.toggle", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsiu, { "Init Upload", "ecat_mailbox.coe.sdoccsiu", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsiu_complete, { "Toggle Bit", "ecat_mailbox.coe.sdoccsiu_complete", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsus, { "Upload Segment", "ecat_mailbox.coe.sdoccsus", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoccsus_toggle, { "Toggle Bit", "ecat_mailbox.coe.sdoccsus_toggle", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoidx, - { "Index ", "ecat_mailbox.coe.sdoidx", + { "Index", "ecat_mailbox.coe.sdoidx", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdosub, { "SubIndex", "ecat_mailbox.coe.sdosub", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdodata, - { "Data ", "ecat_mailbox.coe.sdodata", + { "Data", "ecat_mailbox.coe.sdodata", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdodata1, - { "Data ", "ecat_mailbox.coe.sdodata", + { "Data", "ecat_mailbox.coe.sdodata", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdodata2, - { "Data ", "ecat_mailbox.coe.sdodata", + { "Data", "ecat_mailbox.coe.sdodata", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoldata, - { "Data ", "ecat_mailbox.coe.dsoldata", + { "Data", "ecat_mailbox.coe.dsoldata", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdolength, - { "Length ", "ecat_mailbox.coe.sdolength", + { "Length", "ecat_mailbox.coe.sdolength", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoerror, - { "SDO Error ", "ecat_mailbox.coe.sdoerror", + { "SDO Error", "ecat_mailbox.coe.sdoerror", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdores, - { "SDO Res ", "ecat_mailbox.coe.sdores", + { "SDO Res", "ecat_mailbox.coe.sdores", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsiu, { "Initiate Upload Response", "ecat_mailbox.coe.sdoscsiu", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsiu_sizeind, { "Size Ind.", "ecat_mailbox.coe.sdoscsiu_sizeind", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsiu_expedited, { "Expedited", "ecat_mailbox.coe.sdoscsiu_expedited", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000002, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsiu_size0, { "Bytes", "ecat_mailbox.coe.sdoscsiu_size0", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000004, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsiu_size1, { "Bytes", "ecat_mailbox.coe.sdoscsiu_size1", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000008, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsiu_complete, { "Access", "ecat_mailbox.coe.sdoscsiu_complete", FT_BOOLEAN, 8, TFS(&tfs_complete), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsds, { "Download Segment Response", "ecat_mailbox.coe.sdoscsds", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsds_toggle, { "Toggle Bit", "ecat_mailbox.coe.sdoscsds_toggle", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsus, { "Upload Segment", "ecat_mailbox.coe.sdoscsus", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsus_lastseg, { "Last Segment", "ecat_mailbox.coe.sdoscsus_lastseg", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoscsus_bytes, { "Bytes", "ecat_mailbox.coe.sdoscsus_bytes", FT_UINT8, BASE_DEC, NULL, 0x0000000E, - "", 0x0000000E, 0, 0, 0, NULL, NULL } + NULL, 0x0000000E, 0, 0, 0, NULL, NULL } }, { &hf_ecat_mailbox_coe_sdoscsus_toggle, { "Toggle Bit", "ecat_mailbox.coe.sdoscsus_toggle", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_coe_sdoinfoopcode, - { "Info OpCode ", "ecat_mailbox.coe.sdoinfoopcode", + { "Info OpCode", "ecat_mailbox.coe.sdoinfoopcode", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }, + NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfofrag, - { "Info Frag Left ", "ecat_mailbox.coe.sdoinfofrag", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Frag Left", "ecat_mailbox.coe.sdoinfofrag", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfolisttype, - { "Info List Type ", "ecat_mailbox.coe.sdoinfolisttype", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info List Type", "ecat_mailbox.coe.sdoinfolisttype", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfolist, - { "Info List ", "ecat_mailbox.coe.sdoinfolist", - FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }, + { "Info List", "ecat_mailbox.coe.sdoinfolist", + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfoindex, - { "Info Obj Index ", "ecat_mailbox.coe.sdoinfoindex", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Obj Index", "ecat_mailbox.coe.sdoinfoindex", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfosubindex, - { "Info Obj SubIdx ", "ecat_mailbox.coe.sdoinfosubindex", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Obj SubIdx", "ecat_mailbox.coe.sdoinfosubindex", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfovalueinfo, - { "Info Obj SubIdx ", "ecat_mailbox.coe.sdoinfovalueinfo", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Obj SubIdx", "ecat_mailbox.coe.sdoinfovalueinfo", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfoerrorcode, - { "Info Error Code ", "ecat_mailbox.coe.sdoinfoerrorcode", - FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Error Code", "ecat_mailbox.coe.sdoinfoerrorcode", + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfodatatype, - { "Info Data Type ", "ecat_mailbox.coe.sdoinfodatatype", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Data Type", "ecat_mailbox.coe.sdoinfodatatype", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfomaxsub, - { "Info Max SubIdx ", "ecat_mailbox.coe.sdoinfomaxsub", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Max SubIdx", "ecat_mailbox.coe.sdoinfomaxsub", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfoobjcode, - { "Info Obj Code ", "ecat_mailbox.coe.sdoinfoobjcode", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Obj Code", "ecat_mailbox.coe.sdoinfoobjcode", + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfoname, - { "Info Name ", "ecat_mailbox.coe.sdoinfoname", - FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }, + { "Info Name", "ecat_mailbox.coe.sdoinfoname", + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfobitlen, - { "Info Bit Len ", "ecat_mailbox.coe.sdoinfobitlen", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Bit Len", "ecat_mailbox.coe.sdoinfobitlen", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfoobjaccess, - { "Info Obj Access ", "ecat_mailbox.coe.sdoinfoobjaccess", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Obj Access", "ecat_mailbox.coe.sdoinfoobjaccess", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfounittype, - { "Info Data Type ", "ecat_mailbox.coe.sdoinfounittype", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Info Data Type", "ecat_mailbox.coe.sdoinfounittype", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfodefaultvalue, { "Info Default Val", "ecat_mailbox.coe.sdoinfodefaultvalue", - FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }, + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfominvalue, - { "Info Min Val ", "ecat_mailbox.coe.sdoinfominvalue", - FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }, + { "Info Min Val", "ecat_mailbox.coe.sdoinfominvalue", + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailbox_coe_sdoinfomaxvalue, - { "Info Max Val ", "ecat_mailbox.coe.sdoinfomaxvalue", - FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }, + { "Info Max Val", "ecat_mailbox.coe.sdoinfomaxvalue", + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_ecat_mailboxdata, { "MB Data", "ecat_mailbox.data", - FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL } + FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe, { "Foe", "ecat_mailbox.foe", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_opmode, - { "Foe OpMode ", "ecat_mailbox.foe_opmode", + { "Foe OpMode", "ecat_mailbox.foe_opmode", FT_UINT8, BASE_HEX, VALS(FoEOpMode), 0x0, "Op modes", HFILL } }, { &hf_ecat_mailbox_foe_filelength, { "Foe FileLength" , "ecat_mailbox.foe_filelength", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_filename, - { "Foe FileName ", "ecat_mailbox.foe_filename", - FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } + { "Foe FileName", "ecat_mailbox.foe_filename", + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_packetno, - { "Foe PacketNo ", "ecat_mailbox.foe_packetno", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + { "Foe PacketNo", "ecat_mailbox.foe_packetno", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_errcode, - { "Foe ErrorCode ", "ecat_mailbox.foe_errcode", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + { "Foe ErrorCode", "ecat_mailbox.foe_errcode", + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_errtext, { "Foe ErrorString", "ecat_mailbox.foe_errtext", - FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL } + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_busydone, - { "Foe BusyDone ", "ecat_mailbox.foe_busydone", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "Foe BusyDone", "ecat_mailbox.foe_busydone", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_busyentire, - { "Foe BusyEntire ", "ecat_mailbox.foe_busyentire", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "Foe BusyEntire", "ecat_mailbox.foe_busyentire", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_data, - { "Foe Data ", "ecat_mailbox.foe_busydata", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Foe Data", "ecat_mailbox.foe_busydata", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_efw, { "Firmware", "ecat_mailbox.foe.efw", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_efw_cmd, - { "Cmd ", "ecat_mailbox.foe.efw.cmd", - FT_UINT16, BASE_HEX, VALS(FoEEfwCmd), 0x0, "", HFILL } + { "Cmd", "ecat_mailbox.foe.efw.cmd", + FT_UINT16, BASE_HEX, VALS(FoEEfwCmd), 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_efw_size, - { "Size ", "ecat_mailbox.foe.efw.size", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + { "Size", "ecat_mailbox.foe.efw.size", + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_efw_addresslw, { "AddressLW", "ecat_mailbox.foe.efw.addresslw", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_efw_addresshw, { "AddressHW", "ecat_mailbox.foe.efw.addresshw", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_foe_efw_data, - { "Data ", "ecat_mailbox.foe.efw.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat_mailbox.foe.efw.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_soe, { "Soe", "ecat_mailbox.soe", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_soe_header, - { "Soe Header ", "ecat_mailbox.soe_header", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "Soe Header", "ecat_mailbox.soe_header", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_opcode, { "SoE OpCode", "ecat_mailbox.soe_opcode", - FT_UINT16, BASE_DEC, VALS(SoeOpcode), 0x00000007, "", 0x00000007, 0, 0, 0, NULL, NULL } + FT_UINT16, BASE_DEC, VALS(SoeOpcode), 0x00000007, NULL, 0x00000007, 0, 0, 0, NULL, NULL } }, { &hf_ecat_mailbox_soe_header_incomplete, { "More Follows...", "ecat_mailbox.soe_header_incomplete", - FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000008, "", HFILL } + FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000008, NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_error, { "Error", "ecat_mailbox.soe_header_error", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_driveno, { "Drive No", "ecat_mailbox.soe_header_driveno", - FT_UINT16, BASE_DEC, NULL, 0x000000e0, "", 0x000000e0, 0, 0, 0, NULL, NULL} + FT_UINT16, BASE_DEC, NULL, 0x000000e0, NULL, 0x000000e0, 0, 0, 0, NULL, NULL} }, { &hf_ecat_mailbox_soe_header_datastate, { "Datastate", "ecat_mailbox.soe_header_datastate", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000100, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_name, { "Name", "ecat_mailbox.soe_header_name", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000200, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_attribute, { "Attribute", "ecat_mailbox.soe_header_attribute", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000400, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_unit, { "Unit", "ecat_mailbox.soe_header_unit", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000800, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_min, { "Min", "ecat_mailbox.soe_header_min", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00001000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_max, { "Max", "ecat_mailbox.soe_header_max", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00002000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_value, { "Value", "ecat_mailbox.soe_header_value", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00004000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_reserved, { "Reserved", "ecat_mailbox.soe_header_reserved", FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00008000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_mailbox_soe_idn, - { "SoE IDN ", "ecat_mailbox.soe_idn", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "SoE IDN", "ecat_mailbox.soe_idn", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_soe_data, - { "SoE Data ", "ecat_mailbox.soe_data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "SoE Data", "ecat_mailbox.soe_data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_soe_frag, - { "SoE FragLeft ", "ecat_mailbox.soe_frag", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "SoE FragLeft", "ecat_mailbox.soe_frag", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_mailbox_soe_error, - { "SoE Error ", "ecat_mailbox.soe_error", - FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "SoE Error", "ecat_mailbox.soe_error", + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } } }; diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 839e99d211..6daefb77e8 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -873,55 +873,55 @@ void proto_register_ecat(void) { { &hf_ecat_sub, { "EtherCAT Frame", "ecat.sub", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_header, { "Header", "ecat.header", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[0], - { "Data ", "ecat.sub1.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub1.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[1], - { "Data ", "ecat.sub2.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub2.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[2], - { "Data ", "ecat.sub3.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub3.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[3], - { "Data ", "ecat.sub4.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub4.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[4], - { "Data ", "ecat.sub5.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub5.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[5], - { "Data ", "ecat.sub6.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub6.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[6], - { "Data ", "ecat.sub7.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub7.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[7], - { "Data ", "ecat.sub8.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub8.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[8], - { "Data ", "ecat.sub9.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub9.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_data[9], - { "Data ", "ecat.sub10.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.sub10.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_data, - { "Data ", "ecat.data", - FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } + { "Data", "ecat.data", + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_cnt, { "Working Cnt", "ecat.cnt", @@ -929,752 +929,752 @@ void proto_register_ecat(void) }, { &hf_ecat_sub_cnt[0], { "Working Cnt", "ecat.sub1.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[1], { "Working Cnt", "ecat.sub2.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[2], { "Working Cnt", "ecat.sub3.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[3], { "Working Cnt", "ecat.sub4.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[4], { "Working Cnt", "ecat.sub5.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[5], { "Working Cnt", "ecat.sub6.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[6], { "Working Cnt", "ecat.sub7.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[7], { "Working Cnt", "ecat.sub8.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[8], { "Working Cnt", "ecat.sub9.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_cnt[9], { "Working Cnt", "ecat.sub10.cnt", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_cmd, - { "Command ", "ecat.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[0], - { "Command ", "ecat.sub1.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub1.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[1], - { "Command ", "ecat.sub2.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub2.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[2], - { "Command ", "ecat.sub3.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub3.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[3], - { "Command ", "ecat.sub4.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub4.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[4], - { "Command ", "ecat.sub5.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub5.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[5], - { "Command ", "ecat.sub6.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub6.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[6], - { "Command ", "ecat.sub7.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub7.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[7], - { "Command ", "ecat.sub8.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub8.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[8], - { "Command ", "ecat.sub9.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub9.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_sub_cmd[9], - { "Command ", "ecat.sub10.cmd", - FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, "", HFILL } + { "Command", "ecat.sub10.cmd", + FT_UINT8, BASE_HEX, VALS(EcCmdLong), 0x0, NULL, HFILL } }, { &hf_ecat_idx, - { "Index ", "ecat.idx", + { "Index", "ecat.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[0], - { "Index ", "ecat.sub1.idx", + { "Index", "ecat.sub1.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[1], - { "Index ", "ecat.sub2.idx", + { "Index", "ecat.sub2.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[2], - { "Index ", "ecat.sub3.idx", + { "Index", "ecat.sub3.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[3], - { "Index ", "ecat.sub4.idx", + { "Index", "ecat.sub4.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[4], - { "Index ", "ecat.sub5.idx", + { "Index", "ecat.sub5.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[5], - { "Index ", "ecat.sub6.idx", + { "Index", "ecat.sub6.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[6], - { "Index ", "ecat.sub7.idx", + { "Index", "ecat.sub7.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[7], - { "Index ", "ecat.sub8.idx", + { "Index", "ecat.sub8.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[8], - { "Index ", "ecat.sub9.idx", + { "Index", "ecat.sub9.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_idx[9], - { "Index ", "ecat.sub10.idx", + { "Index", "ecat.sub10.idx", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_adp, - { "Slave Addr ", "ecat.adp", + { "Slave Addr", "ecat.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[0], - { "Slave Addr ", "ecat.sub1.adp", + { "Slave Addr", "ecat.sub1.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[1], - { "Slave Addr ", "ecat.sub2.adp", + { "Slave Addr", "ecat.sub2.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[2], - { "Slave Addr ", "ecat.sub3.adp", + { "Slave Addr", "ecat.sub3.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[3], - { "Slave Addr ", "ecat.sub4.adp", + { "Slave Addr", "ecat.sub4.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[4], - { "Slave Addr ", "ecat.sub5.adp", + { "Slave Addr", "ecat.sub5.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[5], - { "Slave Addr ", "ecat.sub6.adp", + { "Slave Addr", "ecat.sub6.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[6], - { "Slave Addr ", "ecat.sub7.adp", + { "Slave Addr", "ecat.sub7.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[7], - { "Slave Addr ", "ecat.sub8.adp", + { "Slave Addr", "ecat.sub8.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[8], - { "Slave Addr ", "ecat.sub9.adp", + { "Slave Addr", "ecat.sub9.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_adp[9], - { "Slave Addr ", "ecat.sub10.adp", + { "Slave Addr", "ecat.sub10.adp", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_ado, { "Offset Addr", "ecat.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[0], { "Offset Addr", "ecat.sub1.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[1], { "Offset Addr", "ecat.sub2.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[2], { "Offset Addr", "ecat.sub3.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[3], { "Offset Addr", "ecat.sub4.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[4], { "Offset Addr", "ecat.sub5.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[5], { "Offset Addr", "ecat.sub6.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[6], { "Offset Addr", "ecat.sub7.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[7], { "Offset Addr", "ecat.sub8.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[8], { "Offset Addr", "ecat.sub9.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_ado[9], { "Offset Addr", "ecat.sub10.ado", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_lad, - { "Log Addr ", "ecat.lad", + { "Log Addr", "ecat.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[0], - { "Log Addr ", "ecat.sub1.lad", + { "Log Addr", "ecat.sub1.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[1], - { "Log Addr ", "ecat.sub2.lad", + { "Log Addr", "ecat.sub2.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[2], - { "Log Addr ", "ecat.sub3.lad", + { "Log Addr", "ecat.sub3.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[3], - { "Log Addr ", "ecat.sub4.lad", + { "Log Addr", "ecat.sub4.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[4], - { "Log Addr ", "ecat.sub5.lad", + { "Log Addr", "ecat.sub5.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[5], - { "Log Addr ", "ecat.sub6.lad", + { "Log Addr", "ecat.sub6.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[6], - { "Log Addr ", "ecat.sub7.lad", + { "Log Addr", "ecat.sub7.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[7], - { "Log Addr ", "ecat.sub8.lad", + { "Log Addr", "ecat.sub8.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[8], - { "Log Addr ", "ecat.sub9.lad", + { "Log Addr", "ecat.sub9.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_lad[9], - { "Log Addr ", "ecat.sub10.lad", + { "Log Addr", "ecat.sub10.lad", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_len, - { "Length ", "ecat.len", + { "Length", "ecat.len", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_int, - { "Interrupt ", "ecat.int", + { "Interrupt", "ecat.int", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman, { "SyncManager", "ecat.syncman", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_start, { "Start Addr", "ecat.syncman.start", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_len, - { "SM Length ", "ecat.syncman.len", + { "SM Length", "ecat.syncman.len", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flags, - { "SM Flags ", "ecat.syncman.flags", + { "SM Flags", "ecat.syncman.flags", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag0, { "SM Flag0", "ecat.syncman_flag0", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag0), 0x00000001, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag1, { "SM Flag1", "ecat.syncman_flag1", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag1), 0x00000002, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag2, { "SM Flag2", "ecat.syncman_flag2", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag2), 0x00000004, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag4, { "SM Flag4", "ecat.syncman_flag4", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag4), 0x00000010, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag5, { "SM Flag5", "ecat.syncman_flag5", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag5), 0x00000020, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag8, { "SM Flag8", "ecat.syncman_flag8", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag8), 0x00000100, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag9, { "SM Flag9", "ecat.syncman_flag9", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag9), 0x00000200, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag10, { "SM Flag10", "ecat.syncman_flag10", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag10), 0x00000400, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag11, { "SM Flag11", "ecat.syncman_flag11", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag11), 0x00000800, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag12, { "SM Flag12", "ecat.syncman_flag12", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag12), 0x00001000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag13, { "SM Flag13", "ecat.syncman_flag13", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag13), 0x00002000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_syncman_flag16, { "SM Flag16", "ecat.syncman_flag16", FT_BOOLEAN, 32, TFS(&tfs_ecat_syncman_flag16), 0x00010000, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu, { "FMMU", "ecat.fmmu", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_lstart, - { "Log Start ", "ecat.fmmu.lstart", + { "Log Start", "ecat.fmmu.lstart", FT_UINT32, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_llen, - { "Log Length ", "ecat.fmmu.llen", + { "Log Length", "ecat.fmmu.llen", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_lstartbit, - { "Log StartBit ", "ecat.fmmu.lstartbit", + { "Log StartBit", "ecat.fmmu.lstartbit", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_lendbit, - { "Log EndBit ", "ecat.fmmu.lendbit", + { "Log EndBit", "ecat.fmmu.lendbit", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_pstart, - { "Phys Start ", "ecat.fmmu.pstart", + { "Phys Start", "ecat.fmmu.pstart", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_pstartbit, { "Phys StartBit", "ecat.fmmu.pstartbit", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_type, - { "FMMU Type ", "ecat.fmmu.type", + { "FMMU Type", "ecat.fmmu.type", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_typeread, { "Type", "ecat.fmmu.typeread", FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_typeread), 0x01, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_typewrite, { "Type", "ecat.fmmu.typewrite", FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_typewrite), 0x02, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_active, - { "FMMU Active ", "ecat.fmmu.active", + { "FMMU Active", "ecat.fmmu.active", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_fmmu_active0, { "Active", "ecat.fmmu.active0", FT_BOOLEAN, 8, TFS(&tfs_ecat_fmmu_active), 0x01, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_dc_diff_da, { "DC D-A", "ecat.dc.dif.da", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_dc_diff_bd, { "DC B-D", "ecat.dc.dif.bd", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_dc_diff_cb, { "DC C-B", "ecat.dc.dif.cb", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_dc_diff_cd, { "DC C-D", "ecat.dc.dif.cd", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_dc_diff_ba, { "DC B-A", "ecat.dc.dif.ba", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_dc_diff_ca, { "DC C-A", "ecat.dc.dif.ca", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[0], { "DC D-A", "ecat.sub1.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[1], { "DC D-A", "ecat.sub2.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[2], { "DC D-A", "ecat.sub3.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[3], { "DC D-A", "ecat.sub4.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[4], { "DC D-A", "ecat.sub5.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[5], { "DC D-A", "ecat.sub6.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[6], { "DC D-A", "ecat.sub7.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[7], { "DC D-A", "ecat.sub8.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[8], { "DC D-A", "ecat.sub9.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_da[9], { "DC D-A", "ecat.sub10.dc.dif.da", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[0], { "DC B-C", "ecat.sub1.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[1], { "DC B-C", "ecat.sub2.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[2], { "DC B-C", "ecat.sub3.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[3], { "DC B-C", "ecat.sub4.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[4], { "DC B-C", "ecat.sub5.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[5], { "DC B-C", "ecat.sub6.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[6], { "DC B-C", "ecat.sub7.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[7], { "DC B-C", "ecat.sub8.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[8], { "DC B-C", "ecat.sub9.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_bd[9], { "DC B-D", "ecat.sub10.dc.dif.bd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[0], { "DC C-B", "ecat.sub1.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[1], { "DC C-B", "ecat.sub2.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[2], { "DC C-B", "ecat.sub3.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[3], { "DC C-B", "ecat.sub4.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[4], { "DC C-B", "ecat.sub5.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[5], { "DC C-B", "ecat.sub6.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[6], { "DC C-B", "ecat.sub7.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[7], { "DC C-B", "ecat.sub8.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[8], { "DC C-B", "ecat.sub9.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cb[9], { "DC C-B", "ecat.sub10.dc.dif.cb", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[0], { "DC C-D", "ecat.sub1.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[1], { "DC C-D", "ecat.sub2.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[2], { "DC C-D", "ecat.sub3.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[3], { "DC C-D", "ecat.sub4.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[4], { "DC C-D", "ecat.sub5.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[5], { "DC C-D", "ecat.sub6.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[6], { "DC C-D", "ecat.sub7.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[7], { "DC C-D", "ecat.sub8.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[8], { "DC C-D", "ecat.sub9.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_cd[9], { "DC C-D", "ecat.sub10.dc.dif.cd", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[0], { "DC B-A", "ecat.sub1.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[1], { "DC B-A", "ecat.sub2.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[2], { "DC B-A", "ecat.sub3.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[3], { "DC B-A", "ecat.sub4.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[4], { "DC B-A", "ecat.sub5.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[5], { "DC B-A", "ecat.sub6.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[6], { "DC B-A", "ecat.sub7.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[7], { "DC B-A", "ecat.sub8.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[8], { "DC B-A", "ecat.sub9.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ba[9], { "DC B-A", "ecat.sub10.dc.dif.ba", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[0], { "DC C-A", "ecat.sub1.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[1], { "DC C-A", "ecat.sub2.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[2], { "DC C-A", "ecat.sub3.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[3], { "DC C-A", "ecat.sub4.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[4], { "DC C-A", "ecat.sub5.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[5], { "DC C-A", "ecat.sub6.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[6], { "DC C-A", "ecat.sub7.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[7], { "DC C-A", "ecat.sub8.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[8], { "DC C-A", "ecat.sub9.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_sub_dc_diff_ca[9], { "DC C-A", "ecat.sub10.dc.dif.ca", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ecat_length_len, { "Length", "ecat.subframe.length", - FT_UINT16, BASE_DEC, NULL, 0x07ff, "", HFILL} + FT_UINT16, BASE_DEC, NULL, 0x07ff, NULL, HFILL} }, { &hf_ecat_length_r, { "Reserved", "ecat.subframe.reserved", - FT_UINT16, BASE_DEC, VALS(&ecat_subframe_reserved_vals), 0x3800, "", HFILL} + FT_UINT16, BASE_DEC, VALS(&ecat_subframe_reserved_vals), 0x3800, NULL, HFILL} }, { &hf_ecat_length_c, { "Round trip", "ecat.subframe.circulating", - FT_UINT16, BASE_DEC, VALS(&ecat_subframe_circulating_vals), 0x4000, "", HFILL} + FT_UINT16, BASE_DEC, VALS(&ecat_subframe_circulating_vals), 0x4000, NULL, HFILL} }, { &hf_ecat_length_m, { "Last indicator", "ecat.subframe.more", - FT_UINT16, BASE_DEC, VALS(&ecat_subframe_more_vals), 0x8000, "", HFILL} + FT_UINT16, BASE_DEC, VALS(&ecat_subframe_more_vals), 0x8000, NULL, HFILL} }, { &hf_ecat_padding, { "Pad bytes", "ecat.subframe.pad_bytes", - FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL} + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} } }; diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index 4ab5920932..68385413fe 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -128,13 +128,13 @@ void proto_register_ethercat_frame(void) { &hf_ethercat_frame_length, { "Length", "ecatf.length", FT_UINT16, BASE_HEX, NULL, 0x07FF, - "", HFILL } + NULL, HFILL } }, { &hf_ethercat_frame_reserved, { "Reserved", "ecatf.reserved", FT_UINT16, BASE_HEX, VALS(ðercat_frame_reserved_vals), 0x0800, - "", HFILL} + NULL, HFILL} }, { &hf_ethercat_frame_type, diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index c6fb808d86..a79feea04a 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -100,15 +100,15 @@ void proto_register_ioraw(void) { &hf_ioraw_summary, { "Summary of the IoRaw Packet", "ioraw.summary", FT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ioraw_header, { "Header", "ioraw.header", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_ioraw_data, { "VarData", "ioraw.data", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } } }; diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index aa44d28546..6b42bac522 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -180,52 +180,52 @@ void proto_register_nv(void) { { &hf_nv_summary, { "Summary of the Nv Packet", "tc_nv.summary", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, { &hf_nv_header, { "Header", "tc_nv.header", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_publisher, { "Publisher", "tc_nv.publisher", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, { &hf_nv_count, { "Count", "tc_nv.count", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_cycleindex, { "CycleIndex", "tc_nv.cycleindex", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_variable, { "Variable", "tc_nv.variable", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, { &hf_nv_varheader, { "VarHeader", "tc_nv.varheader", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_id, { "Id", "tc_nv.id", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_hash, { "Hash", "tc_nv.hash", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_length, { "Length", "tc_nv.length", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_quality, { "Quality", "tc_nv.quality", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_nv_data, { "Data", "tc_nv.data", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } }, }; diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 2917f03d95..25830dfc06 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -2238,22 +2238,22 @@ proto_register_gryphon(void) static hf_register_info hf[] = { { &hf_gryphon_src, { "Source", "gryphon.src", FT_UINT8, BASE_HEX, VALS(src_dest), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_gryphon_srcchan, { "Source channel", "gryphon.srcchan", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_gryphon_dest, { "Destination", "gryphon.dest", FT_UINT8, BASE_HEX, VALS(src_dest), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_gryphon_destchan, { "Destination channel", "gryphon.destchan", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_gryphon_type, { "Frame type", "gryphon.type", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_gryphon_cmd, { "Command", "gryphon.cmd", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, }; static gint *ett[] = { diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index 34490cb625..8f4790f5f8 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -392,27 +392,27 @@ void proto_register_ircomm(void) { &hf_ircomm_param, { "IrCOMM Parameter", "ircomm.parameter", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pi, { "Parameter Identifier", "ircomm.pi", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pl, { "Parameter Length", "ircomm.pl", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pv, { "Parameter Value", "ircomm.pv", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_control, { "Control Channel", "ircomm.control", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_control_len, { "Clen", "ircomm.control.len", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; /* Setup protocol subtree arrays */ diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index dc5669ae05..9b16b2219f 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -1954,295 +1954,295 @@ void proto_register_irda(void) { &hf_lap_a, { "Address Field", "irlap.a", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_a_cr, { "C/R", "irlap.a.cr", FT_BOOLEAN, 8, TFS(&lap_cr_vals), CMD_FRAME, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_a_address, { "Address", "irlap.a.address", FT_UINT8, BASE_HEX, NULL, ~CMD_FRAME, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c, { "Control Field", "irlap.c", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_nr, { "N(R)", "irlap.c.n_r", FT_UINT8, BASE_DEC, NULL, XDLC_N_R_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_ns, { "N(S)", "irlap.c.n_s", FT_UINT8, BASE_DEC, NULL, XDLC_N_S_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_p, { "Poll", "irlap.c.p", FT_BOOLEAN, 8, TFS(&set_notset), XDLC_P_F, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_f, { "Final", "irlap.c.f", FT_BOOLEAN, 8, TFS(&set_notset), XDLC_P_F, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_s, { "Supervisory frame type", "irlap.c.s_ftype", FT_UINT8, BASE_HEX, VALS(lap_c_s_vals), XDLC_S_FTYPE_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_u_cmd, { "Command", "irlap.c.u_modifier_cmd", FT_UINT8, BASE_HEX, VALS(lap_c_u_cmd_vals), XDLC_U_MODIFIER_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_u_rsp, { "Response", "irlap.c.u_modifier_resp", FT_UINT8, BASE_HEX, VALS(lap_c_u_rsp_vals), XDLC_U_MODIFIER_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_i, { "Frame Type", "irlap.c.ftype", FT_UINT8, BASE_HEX, VALS(lap_c_ftype_vals), XDLC_I_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_c_s_u, { "Frame Type", "irlap.c.ftype", FT_UINT8, BASE_HEX, VALS(lap_c_ftype_vals), XDLC_S_U_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_lap_i, { "Information Field", "irlap.i", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_snrm_saddr, { "Source Device Address", "irlap.snrm.saddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_snrm_daddr, { "Destination Device Address", "irlap.snrm.daddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_snrm_ca, { "Connection Address", "irlap.snrm.ca", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_negotiation_param, { "Negotiation Parameter", "irlap.negotiation", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pi, { "Parameter Identifier", "irlap.pi", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pl, { "Parameter Length", "irlap.pl", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_param_pv, { "Parameter Value", "irlap.pv", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ua_saddr, { "Source Device Address", "irlap.ua.saddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_ua_daddr, { "Destination Device Address", "irlap.ua.daddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_ident, { "Format Identifier", "irlap.xid.fi", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_saddr, { "Source Device Address", "irlap.xid.saddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_daddr, { "Destination Device Address", "irlap.xid.daddr", FT_UINT32, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_flags, { "Discovery Flags", "irlap.xid.flags", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_s, { "Number of Slots", "irlap.xid.s", FT_UINT8, BASE_DEC, VALS(&xid_slot_numbers), S_MASK, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_conflict, { "Conflict", "irlap.xid.conflict", FT_BOOLEAN, 8, TFS(&set_notset), CONFLICT, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_slotnr, { "Slot Number", "irlap.xid.slotnr", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_xid_version, { "Version Number", "irlap.xid.version", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_log[] = { { &hf_log_msg, { "Message", "log.msg", FT_STRING, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_log_missed, { "WARNING: Missed one or more messages while capturing!", "log.missed", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_lmp[] = { { &hf_lmp_xid_hints, { "Service Hints", "irlmp.xid.hints", - FT_BYTES, BASE_HEX, NULL, 0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_lmp_xid_charset, { "Character Set", "irlmp.xid.charset", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_xid_name, { "Device Nickname", "irlmp.xid.name", FT_STRING, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_xid_name_no_ascii, { "Device Nickname (unsupported character set)", "irlmp.xid.name", FT_BYTES, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_dst, { "Destination", "irlmp.dst", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_dst_control, { "Control Bit", "irlmp.dst.c", FT_BOOLEAN, 8, TFS(&set_notset), CONTROL_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_dst_lsap, { "Destination LSAP", "irlmp.dst.lsap", FT_UINT8, BASE_DEC, NULL, ~CONTROL_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_src, { "Source", "irlmp.src", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_src_r, { "reserved", "irlmp.src.r", FT_UINT8, BASE_DEC, NULL, RESERVED_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_src_lsap, { "Source LSAP", "irlmp.src.lsap", FT_UINT8, BASE_DEC, NULL, ~RESERVED_BIT, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_opcode, { "Opcode", "irlmp.opcode", FT_UINT8, BASE_HEX, VALS(lmp_opcode_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_rsvd, { "Reserved", "irlmp.rsvd", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_reason, { "Reason", "irlmp.reason", FT_UINT8, BASE_HEX, VALS(lmp_reason_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_mode, { "Mode", "irlmp.mode", FT_UINT8, BASE_HEX, VALS(lmp_mode_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_lmp_status, { "Status", "irlmp.status", FT_UINT8, BASE_HEX, VALS(lmp_status_vals), 0x0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_iap[] = { { &hf_iap_ctl, { "Control Field", "iap.ctl", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_ctl_lst, { "Last Frame", "iap.ctl.lst", FT_BOOLEAN, 8, TFS(&set_notset), IAP_LST, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_ctl_ack, { "Acknowledge", "iap.ctl.ack", FT_BOOLEAN, 8, TFS(&set_notset), IAP_ACK, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_ctl_opcode, { "Opcode", "iap.ctl.opcode", FT_UINT8, BASE_HEX, VALS(iap_opcode_vals), IAP_OP, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_class_name, { "Class Name", "iap.classname", FT_UINT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_attr_name, { "Attribute Name", "iap.attrname", FT_UINT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_return, { "Return", "iap.return", FT_UINT8, BASE_HEX, VALS(iap_return_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_list_len, { "List Length", "iap.listlen", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_list_entry, - { "List Entry ", "iap.listentry", + { "List Entry", "iap.listentry", FT_NONE, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_obj_id, { "Object Identifier", "iap.objectid", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_attr_type, { "Type", "iap.attrtype", FT_UINT8, BASE_DEC, VALS(iap_attr_type_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_int, { "Value", "iap.int", FT_INT32, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_seq_len, { "Sequence Length", "iap.seqlen", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_oct_seq, { "Sequence", "iap.octseq", - FT_BYTES, BASE_HEX, NULL, 0x0, - "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, { &hf_iap_char_set, { "Character Set", "iap.charset", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_string, { "String", "iap.string", FT_UINT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_invaloctet, { "Malformed IAP result: \"", "iap.invaloctet", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_iap_invallsap, { "Malformed IAP result: \"", "iap.invallsap", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_ttp[] = { { &hf_ttp_p, { "Parameter Bit", "ttp.p", FT_BOOLEAN, 8, TFS(&set_notset), TTP_PARAMETERS, - "", HFILL }}, + NULL, HFILL }}, { &hf_ttp_icredit, { "Initial Credit", "ttp.icredit", FT_UINT8, BASE_DEC, NULL, ~TTP_PARAMETERS, - "", HFILL }}, + NULL, HFILL }}, { &hf_ttp_m, { "More Bit", "ttp.m", FT_BOOLEAN, 8, TFS(&set_notset), TTP_MORE, - "", HFILL }}, + NULL, HFILL }}, { &hf_ttp_dcredit, { "Delta Credit", "ttp.dcredit", FT_UINT8, BASE_DEC, NULL, ~TTP_MORE, - "", HFILL }} + NULL, HFILL }} }; /* Setup protocol subtree arrays */ diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index b8803562a3..26541d6287 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -200,31 +200,31 @@ proto_register_irsir(void) { &hf_sir_bof, { "Beginning of frame", "sir.bof", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_ce, { "Command escape", "sir.ce", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_eof, { "End of frame", "sir.eof", FT_UINT8, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_fcs, { "Frame check sequence", "sir.fcs", FT_UINT16, BASE_HEX, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_fcs_bad, { "Bad frame check sequence", "sir.fcs_bad", - FT_BOOLEAN, BASE_NONE, NULL, 0, - "", HFILL }}, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, { &hf_sir_length, { "Length", "sir.length", FT_UINT16, BASE_DEC, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_sir_preamble, { "Preamble", "sir.preamble", FT_BYTES, BASE_NONE, NULL, 0, - "", HFILL }} + NULL, HFILL }} }; proto_sir = proto_register_protocol( diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index c7dab777be..a1588cdbf3 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -6896,652 +6896,652 @@ proto_register_pn_io (void) { static hf_register_info hf[] = { { &hf_pn_io_opnum, - { "Operation", "pn_io.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Operation", "pn_io.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_reserved16, - { "Reserved", "pn_io.reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Reserved", "pn_io.reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_array, - { "Array", "pn_io.array", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Array", "pn_io.array", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_status, - { "Status", "pn_io.status", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Status", "pn_io.status", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_args_max, - { "ArgsMaximum", "pn_io.args_max", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ArgsMaximum", "pn_io.args_max", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_args_len, - { "ArgsLength", "pn_io.args_len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ArgsLength", "pn_io.args_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_array_max_count, - { "MaximumCount", "pn_io.array_max_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MaximumCount", "pn_io.array_max_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_array_offset, - { "Offset", "pn_io.array_offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Offset", "pn_io.array_offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_array_act_count, - { "ActualCount", "pn_io.array_act_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ActualCount", "pn_io.array_act_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ar_type, - { "ARType", "pn_io.ar_type", FT_UINT16, BASE_HEX, VALS(pn_io_ar_type), 0x0, "", HFILL }}, + { "ARType", "pn_io.ar_type", FT_UINT16, BASE_HEX, VALS(pn_io_ar_type), 0x0, NULL, HFILL }}, { &hf_pn_io_cminitiator_macadd, - { "CMInitiatorMacAdd", "pn_io.cminitiator_mac_add", FT_ETHER, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "CMInitiatorMacAdd", "pn_io.cminitiator_mac_add", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_io_cminitiator_objectuuid, - { "CMInitiatorObjectUUID", "pn_io.cminitiator_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, "", HFILL }}, + { "CMInitiatorObjectUUID", "pn_io.cminitiator_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_io_parameter_server_objectuuid, - { "ParameterServerObjectUUID", "pn_io.parameter_server_objectuuid", FT_GUID, BASE_NONE, 0x0, 0x0, "", HFILL }}, + { "ParameterServerObjectUUID", "pn_io.parameter_server_objectuuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_io_ar_properties, - { "ARProperties", "pn_io.ar_properties", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ARProperties", "pn_io.ar_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ar_properties_state, - { "State", "pn_io.ar_properties.state", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_state), 0x00000007, "", HFILL }}, + { "State", "pn_io.ar_properties.state", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_state), 0x00000007, NULL, HFILL }}, { &hf_pn_io_ar_properties_supervisor_takeover_allowed, - { "SupervisorTakeoverAllowed", "pn_io.ar_properties.supervisor_takeover_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_supervisor_takeover_allowed), 0x00000008, "", HFILL }}, + { "SupervisorTakeoverAllowed", "pn_io.ar_properties.supervisor_takeover_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_supervisor_takeover_allowed), 0x00000008, NULL, HFILL }}, { &hf_pn_io_ar_properties_parametrization_server, - { "ParametrizationServer", "pn_io.ar_properties.parametrization_server", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_parametrization_server), 0x00000010, "", HFILL }}, + { "ParametrizationServer", "pn_io.ar_properties.parametrization_server", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_parametrization_server), 0x00000010, NULL, HFILL }}, { &hf_pn_io_ar_properties_data_rate, - { "DataRate", "pn_io.ar_properties.data_rate", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_data_rate), 0x00000060, "", HFILL }}, + { "DataRate", "pn_io.ar_properties.data_rate", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_data_rate), 0x00000060, NULL, HFILL }}, { &hf_pn_io_ar_properties_reserved_1, - { "Reserved_1", "pn_io.ar_properties.reserved_1", FT_UINT32, BASE_HEX, NULL, 0x00000080, "", HFILL }}, + { "Reserved_1", "pn_io.ar_properties.reserved_1", FT_UINT32, BASE_HEX, NULL, 0x00000080, NULL, HFILL }}, { &hf_pn_io_ar_properties_device_access, - { "DeviceAccess", "pn_io.ar_properties.device_access", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_device_access), 0x00000100, "", HFILL }}, + { "DeviceAccess", "pn_io.ar_properties.device_access", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_device_access), 0x00000100, NULL, HFILL }}, { &hf_pn_io_ar_properties_companion_ar, - { "CompanionAR", "pn_io.ar_properties.companion_ar", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_companion_ar), 0x00000600, "", HFILL }}, + { "CompanionAR", "pn_io.ar_properties.companion_ar", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_companion_ar), 0x00000600, NULL, HFILL }}, { &hf_pn_io_ar_properties_achnowledge_companion_ar, - { "AcknowledgeCompanionAR", "pn_io.ar_properties.acknowledge_companion_ar", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_acknowldege_companion_ar), 0x00000800, "", HFILL }}, + { "AcknowledgeCompanionAR", "pn_io.ar_properties.acknowledge_companion_ar", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_acknowldege_companion_ar), 0x00000800, NULL, HFILL }}, { &hf_pn_io_ar_properties_reserved, - { "Reserved", "pn_io.ar_properties.reserved", FT_UINT32, BASE_HEX, NULL, 0x7FFFF000, "", HFILL }}, + { "Reserved", "pn_io.ar_properties.reserved", FT_UINT32, BASE_HEX, NULL, 0x7FFFF000, NULL, HFILL }}, { &hf_pn_io_ar_properties_pull_module_alarm_allowed, - { "PullModuleAlarmAllowed", "pn_io.ar_properties.pull_module_alarm_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_pull_module_alarm_allowed), 0x80000000, "", HFILL }}, + { "PullModuleAlarmAllowed", "pn_io.ar_properties.pull_module_alarm_allowed", FT_UINT32, BASE_HEX, VALS(pn_io_arproperties_pull_module_alarm_allowed), 0x80000000, NULL, HFILL }}, { &hf_pn_io_cminitiator_activitytimeoutfactor, - { "CMInitiatorActivityTimeoutFactor", "pn_io.cminitiator_activitytimeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "CMInitiatorActivityTimeoutFactor", "pn_io.cminitiator_activitytimeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_cminitiator_udprtport, - { "CMInitiatorUDPRTPort", "pn_io.cminitiator_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "CMInitiatorUDPRTPort", "pn_io.cminitiator_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_station_name_length, - { "StationNameLength", "pn_io.station_name_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "StationNameLength", "pn_io.station_name_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_cminitiator_station_name, - { "CMInitiatorStationName", "pn_io.cminitiator_station_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "CMInitiatorStationName", "pn_io.cminitiator_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_parameter_server_station_name, - { "ParameterServerStationName", "pn_io.parameter_server_station_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ParameterServerStationName", "pn_io.parameter_server_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_cmresponder_macadd, - { "CMResponderMacAdd", "pn_io.cmresponder_macadd", FT_ETHER, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "CMResponderMacAdd", "pn_io.cmresponder_macadd", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_io_cmresponder_udprtport, - { "CMResponderUDPRTPort", "pn_io.cmresponder_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "CMResponderUDPRTPort", "pn_io.cmresponder_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_number_of_iocrs, - { "NumberOfIOCRs", "pn_io.number_of_iocrs", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfIOCRs", "pn_io.number_of_iocrs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_tree, - { "IOCR", "pn_io.iocr_tree", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IOCR", "pn_io.iocr_tree", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_type, - { "IOCRType", "pn_io.iocr_type", FT_UINT16, BASE_HEX, VALS(pn_io_iocr_type), 0x0, "", HFILL }}, + { "IOCRType", "pn_io.iocr_type", FT_UINT16, BASE_HEX, VALS(pn_io_iocr_type), 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_reference, - { "IOCRReference", "pn_io.iocr_reference", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOCRReference", "pn_io.iocr_reference", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_lt, - { "LT", "pn_io.lt", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "LT", "pn_io.lt", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_properties, - { "IOCRProperties", "pn_io.iocr_properties", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOCRProperties", "pn_io.iocr_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_properties_rtclass, - { "RTClass", "pn_io.iocr_properties.rtclass", FT_UINT32, BASE_HEX, VALS(pn_io_iocr_properties_rtclass), 0x0000000F, "", HFILL }}, + { "RTClass", "pn_io.iocr_properties.rtclass", FT_UINT32, BASE_HEX, VALS(pn_io_iocr_properties_rtclass), 0x0000000F, NULL, HFILL }}, { &hf_pn_io_iocr_properties_reserved_1, - { "Reserved1", "pn_io.iocr_properties.reserved1", FT_UINT32, BASE_HEX, NULL, 0x000007F0, "", HFILL }}, + { "Reserved1", "pn_io.iocr_properties.reserved1", FT_UINT32, BASE_HEX, NULL, 0x000007F0, NULL, HFILL }}, { &hf_pn_io_iocr_properties_media_redundancy, - { "MediaRedundancy", "pn_io.iocr_properties.media_redundancy", FT_UINT32, BASE_HEX, VALS(pn_io_iocr_properties_media_redundancy), 0x00000800, "", HFILL }}, + { "MediaRedundancy", "pn_io.iocr_properties.media_redundancy", FT_UINT32, BASE_HEX, VALS(pn_io_iocr_properties_media_redundancy), 0x00000800, NULL, HFILL }}, { &hf_pn_io_iocr_properties_reserved_2, - { "Reserved2", "pn_io.iocr_properties.reserved2", FT_UINT32, BASE_HEX, NULL, 0xFFFFF000, "", HFILL }}, + { "Reserved2", "pn_io.iocr_properties.reserved2", FT_UINT32, BASE_HEX, NULL, 0xFFFFF000, NULL, HFILL }}, { &hf_pn_io_data_length, - { "DataLength", "pn_io.data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "DataLength", "pn_io.data_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ir_frame_data, - { "Frame data", "pn_io.ir_frame_data", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Frame data", "pn_io.ir_frame_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_frame_id, - { "FrameID", "pn_io.frame_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "FrameID", "pn_io.frame_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_send_clock_factor, - { "SendClockFactor", "pn_io.send_clock_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "SendClockFactor", "pn_io.send_clock_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_reduction_ratio, - { "ReductionRatio", "pn_io.reduction_ratio", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "ReductionRatio", "pn_io.reduction_ratio", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_phase, - { "Phase", "pn_io.phase", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Phase", "pn_io.phase", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_sequence, - { "Sequence", "pn_io.sequence", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Sequence", "pn_io.sequence", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_frame_send_offset, - { "FrameSendOffset", "pn_io.frame_send_offset", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "FrameSendOffset", "pn_io.frame_send_offset", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_watchdog_factor, - { "WatchdogFactor", "pn_io.watchdog_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "WatchdogFactor", "pn_io.watchdog_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_data_hold_factor, - { "DataHoldFactor", "pn_io.data_hold_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "DataHoldFactor", "pn_io.data_hold_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_tag_header, - { "IOCRTagHeader", "pn_io.iocr_tag_header", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOCRTagHeader", "pn_io.iocr_tag_header", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocr_multicast_mac_add, - { "IOCRMulticastMACAdd", "pn_io.iocr_multicast_mac_add", FT_ETHER, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOCRMulticastMACAdd", "pn_io.iocr_multicast_mac_add", FT_ETHER, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_apis, - { "NumberOfAPIs", "pn_io.number_of_apis", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfAPIs", "pn_io.number_of_apis", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_io_data_objects, - { "NumberOfIODataObjects", "pn_io.number_of_io_data_objects", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfIODataObjects", "pn_io.number_of_io_data_objects", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_io_data_object_frame_offset, - { "IODataObjectFrameOffset", "pn_io.io_data_object_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "IODataObjectFrameOffset", "pn_io.io_data_object_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_iocs, - { "NumberOfIOCS", "pn_io.number_of_iocs", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfIOCS", "pn_io.number_of_iocs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocs_frame_offset, - { "IOCSFrameOffset", "pn_io.iocs_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "IOCSFrameOffset", "pn_io.iocs_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_alarmcr_type, - { "AlarmCRType", "pn_io.alarmcr_type", FT_UINT16, BASE_HEX, VALS(pn_io_alarmcr_type), 0x0, "", HFILL }}, + { "AlarmCRType", "pn_io.alarmcr_type", FT_UINT16, BASE_HEX, VALS(pn_io_alarmcr_type), 0x0, NULL, HFILL }}, { &hf_pn_io_alarmcr_properties, - { "AlarmCRProperties", "pn_io.alarmcr_properties", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "AlarmCRProperties", "pn_io.alarmcr_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_alarmcr_properties_priority, - { "priority", "pn_io.alarmcr_properties.priority", FT_UINT32, BASE_HEX, VALS(pn_io_alarmcr_properties_priority), 0x00000001, "", HFILL }}, + { "priority", "pn_io.alarmcr_properties.priority", FT_UINT32, BASE_HEX, VALS(pn_io_alarmcr_properties_priority), 0x00000001, NULL, HFILL }}, { &hf_pn_io_alarmcr_properties_transport, - { "Transport", "pn_io.alarmcr_properties.transport", FT_UINT32, BASE_HEX, VALS(pn_io_alarmcr_properties_transport), 0x00000002, "", HFILL }}, + { "Transport", "pn_io.alarmcr_properties.transport", FT_UINT32, BASE_HEX, VALS(pn_io_alarmcr_properties_transport), 0x00000002, NULL, HFILL }}, { &hf_pn_io_alarmcr_properties_reserved, - { "Reserved", "pn_io.alarmcr_properties.reserved", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFFC, "", HFILL }}, + { "Reserved", "pn_io.alarmcr_properties.reserved", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFFC, NULL, HFILL }}, { &hf_pn_io_rta_timeoutfactor, - { "RTATimeoutFactor", "pn_io.rta_timeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "RTATimeoutFactor", "pn_io.rta_timeoutfactor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_rta_retries, - { "RTARetries", "pn_io.rta_retries", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, /* XXX - only values 3 - 15 allowed */ + { "RTARetries", "pn_io.rta_retries", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - only values 3 - 15 allowed */ { &hf_pn_io_localalarmref, - { "LocalAlarmReference", "pn_io.localalarmref", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "LocalAlarmReference", "pn_io.localalarmref", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_remotealarmref, - { "RemoteAlarmReference", "pn_io.remotealarmref", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* XXX - special values */ + { "RemoteAlarmReference", "pn_io.remotealarmref", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */ { &hf_pn_io_maxalarmdatalength, - { "MaxAlarmDataLength", "pn_io.maxalarmdatalength", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, /* XXX - only values 200 - 1432 allowed */ + { "MaxAlarmDataLength", "pn_io.maxalarmdatalength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* XXX - only values 200 - 1432 allowed */ { &hf_pn_io_alarmcr_tagheaderhigh, - { "AlarmCRTagHeaderHigh", "pn_io.alarmcr_tagheaderhigh", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* XXX - 16 bitfield! */ + { "AlarmCRTagHeaderHigh", "pn_io.alarmcr_tagheaderhigh", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - 16 bitfield! */ { &hf_pn_io_alarmcr_tagheaderlow, - { "AlarmCRTagHeaderLow", "pn_io.alarmcr_tagheaderlow", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, /* XXX - 16 bitfield!*/ + { "AlarmCRTagHeaderLow", "pn_io.alarmcr_tagheaderlow", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - 16 bitfield!*/ { &hf_pn_io_api_tree, - { "API", "pn_io.api", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "API", "pn_io.api", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_module_tree, - { "Module", "pn_io.module", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Module", "pn_io.module", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_submodule_tree, - { "Submodule", "pn_io.submodule", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Submodule", "pn_io.submodule", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_io_data_object, - { "IODataObject", "pn_io.io_data_object", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IODataObject", "pn_io.io_data_object", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_io_cs, - { "IOCS", "pn_io.io_cs", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IOCS", "pn_io.io_cs", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ar_uuid, - { "ARUUID", "pn_io.ar_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ARUUID", "pn_io.ar_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_target_ar_uuid, - { "TargetARUUID", "pn_io.target_ar_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "TargetARUUID", "pn_io.target_ar_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_api, - { "API", "pn_io.api", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "API", "pn_io.api", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_slot_nr, - { "SlotNumber", "pn_io.slot_nr", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SlotNumber", "pn_io.slot_nr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_subslot_nr, - { "SubslotNumber", "pn_io.subslot_nr", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SubslotNumber", "pn_io.subslot_nr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_index, - { "Index", "pn_io.index", FT_UINT16, BASE_HEX, VALS(pn_io_index), 0x0, "", HFILL }}, + { "Index", "pn_io.index", FT_UINT16, BASE_HEX, VALS(pn_io_index), 0x0, NULL, HFILL }}, { &hf_pn_io_seq_number, - { "SeqNumber", "pn_io.seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SeqNumber", "pn_io.seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_record_data_length, - { "RecordDataLength", "pn_io.record_data_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "RecordDataLength", "pn_io.record_data_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_add_val1, - { "AdditionalValue1", "pn_io.add_val1", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "AdditionalValue1", "pn_io.add_val1", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_add_val2, - { "AdditionalValue2", "pn_io.add_val2", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "AdditionalValue2", "pn_io.add_val2", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_block_header, - { "BlockHeader", "pn_io.block_header", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "BlockHeader", "pn_io.block_header", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_block_type, - { "BlockType", "pn_io.block_type", FT_UINT16, BASE_HEX, VALS(pn_io_block_type), 0x0, "", HFILL }}, + { "BlockType", "pn_io.block_type", FT_UINT16, BASE_HEX, VALS(pn_io_block_type), 0x0, NULL, HFILL }}, { &hf_pn_io_block_length, - { "BlockLength", "pn_io.block_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "BlockLength", "pn_io.block_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_block_version_high, - { "BlockVersionHigh", "pn_io.block_version_high", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "BlockVersionHigh", "pn_io.block_version_high", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_block_version_low, - { "BlockVersionLow", "pn_io.block_version_low", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "BlockVersionLow", "pn_io.block_version_low", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_sessionkey, - { "SessionKey", "pn_io.session_key", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SessionKey", "pn_io.session_key", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_control_command, - { "ControlCommand", "pn_io.control_command", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ControlCommand", "pn_io.control_command", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_control_command_prmend, - { "PrmEnd", "pn_io.control_command.prmend", FT_UINT16, BASE_DEC, NULL, 0x0001, "", HFILL }}, + { "PrmEnd", "pn_io.control_command.prmend", FT_UINT16, BASE_DEC, NULL, 0x0001, NULL, HFILL }}, { &hf_pn_io_control_command_applready, - { "ApplicationReady", "pn_io.control_command.applready", FT_UINT16, BASE_DEC, NULL, 0x0002, "", HFILL }}, + { "ApplicationReady", "pn_io.control_command.applready", FT_UINT16, BASE_DEC, NULL, 0x0002, NULL, HFILL }}, { &hf_pn_io_control_command_release, - { "Release", "pn_io.control_command.release", FT_UINT16, BASE_DEC, NULL, 0x0004, "", HFILL }}, + { "Release", "pn_io.control_command.release", FT_UINT16, BASE_DEC, NULL, 0x0004, NULL, HFILL }}, { &hf_pn_io_control_command_done, - { "Done", "pn_io.control_command.done", FT_UINT16, BASE_DEC, NULL, 0x0008, "", HFILL }}, + { "Done", "pn_io.control_command.done", FT_UINT16, BASE_DEC, NULL, 0x0008, NULL, HFILL }}, { &hf_pn_io_control_command_ready_for_companion, - { "ReadyForCompanion", "pn_io.control_command.ready_for_companion", FT_UINT16, BASE_DEC, NULL, 0x0010, "", HFILL }}, + { "ReadyForCompanion", "pn_io.control_command.ready_for_companion", FT_UINT16, BASE_DEC, NULL, 0x0010, NULL, HFILL }}, { &hf_pn_io_control_command_ready_for_rt_class3, - { "ReadyForRT Class 3", "pn_io.control_command.ready_for_rt_class3", FT_UINT16, BASE_DEC, NULL, 0x0020, "", HFILL }}, + { "ReadyForRT Class 3", "pn_io.control_command.ready_for_rt_class3", FT_UINT16, BASE_DEC, NULL, 0x0020, NULL, HFILL }}, { &hf_pn_io_control_block_properties, - { "ControlBlockProperties", "pn_io.control_block_properties", FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_vals), 0x0, "", HFILL }}, + { "ControlBlockProperties", "pn_io.control_block_properties", FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_control_block_properties_applready, - { "ControlBlockProperties", "pn_io.control_block_properties.appl_ready", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ControlBlockProperties", "pn_io.control_block_properties.appl_ready", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_control_block_properties_applready0, - { "ApplicationReady", "pn_io.control_block_properties.appl_ready0", FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_application_ready_vals), 0x0001, "", HFILL }}, + { "ApplicationReady", "pn_io.control_block_properties.appl_ready0", FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_application_ready_vals), 0x0001, NULL, HFILL }}, { &hf_pn_io_error_code, - { "ErrorCode ", "pn_io.error_code", FT_UINT8, BASE_HEX, VALS(pn_io_error_code), 0x0, "", HFILL }}, + { "ErrorCode", "pn_io.error_code", FT_UINT8, BASE_HEX, VALS(pn_io_error_code), 0x0, NULL, HFILL }}, { &hf_pn_io_error_decode, - { "ErrorDecode", "pn_io.error_decode", FT_UINT8, BASE_HEX, VALS(pn_io_error_decode), 0x0, "", HFILL }}, + { "ErrorDecode", "pn_io.error_decode", FT_UINT8, BASE_HEX, VALS(pn_io_error_decode), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code1, - { "ErrorCode1 ", "pn_io.error_code1", FT_UINT8, BASE_DEC, VALS(pn_io_error_code1), 0x0, "", HFILL }}, + { "ErrorCode1", "pn_io.error_code1", FT_UINT8, BASE_DEC, VALS(pn_io_error_code1), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code2, - { "ErrorCode2 ", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2), 0x0, "", HFILL }}, + { "ErrorCode2", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code1_pniorw, - { "ErrorCode1 ", "pn_io.error_code1", FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pniorw), 0x0, "", HFILL }}, + { "ErrorCode1", "pn_io.error_code1", FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pniorw), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code2_pniorw, - { "ErrorCode2 for PNIORW is user specified! ", "pn_io.error_code2", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ErrorCode2 for PNIORW is user specified!", "pn_io.error_code2", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_error_code1_pnio, - { "ErrorCode1 ", "pn_io.error_code1", FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pnio), 0x0, "", HFILL }}, + { "ErrorCode1", "pn_io.error_code1", FT_UINT8, BASE_DEC, VALS(pn_io_error_code1_pnio), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code2_pnio_22, - { "ErrorCode2 ", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_22), 0x0, "", HFILL }}, + { "ErrorCode2", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_22), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code2_pnio_64, - { "ErrorCode2 ", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_64), 0x0, "", HFILL }}, + { "ErrorCode2", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_64), 0x0, NULL, HFILL }}, { &hf_pn_io_error_code2_pnio_253, - { "ErrorCode2 ", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_253), 0x0, "", HFILL }}, + { "ErrorCode2", "pn_io.error_code2", FT_UINT8, BASE_DEC, VALS(pn_io_error_code2_pnio_253), 0x0, NULL, HFILL }}, { &hf_pn_io_block, - { "Block", "pn_io.block", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Block", "pn_io.block", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_alarm_type, - { "AlarmType", "pn_io.alarm_type", FT_UINT16, BASE_HEX, VALS(pn_io_alarm_type), 0x0, "", HFILL }}, + { "AlarmType", "pn_io.alarm_type", FT_UINT16, BASE_HEX, VALS(pn_io_alarm_type), 0x0, NULL, HFILL }}, { &hf_pn_io_alarm_specifier, - { "AlarmSpecifier", "pn_io.alarm_specifier", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "AlarmSpecifier", "pn_io.alarm_specifier", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_alarm_specifier_sequence, - { "SequenceNumber", "pn_io.alarm_specifier.sequence", FT_UINT16, BASE_HEX, NULL, 0x07FF, "", HFILL }}, + { "SequenceNumber", "pn_io.alarm_specifier.sequence", FT_UINT16, BASE_HEX, NULL, 0x07FF, NULL, HFILL }}, { &hf_pn_io_alarm_specifier_channel, - { "ChannelDiagnosis", "pn_io.alarm_specifier.channel", FT_UINT16, BASE_HEX, NULL, 0x0800, "", HFILL }}, + { "ChannelDiagnosis", "pn_io.alarm_specifier.channel", FT_UINT16, BASE_HEX, NULL, 0x0800, NULL, HFILL }}, { &hf_pn_io_alarm_specifier_manufacturer, - { "ManufacturerSpecificDiagnosis", "pn_io.alarm_specifier.manufacturer", FT_UINT16, BASE_HEX, NULL, 0x1000, "", HFILL }}, + { "ManufacturerSpecificDiagnosis", "pn_io.alarm_specifier.manufacturer", FT_UINT16, BASE_HEX, NULL, 0x1000, NULL, HFILL }}, { &hf_pn_io_alarm_specifier_submodule, - { "SubmoduleDiagnosisState", "pn_io.alarm_specifier.submodule", FT_UINT16, BASE_HEX, NULL, 0x2000, "", HFILL }}, + { "SubmoduleDiagnosisState", "pn_io.alarm_specifier.submodule", FT_UINT16, BASE_HEX, NULL, 0x2000, NULL, HFILL }}, { &hf_pn_io_alarm_specifier_ardiagnosis, - { "ARDiagnosisState", "pn_io.alarm_specifier.ardiagnosis", FT_UINT16, BASE_HEX, NULL, 0x8000, "", HFILL }}, + { "ARDiagnosisState", "pn_io.alarm_specifier.ardiagnosis", FT_UINT16, BASE_HEX, NULL, 0x8000, NULL, HFILL }}, { &hf_pn_io_alarm_dst_endpoint, - { "AlarmDstEndpoint", "pn_io.alarm_dst_endpoint", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "AlarmDstEndpoint", "pn_io.alarm_dst_endpoint", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_alarm_src_endpoint, - { "AlarmSrcEndpoint", "pn_io.alarm_src_endpoint", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "AlarmSrcEndpoint", "pn_io.alarm_src_endpoint", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_pdu_type, - { "PDUType", "pn_io.pdu_type", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PDUType", "pn_io.pdu_type", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_pdu_type_type, - { "Type", "pn_io.pdu_type.type", FT_UINT8, BASE_HEX, VALS(pn_io_pdu_type), 0x0F, "", HFILL }}, + { "Type", "pn_io.pdu_type.type", FT_UINT8, BASE_HEX, VALS(pn_io_pdu_type), 0x0F, NULL, HFILL }}, { &hf_pn_io_pdu_type_version, - { "Version", "pn_io.pdu_type.version", FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL }}, + { "Version", "pn_io.pdu_type.version", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL }}, { &hf_pn_io_add_flags, - { "AddFlags", "pn_io.add_flags", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "AddFlags", "pn_io.add_flags", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_window_size, - { "WindowSize", "pn_io.window_size", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }}, + { "WindowSize", "pn_io.window_size", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }}, { &hf_pn_io_tack, - { "TACK", "pn_io.tack", FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL }}, + { "TACK", "pn_io.tack", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL }}, { &hf_pn_io_send_seq_num, - { "SendSeqNum", "pn_io.send_seq_num", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SendSeqNum", "pn_io.send_seq_num", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ack_seq_num, - { "AckSeqNum", "pn_io.ack_seq_num", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "AckSeqNum", "pn_io.ack_seq_num", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_var_part_len, - { "VarPartLen", "pn_io.var_part_len", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "VarPartLen", "pn_io.var_part_len", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_module_ident_number, - { "ModuleIdentNumber", "pn_io.module_ident_number", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ModuleIdentNumber", "pn_io.module_ident_number", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_submodule_ident_number, - { "SubmoduleIdentNumber", "pn_io.submodule_ident_number", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SubmoduleIdentNumber", "pn_io.submodule_ident_number", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_modules, - { "NumberOfModules", "pn_io.number_of_modules", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "NumberOfModules", "pn_io.number_of_modules", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_module_properties, - { "ModuleProperties", "pn_io.module_properties", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ModuleProperties", "pn_io.module_properties", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_module_state, - { "ModuleState", "pn_io.module_state", FT_UINT16, BASE_HEX, VALS(pn_io_module_state), 0x0, "", HFILL }}, + { "ModuleState", "pn_io.module_state", FT_UINT16, BASE_HEX, VALS(pn_io_module_state), 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_submodules, - { "NumberOfSubmodules", "pn_io.number_of_submodules", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfSubmodules", "pn_io.number_of_submodules", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_submodule_properties, - { "SubmoduleProperties", "pn_io.submodule_properties", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SubmoduleProperties", "pn_io.submodule_properties", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_submodule_properties_type, - { "Type", "pn_io.submodule_properties.type", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_type), 0x0003, "", HFILL }}, + { "Type", "pn_io.submodule_properties.type", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_type), 0x0003, NULL, HFILL }}, { &hf_pn_io_submodule_properties_shared_input, - { "SharedInput", "pn_io.submodule_properties.shared_input", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_shared_input), 0x0004, "", HFILL }}, + { "SharedInput", "pn_io.submodule_properties.shared_input", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_shared_input), 0x0004, NULL, HFILL }}, { &hf_pn_io_submodule_properties_reduce_input_submodule_data_length, - { "ReduceInputSubmoduleDataLength", "pn_io.submodule_properties.reduce_input_submodule_data_length", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_reduce_input_submodule_data_length), 0x0008, "", HFILL }}, + { "ReduceInputSubmoduleDataLength", "pn_io.submodule_properties.reduce_input_submodule_data_length", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_reduce_input_submodule_data_length), 0x0008, NULL, HFILL }}, { &hf_pn_io_submodule_properties_reduce_output_submodule_data_length, - { "ReduceOutputSubmoduleDataLength", "pn_io.submodule_properties.reduce_output_submodule_data_length", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_reduce_output_submodule_data_length), 0x0010, "", HFILL }}, + { "ReduceOutputSubmoduleDataLength", "pn_io.submodule_properties.reduce_output_submodule_data_length", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_reduce_output_submodule_data_length), 0x0010, NULL, HFILL }}, { &hf_pn_io_submodule_properties_discard_ioxs, - { "DiscardIOXS", "pn_io.submodule_properties.discard_ioxs", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_discard_ioxs), 0x0020, "", HFILL }}, + { "DiscardIOXS", "pn_io.submodule_properties.discard_ioxs", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_properties_discard_ioxs), 0x0020, NULL, HFILL }}, { &hf_pn_io_submodule_properties_reserved, - { "Reserved", "pn_io.submodule_properties.reserved", FT_UINT16, BASE_HEX, NULL, 0xFFC0, "", HFILL }}, + { "Reserved", "pn_io.submodule_properties.reserved", FT_UINT16, BASE_HEX, NULL, 0xFFC0, NULL, HFILL }}, { &hf_pn_io_submodule_state, - { "SubmoduleState", "pn_io.submodule_state", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SubmoduleState", "pn_io.submodule_state", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_submodule_state_format_indicator, - { "FormatIndicator", "pn_io.submodule_state.format_indicator", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_format_indicator), 0x8000, "", HFILL }}, + { "FormatIndicator", "pn_io.submodule_state.format_indicator", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_format_indicator), 0x8000, NULL, HFILL }}, { &hf_pn_io_submodule_state_add_info, - { "AddInfo", "pn_io.submodule_state.add_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_add_info), 0x0007, "", HFILL }}, + { "AddInfo", "pn_io.submodule_state.add_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_add_info), 0x0007, NULL, HFILL }}, { &hf_pn_io_submodule_state_qualified_info, - { "QualifiedInfo", "pn_io.submodule_state.qualified_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_qualified_info), 0x0008, "", HFILL }}, + { "QualifiedInfo", "pn_io.submodule_state.qualified_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_qualified_info), 0x0008, NULL, HFILL }}, { &hf_pn_io_submodule_state_maintenance_required, - { "MaintenanceRequired", "pn_io.submodule_state.maintenance_required", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_required), 0x0010, "", HFILL }}, + { "MaintenanceRequired", "pn_io.submodule_state.maintenance_required", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_required), 0x0010, NULL, HFILL }}, { &hf_pn_io_submodule_state_maintenance_demanded, - { "MaintenanceDemanded", "pn_io.submodule_state.maintenance_demanded", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_demanded), 0x0020, "", HFILL }}, + { "MaintenanceDemanded", "pn_io.submodule_state.maintenance_demanded", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_maintenance_demanded), 0x0020, NULL, HFILL }}, { &hf_pn_io_submodule_state_diag_info, - { "DiagInfo", "pn_io.submodule_state.diag_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_diag_info), 0x0040, "", HFILL }}, + { "DiagInfo", "pn_io.submodule_state.diag_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_diag_info), 0x0040, NULL, HFILL }}, { &hf_pn_io_submodule_state_ar_info, - { "ARInfo", "pn_io.submodule_state.ar_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_ar_info), 0x0780, "", HFILL }}, + { "ARInfo", "pn_io.submodule_state.ar_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_ar_info), 0x0780, NULL, HFILL }}, { &hf_pn_io_submodule_state_ident_info, - { "IdentInfo", "pn_io.submodule_state.ident_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_ident_info), 0x7800, "", HFILL }}, + { "IdentInfo", "pn_io.submodule_state.ident_info", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_ident_info), 0x7800, NULL, HFILL }}, { &hf_pn_io_submodule_state_detail, - { "Detail", "pn_io.submodule_state.detail", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_detail), 0x7FFF, "", HFILL }}, + { "Detail", "pn_io.submodule_state.detail", FT_UINT16, BASE_HEX, VALS(pn_io_submodule_state_detail), 0x7FFF, NULL, HFILL }}, { &hf_pn_io_data_description_tree, - { "DataDescription", "pn_io.data_description", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "DataDescription", "pn_io.data_description", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_data_description, - { "DataDescription", "pn_io.data_description", FT_UINT16, BASE_HEX, VALS(pn_io_data_description), 0x0, "", HFILL }}, + { "DataDescription", "pn_io.data_description", FT_UINT16, BASE_HEX, VALS(pn_io_data_description), 0x0, NULL, HFILL }}, { &hf_pn_io_submodule_data_length, - { "SubmoduleDataLength", "pn_io.submodule_data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SubmoduleDataLength", "pn_io.submodule_data_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_iocs, - { "LengthIOCS", "pn_io.length_iocs", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthIOCS", "pn_io.length_iocs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_iops, - { "LengthIOPS", "pn_io.length_iops", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthIOPS", "pn_io.length_iops", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iocs, - { "IOCS", "pn_io.ioxs", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOCS", "pn_io.ioxs", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_iops, - { "IOPS", "pn_io.ioxs", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOPS", "pn_io.ioxs", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ioxs, - { "IOxS", "pn_io.ioxs", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IOxS", "pn_io.ioxs", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ioxs_extension, - { "Extension (1:another IOxS follows/0:no IOxS follows)", "pn_io.ioxs.extension", FT_UINT8, BASE_HEX, NULL, 0x01, "", HFILL }}, + { "Extension (1:another IOxS follows/0:no IOxS follows)", "pn_io.ioxs.extension", FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }}, { &hf_pn_io_ioxs_res14, - { "Reserved (should be zero)", "pn_io.ioxs.res14", FT_UINT8, BASE_HEX, NULL, 0x1E, "", HFILL }}, + { "Reserved (should be zero)", "pn_io.ioxs.res14", FT_UINT8, BASE_HEX, NULL, 0x1E, NULL, HFILL }}, { &hf_pn_io_ioxs_instance, - { "Instance (only valid, if DataState is bad)", "pn_io.ioxs.instance", FT_UINT8, BASE_HEX, VALS(pn_io_ioxs), 0x60, "", HFILL }}, + { "Instance (only valid, if DataState is bad)", "pn_io.ioxs.instance", FT_UINT8, BASE_HEX, VALS(pn_io_ioxs), 0x60, NULL, HFILL }}, { &hf_pn_io_ioxs_datastate, - { "DataState (1:good/0:bad)", "pn_io.ioxs.datastate", FT_UINT8, BASE_HEX, NULL, 0x80, "", HFILL }}, + { "DataState (1:good/0:bad)", "pn_io.ioxs.datastate", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL }}, { &hf_pn_io_address_resolution_properties, - { "AddressResolutionProperties", "pn_io.address_resolution_properties", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "AddressResolutionProperties", "pn_io.address_resolution_properties", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mci_timeout_factor, - { "MCITimeoutFactor", "pn_io.mci_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MCITimeoutFactor", "pn_io.mci_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_provider_station_name, - { "ProviderStationName", "pn_io.provider_station_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ProviderStationName", "pn_io.provider_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_user_structure_identifier, - { "UserStructureIdentifier", "pn_io.user_structure_identifier", FT_UINT16, BASE_HEX, VALS(pn_io_user_structure_identifier), 0x0, "", HFILL }}, + { "UserStructureIdentifier", "pn_io.user_structure_identifier", FT_UINT16, BASE_HEX, VALS(pn_io_user_structure_identifier), 0x0, NULL, HFILL }}, { &hf_pn_io_subframe_wd_factor, - { "SubFrameWDFactor", "pn_io.subframe_wd_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SubFrameWDFactor", "pn_io.subframe_wd_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_subframe_data, - { "SubFrameData", "pn_io.subframe_data", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SubFrameData", "pn_io.subframe_data", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_subframe_data_reserved2, - { "Reserved1", "pn_io.subframe_data.reserved1", FT_UINT32, BASE_DEC, NULL, 0xFFFF0000, "", HFILL }}, + { "Reserved1", "pn_io.subframe_data.reserved1", FT_UINT32, BASE_DEC, NULL, 0xFFFF0000, NULL, HFILL }}, { &hf_pn_io_subframe_data_data_length, - { "DataLength", "pn_io.subframe_data.data_length", FT_UINT32, BASE_DEC, NULL, 0x0000FF00, "", HFILL }}, + { "DataLength", "pn_io.subframe_data.data_length", FT_UINT32, BASE_DEC, NULL, 0x0000FF00, NULL, HFILL }}, { &hf_pn_io_subframe_data_reserved1, - { "Reserved1", "pn_io.subframe_data.reserved1", FT_UINT32, BASE_DEC, NULL, 0x00000080, "", HFILL }}, + { "Reserved1", "pn_io.subframe_data.reserved1", FT_UINT32, BASE_DEC, NULL, 0x00000080, NULL, HFILL }}, { &hf_pn_io_subframe_data_position, - { "Position", "pn_io.subframe_data.position", FT_UINT32, BASE_DEC, NULL, 0x0000007F, "", HFILL }}, + { "Position", "pn_io.subframe_data.position", FT_UINT32, BASE_DEC, NULL, 0x0000007F, NULL, HFILL }}, { &hf_pn_io_channel_number, - { "ChannelNumber", "pn_io.channel_number", FT_UINT16, BASE_HEX, VALS(pn_io_channel_number), 0x0, "", HFILL }}, + { "ChannelNumber", "pn_io.channel_number", FT_UINT16, BASE_HEX, VALS(pn_io_channel_number), 0x0, NULL, HFILL }}, { &hf_pn_io_channel_properties, - { "ChannelProperties", "pn_io.channel_properties", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ChannelProperties", "pn_io.channel_properties", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_channel_properties_type, - { "Type", "pn_io.channel_properties.type", FT_UINT16, BASE_HEX, VALS(pn_io_channel_properties_type), 0x00FF, "", HFILL }}, + { "Type", "pn_io.channel_properties.type", FT_UINT16, BASE_HEX, VALS(pn_io_channel_properties_type), 0x00FF, NULL, HFILL }}, { &hf_pn_io_channel_properties_accumulative, - { "Accumulative", "pn_io.channel_properties.accumulative", FT_UINT16, BASE_HEX, NULL, 0x0100, "", HFILL }}, + { "Accumulative", "pn_io.channel_properties.accumulative", FT_UINT16, BASE_HEX, NULL, 0x0100, NULL, HFILL }}, { &hf_pn_io_channel_properties_maintenance_required, - { "MaintenanceRequired", "pn_io.channel_properties.maintenance_required", FT_UINT16, BASE_HEX, NULL, 0x0200, "", HFILL }}, + { "MaintenanceRequired", "pn_io.channel_properties.maintenance_required", FT_UINT16, BASE_HEX, NULL, 0x0200, NULL, HFILL }}, { &hf_pn_io_channel_properties_maintenance_demanded, - { "MaintenanceDemanded", "pn_io.channel_properties.maintenance_demanded", FT_UINT16, BASE_HEX, NULL, 0x0400, "", HFILL }}, + { "MaintenanceDemanded", "pn_io.channel_properties.maintenance_demanded", FT_UINT16, BASE_HEX, NULL, 0x0400, NULL, HFILL }}, { &hf_pn_io_channel_properties_specifier, - { "Specifier", "pn_io.channel_properties.specifier", FT_UINT16, BASE_HEX, VALS(pn_io_channel_properties_specifier), 0x1800, "", HFILL }}, + { "Specifier", "pn_io.channel_properties.specifier", FT_UINT16, BASE_HEX, VALS(pn_io_channel_properties_specifier), 0x1800, NULL, HFILL }}, { &hf_pn_io_channel_properties_direction, - { "Direction", "pn_io.channel_properties.direction", FT_UINT16, BASE_HEX, VALS(pn_io_channel_properties_direction), 0xE000, "", HFILL }}, + { "Direction", "pn_io.channel_properties.direction", FT_UINT16, BASE_HEX, VALS(pn_io_channel_properties_direction), 0xE000, NULL, HFILL }}, { &hf_pn_io_channel_error_type, - { "ChannelErrorType", "pn_io.channel_error_type", FT_UINT16, BASE_HEX, VALS(pn_io_channel_error_type), 0x0, "", HFILL }}, + { "ChannelErrorType", "pn_io.channel_error_type", FT_UINT16, BASE_HEX, VALS(pn_io_channel_error_type), 0x0, NULL, HFILL }}, { &hf_pn_io_ext_channel_error_type, - { "ExtChannelErrorType", "pn_io.ext_channel_error_type", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ExtChannelErrorType", "pn_io.ext_channel_error_type", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ext_channel_add_value, - { "ExtChannelAddValue", "pn_io.ext_channel_add_value", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ExtChannelAddValue", "pn_io.ext_channel_add_value", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_subdomain_id, - { "PTCPSubdomainID", "pn_io.ptcp_subdomain_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PTCPSubdomainID", "pn_io.ptcp_subdomain_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ir_data_id, - { "IRDataID", "pn_io.ir_data_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IRDataID", "pn_io.ir_data_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_max_bridge_delay, - { "MaxBridgeDelay", "pn_io.max_bridge_delay", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MaxBridgeDelay", "pn_io.max_bridge_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_ports, - { "NumberOfPorts", "pn_io.number_of_ports", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfPorts", "pn_io.number_of_ports", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_max_port_tx_delay, - { "MaxPortTxDelay", "pn_io.max_port_tx_delay", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MaxPortTxDelay", "pn_io.max_port_tx_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_max_port_rx_delay, - { "MaxPortRxDelay", "pn_io.max_port_rx_delay", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MaxPortRxDelay", "pn_io.max_port_rx_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_reserved_interval_begin, - { "ReservedIntervalBegin", "pn_io.reserved_interval_begin", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ReservedIntervalBegin", "pn_io.reserved_interval_begin", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_reserved_interval_end, - { "ReservedIntervalEnd", "pn_io.reserved_interval_end", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ReservedIntervalEnd", "pn_io.reserved_interval_end", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_pllwindow, - { "PLLWindow", "pn_io.pllwindow", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PLLWindow", "pn_io.pllwindow", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_sync_send_factor, - { "SyncSendFactor", "pn_io.sync_send_factor", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SyncSendFactor", "pn_io.sync_send_factor", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_sync_properties, - { "SyncProperties", "pn_io.sync_properties", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SyncProperties", "pn_io.sync_properties", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_sync_frame_address, - { "SyncFrameAddress", "pn_io.sync_frame_address", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SyncFrameAddress", "pn_io.sync_frame_address", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_timeout_factor, - { "PTCPTimeoutFactor", "pn_io.ptcp_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PTCPTimeoutFactor", "pn_io.ptcp_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_takeover_timeout_factor, - { "PTCPTakeoverTimeoutFactor", "pn_io.ptcp_takeover_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PTCPTakeoverTimeoutFactor", "pn_io.ptcp_takeover_timeout_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_master_startup_time, - { "PTCPMasterStartupTime", "pn_io.ptcp_master_startup_time", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PTCPMasterStartupTime", "pn_io.ptcp_master_startup_time", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_master_priority_1, - { "PTCP_MasterPriority1", "pn_io.ptcp_master_priority_1", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PTCP_MasterPriority1", "pn_io.ptcp_master_priority_1", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_master_priority_2, - { "PTCP_MasterPriority2", "pn_io.ptcp_master_priority_2", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PTCP_MasterPriority2", "pn_io.ptcp_master_priority_2", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_length_subdomain_name, - { "PTCPLengthSubdomainName", "pn_io.ptcp_length_subdomain_name", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PTCPLengthSubdomainName", "pn_io.ptcp_length_subdomain_name", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ptcp_subdomain_name, - { "PTCPSubdomainName", "pn_io.ptcp_subdomain_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PTCPSubdomainName", "pn_io.ptcp_subdomain_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_domain_boundary, - { "DomainBoundary", "pn_io.domain_boundary", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DomainBoundary", "pn_io.domain_boundary", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_domain_boundary_ingress, - { "DomainBoundaryIngress", "pn_io.domain_boundary.ingress", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DomainBoundaryIngress", "pn_io.domain_boundary.ingress", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_domain_boundary_egress, - { "DomainBoundaryEgress", "pn_io.domain_boundary.egress", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DomainBoundaryEgress", "pn_io.domain_boundary.egress", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_multicast_boundary, - { "MulticastBoundary", "pn_io.multicast_boundary", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MulticastBoundary", "pn_io.multicast_boundary", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_adjust_properties, - { "AdjustProperties", "pn_io.adjust_properties", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "AdjustProperties", "pn_io.adjust_properties", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mau_type, - { "MAUType", "pn_io.mau_type", FT_UINT16, BASE_HEX, VALS(pn_io_mau_type), 0x0, "", HFILL }}, + { "MAUType", "pn_io.mau_type", FT_UINT16, BASE_HEX, VALS(pn_io_mau_type), 0x0, NULL, HFILL }}, { &hf_pn_io_mau_type_mode, - { "MAUTypeMode", "pn_io.mau_type_mode", FT_UINT16, BASE_HEX, VALS(pn_io_mau_type_mode), 0x0, "", HFILL }}, + { "MAUTypeMode", "pn_io.mau_type_mode", FT_UINT16, BASE_HEX, VALS(pn_io_mau_type_mode), 0x0, NULL, HFILL }}, { &hf_pn_io_port_state, - { "PortState", "pn_io.port_state", FT_UINT16, BASE_HEX, VALS(pn_io_port_state), 0x0, "", HFILL }}, + { "PortState", "pn_io.port_state", FT_UINT16, BASE_HEX, VALS(pn_io_port_state), 0x0, NULL, HFILL }}, { &hf_pn_io_line_delay, { "LineDelay", "pn_io.line_delay", FT_UINT32, BASE_DEC, NULL, 0x0, "LineDelay in nanoseconds", HFILL }}, { &hf_pn_io_number_of_peers, - { "NumberOfPeers", "pn_io.number_of_peers", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfPeers", "pn_io.number_of_peers", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_peer_port_id, - { "LengthPeerPortID", "pn_io.length_peer_port_id", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthPeerPortID", "pn_io.length_peer_port_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_peer_port_id, - { "PeerPortID", "pn_io.peer_port_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PeerPortID", "pn_io.peer_port_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_peer_chassis_id, - { "LengthPeerChassisID", "pn_io.length_peer_chassis_id", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthPeerChassisID", "pn_io.length_peer_chassis_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_peer_chassis_id, - { "PeerChassisID", "pn_io.peer_chassis_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PeerChassisID", "pn_io.peer_chassis_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_own_chassis_id, - { "LengthOwnChassisID", "pn_io.length_own_chassis_id", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthOwnChassisID", "pn_io.length_own_chassis_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_own_chassis_id, - { "OwnChassisID", "pn_io.own_chassis_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "OwnChassisID", "pn_io.own_chassis_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_own_port_id, - { "LengthOwnPortID", "pn_io.length_own_port_id", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthOwnPortID", "pn_io.length_own_port_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_own_port_id, - { "OwnPortID", "pn_io.own_port_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "OwnPortID", "pn_io.own_port_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_peer_macadd, - { "PeerMACAddress", "pn_io.peer_macadd", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PeerMACAddress", "pn_io.peer_macadd", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_macadd, - { "MACAddress", "pn_io.macadd", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "MACAddress", "pn_io.macadd", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_media_type, - { "MediaType", "pn_io.media_type", FT_UINT32, BASE_HEX, VALS(pn_io_media_type), 0x0, "", HFILL }}, + { "MediaType", "pn_io.media_type", FT_UINT32, BASE_HEX, VALS(pn_io_media_type), 0x0, NULL, HFILL }}, { &hf_pn_io_ethertype, - { "Ethertype", "pn_io.ethertype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Ethertype", "pn_io.ethertype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_rx_port, - { "RXPort", "pn_io.rx_port", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "RXPort", "pn_io.rx_port", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_frame_details, - { "FrameDetails", "pn_io.frame_details", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "FrameDetails", "pn_io.frame_details", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_nr_of_tx_port_groups, - { "NumberOfTxPortGroups", "pn_io.nr_of_tx_port_groups", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfTxPortGroups", "pn_io.nr_of_tx_port_groups", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_start_of_red_frame_id, - { "StartOfRedFrameID", "pn_io.start_of_red_frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "StartOfRedFrameID", "pn_io.start_of_red_frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_end_of_red_frame_id, - { "EndOfRedFrameID", "pn_io.end_of_red_frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "EndOfRedFrameID", "pn_io.end_of_red_frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ir_begin_end_port, - { "Port", "pn_io.ir_begin_end_port", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Port", "pn_io.ir_begin_end_port", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_assignments, - { "NumberOfAssignments", "pn_io.number_of_assignments", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfAssignments", "pn_io.number_of_assignments", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_phases, - { "NumberOfPhases", "pn_io.number_of_phases", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfPhases", "pn_io.number_of_phases", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_red_orange_period_begin, - { "RedOrangePeriodBegin", "pn_io.red_orange_period_begin", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "RedOrangePeriodBegin", "pn_io.red_orange_period_begin", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_orange_period_begin, - { "OrangePeriodBegin", "pn_io.orange_period_begin", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "OrangePeriodBegin", "pn_io.orange_period_begin", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_green_period_begin, - { "GreenPeriodBegin", "pn_io.green_period_begin", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "GreenPeriodBegin", "pn_io.green_period_begin", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_tx_phase_assignment, - { "TXPhaseAssignment", "pn_io.tx_phase_assignment", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TXPhaseAssignment", "pn_io.tx_phase_assignment", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_rx_phase_assignment, - { "RXPhaseAssignment", "pn_io.rx_phase_assignment", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "RXPhaseAssignment", "pn_io.rx_phase_assignment", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_slot, - { "Slot", "pn_io.slot", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Slot", "pn_io.slot", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_subslot, - { "Subslot", "pn_io.subslot", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Subslot", "pn_io.subslot", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_slots, - { "NumberOfSlots", "pn_io.number_of_slots", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfSlots", "pn_io.number_of_slots", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_subslots, - { "NumberOfSubslots", "pn_io.number_of_subslots", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfSubslots", "pn_io.number_of_subslots", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_maintenance_required_drop_budget, - { "MaintenanceRequiredDropBudget", "pn_io.maintenance_required_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MaintenanceRequiredDropBudget", "pn_io.maintenance_required_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_maintenance_demanded_drop_budget, - { "MaintenanceDemandedDropBudget", "pn_io.maintenance_demanded_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MaintenanceDemandedDropBudget", "pn_io.maintenance_demanded_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_error_drop_budget, - { "ErrorDropBudget", "pn_io.error_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ErrorDropBudget", "pn_io.error_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_maintenance_required_power_budget, - { "MaintenanceRequiredPowerBudget", "pn_io.maintenance_required_power_budget", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MaintenanceRequiredPowerBudget", "pn_io.maintenance_required_power_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_maintenance_demanded_power_budget, - { "MaintenanceDemandedPowerBudget", "pn_io.maintenance_demanded_power_budget", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MaintenanceDemandedPowerBudget", "pn_io.maintenance_demanded_power_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_error_power_budget, - { "ErrorPowerBudget", "pn_io.error_power_budget", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ErrorPowerBudget", "pn_io.error_power_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_fiber_optic_type, - { "FiberOpticType", "pn_io.fiber_optic_type", FT_UINT32, BASE_HEX, VALS(pn_io_fiber_optic_type), 0x0, "", HFILL }}, + { "FiberOpticType", "pn_io.fiber_optic_type", FT_UINT32, BASE_HEX, VALS(pn_io_fiber_optic_type), 0x0, NULL, HFILL }}, { &hf_pn_io_fiber_optic_cable_type, - { "FiberOpticCableType", "pn_io.fiber_optic_cable_type", FT_UINT32, BASE_HEX, VALS(pn_io_fiber_optic_cable_type), 0x0, "", HFILL }}, + { "FiberOpticCableType", "pn_io.fiber_optic_cable_type", FT_UINT32, BASE_HEX, VALS(pn_io_fiber_optic_cable_type), 0x0, NULL, HFILL }}, { &hf_pn_io_controller_appl_cycle_factor, - { "ControllerApplicationCycleFactor", "pn_io.controller_appl_cycle_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ControllerApplicationCycleFactor", "pn_io.controller_appl_cycle_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_time_data_cycle, - { "TimeDataCycle", "pn_io.time_data_cycle", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TimeDataCycle", "pn_io.time_data_cycle", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_time_io_input, - { "TimeIOInput", "pn_io.time_io_input", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TimeIOInput", "pn_io.time_io_input", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_time_io_output, - { "TimeIOOutput", "pn_io.time_io_output", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TimeIOOutput", "pn_io.time_io_output", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_time_io_input_valid, - { "TimeIOInput", "pn_io.time_io_input_valid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TimeIOInput", "pn_io.time_io_input_valid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_time_io_output_valid, - { "TimeIOOutputValid", "pn_io.time_io_output_valid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TimeIOOutputValid", "pn_io.time_io_output_valid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_maintenance_status, - { "MaintenanceStatus", "pn_io.maintenance_status", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MaintenanceStatus", "pn_io.maintenance_status", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_maintenance_status_required, - { "Required", "pn_io.maintenance_status_required", FT_UINT32, BASE_HEX, NULL, 0x0001, "", HFILL }}, + { "Required", "pn_io.maintenance_status_required", FT_UINT32, BASE_HEX, NULL, 0x0001, NULL, HFILL }}, { &hf_pn_io_maintenance_status_demanded, - { "Demanded", "pn_io.maintenance_status_demanded", FT_UINT32, BASE_HEX, NULL, 0x0002, "", HFILL }}, + { "Demanded", "pn_io.maintenance_status_demanded", FT_UINT32, BASE_HEX, NULL, 0x0002, NULL, HFILL }}, { &hf_pn_io_vendor_id_high, - { "VendorIDHigh", "pn_io.vendor_id_high", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "VendorIDHigh", "pn_io.vendor_id_high", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_vendor_id_low, - { "VendorIDLow", "pn_io.vendor_id_low", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "VendorIDLow", "pn_io.vendor_id_low", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_vendor_block_type, - { "VendorBlockType", "pn_io.vendor_block_type", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "VendorBlockType", "pn_io.vendor_block_type", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_order_id, - { "OrderID", "pn_io.order_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "OrderID", "pn_io.order_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_serial_number, - { "IMSerialNumber", "pn_io.im_serial_number", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IMSerialNumber", "pn_io.im_serial_number", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_hardware_revision, - { "IMHardwareRevision", "pn_io.im_hardware_revision", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMHardwareRevision", "pn_io.im_hardware_revision", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - better use a simple char here -> vals */ { &hf_pn_io_im_revision_prefix, - { "IMRevisionPrefix", "pn_io.im_revision_prefix", FT_UINT8, BASE_HEX, VALS(pn_io_im_revision_prefix_vals), 0x0, "", HFILL }}, + { "IMRevisionPrefix", "pn_io.im_revision_prefix", FT_UINT8, BASE_HEX, VALS(pn_io_im_revision_prefix_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_im_sw_revision_functional_enhancement, - { "IMSWRevisionFunctionalEnhancement", "pn_io.im_sw_revision_functional_enhancement", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMSWRevisionFunctionalEnhancement", "pn_io.im_sw_revision_functional_enhancement", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_revision_bugfix, - { "IM_SWRevisionBugFix", "pn_io.im_revision_bugfix", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IM_SWRevisionBugFix", "pn_io.im_revision_bugfix", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_sw_revision_internal_change, - { "IMSWRevisionInternalChange", "pn_io.im_sw_revision_internal_change", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMSWRevisionInternalChange", "pn_io.im_sw_revision_internal_change", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_revision_counter, - { "IMRevisionCounter", "pn_io.im_revision_counter", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMRevisionCounter", "pn_io.im_revision_counter", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_profile_id, - { "IMProfileID", "pn_io.im_profile_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMProfileID", "pn_io.im_profile_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_profile_specific_type, - { "IMProfileSpecificType", "pn_io.im_profile_specific_type", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMProfileSpecificType", "pn_io.im_profile_specific_type", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_version_major, - { "IMVersionMajor", "pn_io.im_version_major", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMVersionMajor", "pn_io.im_version_major", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_version_minor, - { "IMVersionMinor", "pn_io.im_version_minor", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IMVersionMinor", "pn_io.im_version_minor", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_supported, - { "IM_Supported", "pn_io.im_supported", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "IM_Supported", "pn_io.im_supported", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_ars, - { "NumberOfARs", "pn_io.number_of_ars", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfARs", "pn_io.number_of_ars", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_cycle_counter, - { "CycleCounter", "pn_io.cycle_counter", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "CycleCounter", "pn_io.cycle_counter", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_data_status, - { "DataStatus", "pn_io.ds", FT_UINT8, BASE_HEX, 0, 0x0, "", HFILL }}, + { "DataStatus", "pn_io.ds", FT_UINT8, BASE_HEX, 0, 0x0, NULL, HFILL }}, { &hf_pn_io_data_status_res67, - { "Reserved (should be zero)", "pn_io.ds_res67", FT_UINT8, BASE_HEX, 0, 0xc0, "", HFILL }}, + { "Reserved (should be zero)", "pn_io.ds_res67", FT_UINT8, BASE_HEX, 0, 0xc0, NULL, HFILL }}, { &hf_pn_io_data_status_ok, - { "StationProblemIndicator (1:Ok/0:Problem)", "pn_io.ds_ok", FT_UINT8, BASE_HEX, 0, 0x20, "", HFILL }}, + { "StationProblemIndicator (1:Ok/0:Problem)", "pn_io.ds_ok", FT_UINT8, BASE_HEX, 0, 0x20, NULL, HFILL }}, { &hf_pn_io_data_status_operate, - { "ProviderState (1:Run/0:Stop)", "pn_io.ds_operate", FT_UINT8, BASE_HEX, 0, 0x10, "", HFILL }}, + { "ProviderState (1:Run/0:Stop)", "pn_io.ds_operate", FT_UINT8, BASE_HEX, 0, 0x10, NULL, HFILL }}, { &hf_pn_io_data_status_res3, - { "Reserved (should be zero)", "pn_io.ds_res3", FT_UINT8, BASE_HEX, 0, 0x08, "", HFILL }}, + { "Reserved (should be zero)", "pn_io.ds_res3", FT_UINT8, BASE_HEX, 0, 0x08, NULL, HFILL }}, { &hf_pn_io_data_status_valid, - { "DataValid (1:Valid/0:Invalid)", "pn_io.ds_valid", FT_UINT8, BASE_HEX, 0, 0x04, "", HFILL }}, + { "DataValid (1:Valid/0:Invalid)", "pn_io.ds_valid", FT_UINT8, BASE_HEX, 0, 0x04, NULL, HFILL }}, { &hf_pn_io_data_status_res1, - { "Reserved (should be zero)", "pn_io.ds_res1", FT_UINT8, BASE_HEX, 0, 0x02, "", HFILL }}, + { "Reserved (should be zero)", "pn_io.ds_res1", FT_UINT8, BASE_HEX, 0, 0x02, NULL, HFILL }}, { &hf_pn_io_data_status_primary, - { "State (1:Primary/0:Backup)", "pn_io.ds_primary", FT_UINT8, BASE_HEX, 0, 0x01, "", HFILL }}, + { "State (1:Primary/0:Backup)", "pn_io.ds_primary", FT_UINT8, BASE_HEX, 0, 0x01, NULL, HFILL }}, { &hf_pn_io_transfer_status, - { "TransferStatus", "pn_io.transfer_status", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TransferStatus", "pn_io.transfer_status", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_actual_local_time_stamp, - { "ActualLocalTimeStamp", "pn_io.actual_local_time_stamp", FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ActualLocalTimeStamp", "pn_io.actual_local_time_stamp", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_local_time_stamp, - { "LocalTimeStamp", "pn_io.local_time_stamp", FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LocalTimeStamp", "pn_io.local_time_stamp", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_number_of_log_entries, - { "NumberOfLogEntries", "pn_io.number_of_log_entries", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "NumberOfLogEntries", "pn_io.number_of_log_entries", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_entry_detail, - { "EntryDetail", "pn_io.entry_detail", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "EntryDetail", "pn_io.entry_detail", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_ip_address, - { "IPAddress", "pn_io.ip_address", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IPAddress", "pn_io.ip_address", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_subnetmask, - { "Subnetmask", "pn_io.subnetmask", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Subnetmask", "pn_io.subnetmask", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_standard_gateway, - { "StandardGateway", "pn_io.standard_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "StandardGateway", "pn_io.standard_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_domain_uuid, - { "MRP_DomainUUID", "pn_io.mrp_domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "MRP_DomainUUID", "pn_io.mrp_domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_role, - { "MRP_Role", "pn_io.mrp_role", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_role_vals), 0x0, "", HFILL }}, + { "MRP_Role", "pn_io.mrp_role", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_role_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_length_domain_name, - { "MRP_LengthDomainName", "pn_io.mrp_length_domain_name", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MRP_LengthDomainName", "pn_io.mrp_length_domain_name", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_domain_name, - { "MRP_DomainName", "pn_io.mrp_domain_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "MRP_DomainName", "pn_io.mrp_domain_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_prio, - { "MRP_Prio", "pn_io.mrp_prio", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_prio_vals), 0x0, "", HFILL }}, + { "MRP_Prio", "pn_io.mrp_prio", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_prio_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_topchgt, { "MRP_TOPchgT", "pn_io.mrp_topchgt", FT_UINT16, BASE_DEC, NULL, 0x0, "time base 10ms", HFILL }}, { &hf_pn_io_mrp_topnrmax, @@ -7553,69 +7553,69 @@ proto_register_pn_io (void) { &hf_pn_io_mrp_tstnrmax, { "MRP_TSTNRmax", "pn_io.mrp_tstnrmax", FT_UINT16, BASE_DEC, NULL, 0x0, "number of outstanding test indications causes ring failure", HFILL }}, { &hf_pn_io_mrp_check, - { "MRP_Check", "pn_io.mrp_check", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MRP_Check", "pn_io.mrp_check", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_rtmode, - { "MRP_RTMode", "pn_io.mrp_rtmode", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MRP_RTMode", "pn_io.mrp_rtmode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_rtmode_rtclass12, - { "RTClass1_2", "pn_io.mrp_rtmode.class1_2", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass12_vals), 0x00000001, "", HFILL }}, + { "RTClass1_2", "pn_io.mrp_rtmode.class1_2", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass12_vals), 0x00000001, NULL, HFILL }}, { &hf_pn_io_mrp_rtmode_rtclass3, - { "RTClass1_3", "pn_io.mrp_rtmode.class3", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass3_vals), 0x00000002, "", HFILL }}, + { "RTClass1_3", "pn_io.mrp_rtmode.class3", FT_UINT32, BASE_HEX, VALS(pn_io_mrp_rtmode_rtclass3_vals), 0x00000002, NULL, HFILL }}, { &hf_pn_io_mrp_rtmode_reserved1, - { "Reserved_1", "pn_io.mrp_rtmode.reserved_1", FT_UINT32, BASE_HEX, NULL, 0x00fffffc, "", HFILL }}, + { "Reserved_1", "pn_io.mrp_rtmode.reserved_1", FT_UINT32, BASE_HEX, NULL, 0x00fffffc, NULL, HFILL }}, { &hf_pn_io_mrp_rtmode_reserved2, - { "Reserved_2", "pn_io.mrp_rtmode.reserved_2", FT_UINT32, BASE_HEX, NULL, 0xff000000, "", HFILL }}, + { "Reserved_2", "pn_io.mrp_rtmode.reserved_2", FT_UINT32, BASE_HEX, NULL, 0xff000000, NULL, HFILL }}, { &hf_pn_io_mrp_lnkdownt, { "MRP_LNKdownT", "pn_io.mrp_lnkdownt", FT_UINT16, BASE_HEX, NULL, 0x0, "Link down Interval in ms", HFILL }}, { &hf_pn_io_mrp_lnkupt, { "MRP_LNKupT", "pn_io.mrp_lnkupt", FT_UINT16, BASE_HEX, NULL, 0x0, "Link up Interval in ms", HFILL }}, { &hf_pn_io_mrp_lnknrmax, - { "MRP_LNKNRmax", "pn_io.mrp_lnknrmax", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "MRP_LNKNRmax", "pn_io.mrp_lnknrmax", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_version, - { "MRP_Version", "pn_io.mrp_version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MRP_Version", "pn_io.mrp_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_substitute_active_flag, - { "SubstituteActiveFlag", "pn_io.substitute_active_flag", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SubstituteActiveFlag", "pn_io.substitute_active_flag", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_length_data, - { "LengthData", "pn_io.length_data", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "LengthData", "pn_io.length_data", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_ring_state, - { "MRP_RingState", "pn_io.mrp_ring_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_ring_state_vals), 0x0, "", HFILL }}, + { "MRP_RingState", "pn_io.mrp_ring_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_ring_state_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_mrp_rt_state, - { "MRP_RTState", "pn_io.mrp_rt_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_rt_state_vals), 0x0, "", HFILL }}, + { "MRP_RTState", "pn_io.mrp_rt_state", FT_UINT16, BASE_HEX, VALS(pn_io_mrp_rt_state_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_im_tag_function, - { "IM_Tag_Function", "pn_io.im_tag_function", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IM_Tag_Function", "pn_io.im_tag_function", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_tag_location, - { "IM_Tag_Location", "pn_io.im_tag_location", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IM_Tag_Location", "pn_io.im_tag_location", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_date, - { "IM_Date", "pn_io.im_date", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IM_Date", "pn_io.im_date", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_im_descriptor, - { "IM_Descriptor", "pn_io.im_descriptor", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IM_Descriptor", "pn_io.im_descriptor", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_fs_hello_mode, - { "FSHelloMode", "pn_io.fs_hello_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_hello_mode_vals), 0x0, "", HFILL }}, + { "FSHelloMode", "pn_io.fs_hello_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_hello_mode_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_fs_hello_interval, { "FSHelloInterval", "pn_io.fs_hello_interval", FT_UINT32, BASE_DEC, NULL, 0x0, "ms before conveying a second DCP_Hello.req", HFILL }}, { &hf_pn_io_fs_hello_retry, - { "FSHelloRetry", "pn_io.fs_hello_retry", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "FSHelloRetry", "pn_io.fs_hello_retry", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_fs_hello_delay, - { "FSHelloDelay", "pn_io.fs_hello_delay", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "FSHelloDelay", "pn_io.fs_hello_delay", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_fs_parameter_mode, - { "FSParameterMode", "pn_io.fs_parameter_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_parameter_mode_vals), 0x0, "", HFILL }}, + { "FSParameterMode", "pn_io.fs_parameter_mode", FT_UINT32, BASE_HEX, VALS(pn_io_fs_parameter_mode_vals), 0x0, NULL, HFILL }}, { &hf_pn_io_fs_parameter_uuid, - { "FSParameterUUID", "pn_io.fs_parameter_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "FSParameterUUID", "pn_io.fs_parameter_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_check_sync_mode, - { "CheckSyncMode", "pn_io.check_sync_mode", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "CheckSyncMode", "pn_io.check_sync_mode", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_io_check_sync_mode_reserved, - { "Reserved", "pn_io.check_sync_mode.reserved", FT_UINT16, BASE_HEX, NULL, 0xFFFC, "", HFILL }}, + { "Reserved", "pn_io.check_sync_mode.reserved", FT_UINT16, BASE_HEX, NULL, 0xFFFC, NULL, HFILL }}, { &hf_pn_io_check_sync_mode_sync_master, - { "SyncMaster", "pn_io.check_sync_mode.sync_master", FT_UINT16, BASE_HEX, NULL, 0x0002, "", HFILL }}, + { "SyncMaster", "pn_io.check_sync_mode.sync_master", FT_UINT16, BASE_HEX, NULL, 0x0002, NULL, HFILL }}, { &hf_pn_io_check_sync_mode_cable_delay, - { "CableDelay", "pn_io.check_sync_mode.cable_delay", FT_UINT16, BASE_HEX, NULL, 0x0001, "", HFILL }}, + { "CableDelay", "pn_io.check_sync_mode.cable_delay", FT_UINT16, BASE_HEX, NULL, 0x0001, NULL, HFILL }}, }; diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index ef6343874b..83bf8e6cbf 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -4722,42 +4722,42 @@ proto_register_dcom_cba_acco (void) static hf_register_info hf_cba_acco_array[] = { { &hf_cba_acco_opnum, - { "Operation", "cba.acco.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}, + { "Operation", "cba.acco.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_ping_factor, - { "PingFactor", "cba.acco.ping_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "PingFactor", "cba.acco.ping_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_count, - { "Count", "cba.acco.count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Count", "cba.acco.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_info_max, - { "Max", "cba.acco.info_max", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Max", "cba.acco.info_max", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_info_curr, - { "Current", "cba.acco.info_curr", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Current", "cba.acco.info_curr", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_rtauto, - { "RTAuto", "cba.acco.rtauto", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "RTAuto", "cba.acco.rtauto", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_item, - { "Item", "cba.acco.item", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Item", "cba.acco.item", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_data, - { "Data", "cba.acco.data", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Data", "cba.acco.data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_qc, - { "QualityCode", "cba.acco.qc", FT_UINT8, BASE_HEX, VALS(cba_acco_qc_vals), 0x0, "", HFILL }}, + { "QualityCode", "cba.acco.qc", FT_UINT8, BASE_HEX, VALS(cba_acco_qc_vals), 0x0, NULL, HFILL }}, { &hf_cba_acco_time_stamp, - { "TimeStamp", "cba.acco.time_stamp", FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TimeStamp", "cba.acco.time_stamp", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_readitemout, - { "ReadItemOut", "cba.acco.readitemout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ReadItemOut", "cba.acco.readitemout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_writeitemin, - { "WriteItemIn", "cba.acco.writeitemin", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "WriteItemIn", "cba.acco.writeitemin", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cdb_cookie, - { "CDBCookie", "cba.acco.cdb_cookie", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "CDBCookie", "cba.acco.cdb_cookie", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* dcom_hresult_vals from packet-dcom.h doesn't work here, as length is unknown! */ { &hf_cba_acco_conn_error_state, - { "ConnErrorState", "cba.acco.conn_error_state", FT_UINT32, BASE_HEX, NULL /*VALS(dcom_hresult_vals)*/, 0x0, "", HFILL }}, + { "ConnErrorState", "cba.acco.conn_error_state", FT_UINT32, BASE_HEX, NULL /*VALS(dcom_hresult_vals)*/, 0x0, NULL, HFILL }}, { &hf_cba_acco_diag_req, - { "Request", "cba.acco.diag_req", FT_UINT32, BASE_HEX, VALS(cba_acco_diag_req_vals), 0x0, "", HFILL }}, + { "Request", "cba.acco.diag_req", FT_UINT32, BASE_HEX, VALS(cba_acco_diag_req_vals), 0x0, NULL, HFILL }}, { &hf_cba_acco_diag_in_length, - { "InLength", "cba.acco.diag_in_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "InLength", "cba.acco.diag_in_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_diag_out_length, - { "OutLength", "cba.acco.diag_out_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "OutLength", "cba.acco.diag_out_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_diag_data, - { "Data", "cba.acco.diag_data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Data", "cba.acco.diag_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_dcom_call, { "DcomRuntime", "cba.acco.dcom", FT_BOOLEAN, BASE_NONE, TFS(&cba_acco_call_flags), 0x0, "This is a DCOM runtime context", HFILL }}, { &hf_cba_acco_srt_call, @@ -4767,108 +4767,108 @@ proto_register_dcom_cba_acco (void) static hf_register_info hf_cba_acco_server[] = { { &hf_cba_acco_server_pICBAAccoCallback, - { "pICBAAccoCallback", "cba.acco.server_pICBAAccoCallback", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "pICBAAccoCallback", "cba.acco.server_pICBAAccoCallback", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_server_first_connect, - { "FirstConnect", "cba.acco.server_first_connect", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "FirstConnect", "cba.acco.server_first_connect", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_getprovconnout, - { "GETPROVCONNOUT", "cba.acco.getprovconnout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "GETPROVCONNOUT", "cba.acco.getprovconnout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_prov_mac, - { "ProviderMAC", "cba.acco.serversrt_prov_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ProviderMAC", "cba.acco.serversrt_prov_mac", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_cons_mac, - { "ConsumerMAC", "cba.acco.serversrt_cons_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ConsumerMAC", "cba.acco.serversrt_cons_mac", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_cr_id, - { "ConsumerCRID", "cba.acco.serversrt_cr_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ConsumerCRID", "cba.acco.serversrt_cr_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_cr_length, - { "CRLength", "cba.acco.serversrt_cr_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "CRLength", "cba.acco.serversrt_cr_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_cr_flags, - { "Flags", "cba.acco.serversrt_cr_flags", FT_UINT32, BASE_HEX, 0, 0x0, "", HFILL }}, + { "Flags", "cba.acco.serversrt_cr_flags", FT_UINT32, BASE_HEX, 0, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_cr_flags_timestamped, - { "Timestamped", "cba.acco.serversrt_cr_flags_timestamped", FT_BOOLEAN, 32, TFS (&acco_flags_set_truth), 0x1, "", HFILL }}, + { "Timestamped", "cba.acco.serversrt_cr_flags_timestamped", FT_BOOLEAN, 32, TFS (&acco_flags_set_truth), 0x1, NULL, HFILL }}, { &hf_cba_acco_serversrt_cr_flags_reconfigure, - { "Reconfigure", "cba.acco.serversrt_cr_flags_reconfigure", FT_BOOLEAN, 32, TFS (&acco_flags_set_truth), 0x2, "", HFILL }}, + { "Reconfigure", "cba.acco.serversrt_cr_flags_reconfigure", FT_BOOLEAN, 32, TFS (&acco_flags_set_truth), 0x2, NULL, HFILL }}, { &hf_cba_type_desc_len, - { "TypeDescLen", "cba.acco.type_desc_len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TypeDescLen", "cba.acco.type_desc_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_record_length, - { "RecordLength", "cba.acco.serversrt_record_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "RecordLength", "cba.acco.serversrt_record_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_action, - { "Action", "cba.acco.serversrt_action", FT_UINT32, BASE_DEC, VALS(cba_acco_serversrt_action_vals), 0x0, "", HFILL }}, + { "Action", "cba.acco.serversrt_action", FT_UINT32, BASE_DEC, VALS(cba_acco_serversrt_action_vals), 0x0, NULL, HFILL }}, { &hf_cba_acco_serversrt_last_connect, - { "LastConnect", "cba.acco.serversrt_last_connect", FT_UINT8, BASE_DEC, VALS(cba_acco_serversrt_last_connect_vals), 0x0, "", HFILL }}, + { "LastConnect", "cba.acco.serversrt_last_connect", FT_UINT8, BASE_DEC, VALS(cba_acco_serversrt_last_connect_vals), 0x0, NULL, HFILL }}, }; static hf_register_info hf_cba_connectcr_array[] = { { &hf_cba_acco_prov_crid, - { "ProviderCRID", "cba.acco.prov_crid", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ProviderCRID", "cba.acco.prov_crid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, }; static hf_register_info hf_cba_connect_array[] = { { &hf_cba_addconnectionin, - { "ADDCONNECTIONIN", "cba.acco.addconnectionin", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ADDCONNECTIONIN", "cba.acco.addconnectionin", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_addconnectionout, - { "ADDCONNECTIONOUT", "cba.acco.addconnectionout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ADDCONNECTIONOUT", "cba.acco.addconnectionout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_getidout, - { "GETIDOUT", "cba.acco.getidout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "GETIDOUT", "cba.acco.getidout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_getconnectionout, - { "GETCONNECTIONOUT", "cba.acco.getconnectionout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "GETCONNECTIONOUT", "cba.acco.getconnectionout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_getconsconnout, - { "GETCONSCONNOUT", "cba.acco.getconsconnout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "GETCONSCONNOUT", "cba.acco.getconsconnout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_diagconsconnout, - { "DIAGCONSCONNOUT", "cba.acco.diagconsconnout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "DIAGCONSCONNOUT", "cba.acco.diagconsconnout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_connectincr, - { "CONNECTINCR", "cba.acco.connectincr", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "CONNECTINCR", "cba.acco.connectincr", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_connectoutcr, - { "CONNECTOUTCR", "cba.acco.connectoutcr", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "CONNECTOUTCR", "cba.acco.connectoutcr", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_connectin, - { "CONNECTIN", "cba.acco.connectin", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "CONNECTIN", "cba.acco.connectin", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_connectout, - { "CONNECTOUT", "cba.acco.connectout", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "CONNECTOUT", "cba.acco.connectout", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_prov_id, - { "ProviderID", "cba.acco.conn_prov_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ProviderID", "cba.acco.conn_prov_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_cons_id, - { "ConsumerID", "cba.acco.conn_cons_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ConsumerID", "cba.acco.conn_cons_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_version, - { "ConnVersion", "cba.acco.conn_version", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "ConnVersion", "cba.acco.conn_version", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_consumer, - { "Consumer", "cba.acco.conn_consumer", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Consumer", "cba.acco.conn_consumer", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_qos_type, - { "QoSType", "cba.acco.conn_qos_type", FT_UINT16, BASE_HEX, VALS(cba_qos_type_vals), 0x0, "", HFILL }}, + { "QoSType", "cba.acco.conn_qos_type", FT_UINT16, BASE_HEX, VALS(cba_qos_type_vals), 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_qos_value, - { "QoSValue", "cba.acco.conn_qos_value", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "QoSValue", "cba.acco.conn_qos_value", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_state, - { "State", "cba.acco.conn_state", FT_UINT8, BASE_HEX, VALS(cba_acco_conn_state_vals), 0x0, "", HFILL }}, + { "State", "cba.acco.conn_state", FT_UINT8, BASE_HEX, VALS(cba_acco_conn_state_vals), 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_provider, - { "Provider", "cba.acco.conn_provider", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Provider", "cba.acco.conn_provider", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_provider_item, - { "ProviderItem", "cba.acco.conn_provider_item", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ProviderItem", "cba.acco.conn_provider_item", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_consumer_item, - { "ConsumerItem", "cba.acco.conn_consumer_item", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ConsumerItem", "cba.acco.conn_consumer_item", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_persist, - { "Persistence", "cba.acco.conn_persist", FT_UINT16, BASE_HEX, VALS(cba_persist_vals), 0x0, "", HFILL }}, + { "Persistence", "cba.acco.conn_persist", FT_UINT16, BASE_HEX, VALS(cba_persist_vals), 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_epsilon, - { "Epsilon", "cba.acco.conn_epsilon", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Epsilon", "cba.acco.conn_epsilon", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_conn_substitute, - { "Substitute", "cba.acco.conn_substitute", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Substitute", "cba.acco.conn_substitute", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; static hf_register_info hf_cba_acco_cb[] = { { &hf_cba_acco_cb_length, - { "Length", "cba.acco.cb_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Length", "cba.acco.cb_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_version, - { "Version", "cba.acco.cb_version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Version", "cba.acco.cb_version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_flags, - { "Flags", "cba.acco.cb_flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Flags", "cba.acco.cb_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_count, - { "Count", "cba.acco.cb_count", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Count", "cba.acco.cb_count", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_conn_data, - { "CBA Connection data", "cba.acco.cb_conn_data", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "CBA Connection data", "cba.acco.cb_conn_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_item, - { "Item", "cba.acco.cb_item", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Item", "cba.acco.cb_item", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_item_hole, - { "Hole", "cba.acco.cb_item_hole", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Hole", "cba.acco.cb_item_hole", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_item_length, - { "Length", "cba.acco.cb_item_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Length", "cba.acco.cb_item_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_acco_cb_item_data, - { "Data(Hex)", "cba.acco.cb_item_data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Data(Hex)", "cba.acco.cb_item_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_connect_in, { "Connect in frame", "cba.connect_in", FT_FRAMENUM, BASE_NONE, NULL, 0, "This connection Connect was in the packet with this number", HFILL }}, diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c index 086f6a1854..0281ebb707 100644 --- a/plugins/profinet/packet-dcom-cba.c +++ b/plugins/profinet/packet-dcom-cba.c @@ -1428,89 +1428,89 @@ proto_register_dcom_cba (void) { static hf_register_info hf_cba_browse_array[] = { { &hf_cba_browse_count, - { "Count", "cba.browse.count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Count", "cba.browse.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_offset, - { "Offset", "cba.browse.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Offset", "cba.browse.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_max_return, - { "MaxReturn", "cba.browse.max_return", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "MaxReturn", "cba.browse.max_return", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_item, - { "ItemNames", "cba.browse.item", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ItemNames", "cba.browse.item", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_data_type, - { "DataTypes", "cba.browse.data_type", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "DataTypes", "cba.browse.data_type", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_access_right, - { "AccessRights", "cba.browse.access_right", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "AccessRights", "cba.browse.access_right", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_selector, - { "Selector", "cba.browse.selector", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Selector", "cba.browse.selector", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_info1, - { "Info1", "cba.browse.info1", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Info1", "cba.browse.info1", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_browse_info2, - { "Info2", "cba.browse.info2", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Info2", "cba.browse.info2", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; static hf_register_info hf_cba_pdev_array[] = { { &hf_cba_revision_major, - { "Major", "cba.revision_major", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Major", "cba.revision_major", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_revision_minor, - { "Minor", "cba.revision_minor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Minor", "cba.revision_minor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_revision_service_pack, - { "ServicePack", "cba.revision_service_pack", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ServicePack", "cba.revision_service_pack", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_revision_build, - { "Build", "cba_revision_build", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Build", "cba_revision_build", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_producer, - { "Producer", "cba.producer", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Producer", "cba.producer", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_product, - { "Product", "cba.product", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Product", "cba.product", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_multi_app, - { "MultiApp", "cba.multi_app", FT_UINT16, BASE_HEX, VALS(dcom_boolean_vals), 0x0, "", HFILL }}, + { "MultiApp", "cba.multi_app", FT_UINT16, BASE_HEX, VALS(dcom_boolean_vals), 0x0, NULL, HFILL }}, { &hf_cba_profinet_dcom_stack, - { "PROFInetDCOMStack", "cba.profinet_dcom_stack", FT_UINT16, BASE_HEX, VALS(dcom_boolean_vals), 0x0, "", HFILL }}, + { "PROFInetDCOMStack", "cba.profinet_dcom_stack", FT_UINT16, BASE_HEX, VALS(dcom_boolean_vals), 0x0, NULL, HFILL }}, { &hf_cba_pdev_stamp, - { "PDevStamp", "cba.pdev_stamp", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "PDevStamp", "cba.pdev_stamp", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_save_ldev_name, - { "LDevName", "cba.save_ldev_name", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "LDevName", "cba.save_ldev_name", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_save_result, - { "PartialResult", "cba.save_result", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PartialResult", "cba.save_result", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; static hf_register_info hf_cba_ldev_array[] = { { &hf_cba_name, - { "Name", "cba.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Name", "cba.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_component_id, - { "ComponentID", "cba.component_id", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ComponentID", "cba.component_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_component_version, - { "Version", "cba.component_version", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Version", "cba.component_version", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_pbaddress, - { "PROFIBUS Address", "cba.pbaddress", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PROFIBUS Address", "cba.pbaddress", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_pbaddress_system_id, - { "SystemID", "cba.pbaddress.system_id", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "SystemID", "cba.pbaddress.system_id", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_pbaddress_address, - { "Address", "cba.pbaddress.address", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Address", "cba.pbaddress.address", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; static hf_register_info hf_cba_array[] = { { &hf_cba_opnum, - { "Operation", "cba.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}, + { "Operation", "cba.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_cba_production_date, - { "ProductionDate", "cba.production_date", FT_DOUBLE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "ProductionDate", "cba.production_date", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_time, - { "Time", "cba.time", FT_DOUBLE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Time", "cba.time", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_serial_no, - { "SerialNo", "cba.serial_no", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "SerialNo", "cba.serial_no", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_cba_state, - { "State", "cba.state", FT_UINT16, BASE_HEX, VALS(cba_state_vals), 0x0, "", HFILL }}, + { "State", "cba.state", FT_UINT16, BASE_HEX, VALS(cba_state_vals), 0x0, NULL, HFILL }}, { &hf_cba_new_state, - { "NewState", "cba.state_new", FT_UINT16, BASE_HEX, VALS(cba_state_vals), 0x0, "", HFILL }}, + { "NewState", "cba.state_new", FT_UINT16, BASE_HEX, VALS(cba_state_vals), 0x0, NULL, HFILL }}, { &hf_cba_old_state, - { "OldState", "cba.state_old", FT_UINT16, BASE_HEX, VALS(cba_state_vals), 0x0, "", HFILL }}, + { "OldState", "cba.state_old", FT_UINT16, BASE_HEX, VALS(cba_state_vals), 0x0, NULL, HFILL }}, { &hf_cba_cookie, - { "Cookie", "cba.cookie", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Cookie", "cba.cookie", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_cba_grouperror, - { "GroupError", "cba.grouperror", FT_UINT16, BASE_HEX, VALS(cba_grouperror_vals), 0x0, "", HFILL }}, + { "GroupError", "cba.grouperror", FT_UINT16, BASE_HEX, VALS(cba_grouperror_vals), 0x0, NULL, HFILL }}, { &hf_cba_new_grouperror, - { "NewGroupError", "cba.grouperror_new", FT_UINT16, BASE_HEX, VALS(cba_grouperror_vals), 0x0, "", HFILL }}, + { "NewGroupError", "cba.grouperror_new", FT_UINT16, BASE_HEX, VALS(cba_grouperror_vals), 0x0, NULL, HFILL }}, { &hf_cba_old_grouperror, - { "OldGroupError", "cba.grouperror_old", FT_UINT16, BASE_HEX, VALS(cba_grouperror_vals), 0x0, "", HFILL }}, + { "OldGroupError", "cba.grouperror_old", FT_UINT16, BASE_HEX, VALS(cba_grouperror_vals), 0x0, NULL, HFILL }}, }; static gint *ett_cba[] = { diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index 6cd99c4588..e33ecb0cd4 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -945,81 +945,81 @@ proto_register_pn_dcp (void) { static hf_register_info hf[] = { { &hf_pn_dcp, - { "PROFINET DCP", "pn_dcp", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PROFINET DCP", "pn_dcp", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_service_id, - { "ServiceID", "pn_dcp.service_id", FT_UINT8, BASE_DEC, VALS(pn_dcp_service_id), 0x0, "", HFILL }}, + { "ServiceID", "pn_dcp.service_id", FT_UINT8, BASE_DEC, VALS(pn_dcp_service_id), 0x0, NULL, HFILL }}, { &hf_pn_dcp_service_type, - { "ServiceType", "pn_dcp.service_type", FT_UINT8, BASE_DEC, VALS(pn_dcp_service_type), 0x0, "", HFILL }}, + { "ServiceType", "pn_dcp.service_type", FT_UINT8, BASE_DEC, VALS(pn_dcp_service_type), 0x0, NULL, HFILL }}, { &hf_pn_dcp_xid, - { "Xid", "pn_dcp.xid", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Xid", "pn_dcp.xid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_reserved8, - { "Reserved", "pn_dcp.reserved8", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Reserved", "pn_dcp.reserved8", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_reserved16, - { "Reserved", "pn_dcp.reserved16", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Reserved", "pn_dcp.reserved16", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_response_delay, - { "ResponseDelay", "pn_dcp.response_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "ResponseDelay", "pn_dcp.response_delay", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_data_length, - { "DCPDataLength", "pn_dcp.data_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "DCPDataLength", "pn_dcp.data_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_block_length, - { "DCPBlockLength", "pn_dcp.block_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "DCPBlockLength", "pn_dcp.block_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_option, - { "Option", "pn_dcp.option", FT_UINT8, BASE_DEC, VALS(pn_dcp_option), 0x0, "", HFILL }}, + { "Option", "pn_dcp.option", FT_UINT8, BASE_DEC, VALS(pn_dcp_option), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption, - { "Suboption", "pn_dcp.suboption", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_block_error, - { "BlockError", "pn_dcp.block_error", FT_UINT8, BASE_DEC, VALS(pn_dcp_block_error), 0x0, "", HFILL }}, + { "BlockError", "pn_dcp.block_error", FT_UINT8, BASE_DEC, VALS(pn_dcp_block_error), 0x0, NULL, HFILL }}, { &hf_pn_dcp_block, - { "Block", "pn_dcp.block", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Block", "pn_dcp.block", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_block_info, - { "BlockInfo", "pn_dcp.block_info", FT_UINT16, BASE_DEC, VALS(pn_dcp_block_info), 0x0, "", HFILL }}, + { "BlockInfo", "pn_dcp.block_info", FT_UINT16, BASE_DEC, VALS(pn_dcp_block_info), 0x0, NULL, HFILL }}, { &hf_pn_dcp_block_qualifier, - { "BlockQualifier", "pn_dcp.block_qualifier", FT_UINT16, BASE_DEC, VALS(pn_dcp_block_qualifier), 0x0, "", HFILL }}, + { "BlockQualifier", "pn_dcp.block_qualifier", FT_UINT16, BASE_DEC, VALS(pn_dcp_block_qualifier), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_ip, - { "Suboption", "pn_dcp.suboption_ip", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_ip), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_ip", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_ip), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_ip_block_info, - { "BlockInfo", "pn_dcp.suboption_ip_block_info", FT_UINT16, BASE_DEC, VALS(pn_dcp_suboption_ip_block_info), 0x0, "", HFILL }}, + { "BlockInfo", "pn_dcp.suboption_ip_block_info", FT_UINT16, BASE_DEC, VALS(pn_dcp_suboption_ip_block_info), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_ip_ip, - { "IPaddress", "pn_dcp.subobtion_ip_ip", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "IPaddress", "pn_dcp.subobtion_ip_ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_ip_subnetmask, - { "Subnetmask", "pn_dcp.subobtion_ip_subnetmask", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Subnetmask", "pn_dcp.subobtion_ip_subnetmask", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_ip_standard_gateway, - { "StandardGateway", "pn_dcp.suboption_ip_standard_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "StandardGateway", "pn_dcp.suboption_ip_standard_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device, - { "Suboption", "pn_dcp.suboption_device", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_device), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_device", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_device), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_typeofstation, - { "TypeOfStation", "pn_dcp.suboption_device_typeofstation", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "TypeOfStation", "pn_dcp.suboption_device_typeofstation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_nameofstation, - { "NameOfStation", "pn_dcp.suboption_device_nameofstation", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "NameOfStation", "pn_dcp.suboption_device_nameofstation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_vendor_id, - { "VendorID", "pn_dcp.suboption_vendor_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "VendorID", "pn_dcp.suboption_vendor_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_id, - { "DeviceID", "pn_dcp.suboption_device_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DeviceID", "pn_dcp.suboption_device_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_role, - { "DeviceRoleDetails", "pn_dcp.suboption_device_role", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "DeviceRoleDetails", "pn_dcp.suboption_device_role", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_device_aliasname, - { "AliasName", "pn_dcp.suboption_device_aliasname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "AliasName", "pn_dcp.suboption_device_aliasname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_dhcp, - { "Suboption", "pn_dcp.suboption_dhcp", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_dhcp), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_dhcp", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_dhcp), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_dhcp_device_id, - { "Device ID", "pn_dcp.suboption_dhcp_device_id", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Device ID", "pn_dcp.suboption_dhcp_device_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_control, - { "Suboption", "pn_dcp.suboption_control", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_control), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_control", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_control), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_control_response, - { "Response", "pn_dcp.suboption_control_response", FT_UINT8, BASE_DEC, VALS(pn_dcp_option), 0x0, "", HFILL }}, + { "Response", "pn_dcp.suboption_control_response", FT_UINT8, BASE_DEC, VALS(pn_dcp_option), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_deviceinitiative, - { "Suboption", "pn_dcp.suboption_deviceinitiative", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_deviceinitiative), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_deviceinitiative", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_deviceinitiative), 0x0, NULL, HFILL }}, { &hf_pn_dcp_deviceinitiative_value, - { "DeviceInitiativeValue", "pn_dcp.deviceinitiative_value", FT_UINT16, BASE_DEC, VALS(pn_dcp_deviceinitiative_value), 0x0, "", HFILL }}, + { "DeviceInitiativeValue", "pn_dcp.deviceinitiative_value", FT_UINT16, BASE_DEC, VALS(pn_dcp_deviceinitiative_value), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_all, - { "Suboption", "pn_dcp.suboption_all", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_all), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_all", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_all), 0x0, NULL, HFILL }}, { &hf_pn_dcp_suboption_manuf, - { "Suboption", "pn_dcp.suboption_manuf", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_manuf), 0x0, "", HFILL }}, + { "Suboption", "pn_dcp.suboption_manuf", FT_UINT8, BASE_DEC, VALS(pn_dcp_suboption_manuf), 0x0, NULL, HFILL }}, }; static gint *ett[] = { diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 22ca9972c8..ab0680d945 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -414,21 +414,21 @@ proto_register_pn_mrp (void) { static hf_register_info hf[] = { { &hf_pn_mrp_type, - { "Type", "pn_mrp.type", FT_UINT8, BASE_HEX, VALS(pn_mrp_block_type_vals), 0x0, "", HFILL }}, + { "Type", "pn_mrp.type", FT_UINT8, BASE_HEX, VALS(pn_mrp_block_type_vals), 0x0, NULL, HFILL }}, { &hf_pn_mrp_length, - { "Length", "pn_mrp.length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Length", "pn_mrp.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_mrp_version, - { "Version", "pn_mrp.version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Version", "pn_mrp.version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_mrp_sequence_id, { "SequenceID", "pn_mrp.sequence_id", FT_UINT16, BASE_HEX, NULL, 0x0, "Unique sequence number to each outstanding service request", HFILL }}, { &hf_pn_mrp_sa, - { "SA", "pn_mrp.sa", FT_ETHER, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "SA", "pn_mrp.sa", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_mrp_prio, - { "Prio", "pn_mrp.prio", FT_UINT16, BASE_HEX, VALS(pn_mrp_prio_vals), 0x0, "", HFILL }}, + { "Prio", "pn_mrp.prio", FT_UINT16, BASE_HEX, VALS(pn_mrp_prio_vals), 0x0, NULL, HFILL }}, { &hf_pn_mrp_port_role, - { "PortRole", "pn_mrp.port_role", FT_UINT16, BASE_HEX, VALS(pn_mrp_port_role_vals), 0x0, "", HFILL }}, + { "PortRole", "pn_mrp.port_role", FT_UINT16, BASE_HEX, VALS(pn_mrp_port_role_vals), 0x0, NULL, HFILL }}, { &hf_pn_mrp_ring_state, - { "RingState", "pn_mrp.ring_state", FT_UINT16, BASE_HEX, VALS(pn_mrp_ring_state_vals), 0x0, "", HFILL }}, + { "RingState", "pn_mrp.ring_state", FT_UINT16, BASE_HEX, VALS(pn_mrp_ring_state_vals), 0x0, NULL, HFILL }}, { &hf_pn_mrp_interval, { "Interval", "pn_mrp.interval", FT_UINT16, BASE_DEC, NULL, 0x0, "Interval for next topologie change event (in ms)", HFILL }}, { &hf_pn_mrp_transition, @@ -436,14 +436,14 @@ proto_register_pn_mrp (void) { &hf_pn_mrp_time_stamp, { "TimeStamp", "pn_mrp.time_stamp", FT_UINT16, BASE_HEX, NULL, 0x0, "Actual counter value of 1ms counter", HFILL }}, { &hf_pn_mrp_blocked, - { "Blocked", "pn_mrp.blocked", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Blocked", "pn_mrp.blocked", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pn_mrp_manufacturer_oui, - { "ManufacturerOUI", "pn_mrp.manufacturer_oui", FT_UINT24, BASE_HEX, VALS(pn_mrp_oui_vals), 0x0, "", HFILL }}, + { "ManufacturerOUI", "pn_mrp.manufacturer_oui", FT_UINT24, BASE_HEX, VALS(pn_mrp_oui_vals), 0x0, NULL, HFILL }}, { &hf_pn_mrp_domain_uuid, - { "DomainUUID", "pn_mrp.domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "DomainUUID", "pn_mrp.domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_mrp_oui, { "Organizationally Unique Identifier", "pn_mrp.oui", FT_UINT24, BASE_HEX, - VALS(pn_mrp_oui_vals), 0x0, "", HFILL }}, + VALS(pn_mrp_oui_vals), 0x0, NULL, HFILL }}, }; static gint *ett[] = { diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c index 727959a5fe..6482ce3068 100644 --- a/plugins/profinet/packet-pn-mrrt.c +++ b/plugins/profinet/packet-pn-mrrt.c @@ -213,17 +213,17 @@ proto_register_pn_mrrt (void) static hf_register_info hf[] = { { &hf_pn_mrrt_type, - { "Type", "pn_mrrt.type", FT_UINT8, BASE_HEX, VALS(pn_mrrt_block_type_vals), 0x0, "", HFILL }}, + { "Type", "pn_mrrt.type", FT_UINT8, BASE_HEX, VALS(pn_mrrt_block_type_vals), 0x0, NULL, HFILL }}, { &hf_pn_mrrt_length, - { "Length", "pn_mrrt.length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Length", "pn_mrrt.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_mrrt_version, - { "Version", "pn_mrrt.version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Version", "pn_mrrt.version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_mrrt_sequence_id, { "SequenceID", "pn_mrrt.sequence_id", FT_UINT16, BASE_HEX, NULL, 0x0, "Unique sequence number to each outstanding service request", HFILL }}, { &hf_pn_mrrt_sa, - { "SA", "pn_mrrt.sa", FT_ETHER, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "SA", "pn_mrrt.sa", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_mrrt_domain_uuid, - { "DomainUUID", "pn_mrrt.domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "DomainUUID", "pn_mrrt.domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index 9eed51b16c..eee2f42a8d 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -848,81 +848,81 @@ proto_register_pn_ptcp (void) { static hf_register_info hf[] = { { &hf_pn_ptcp, - { "PROFINET PTCP", "pn_ptcp", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "PROFINET PTCP", "pn_ptcp", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_header, - { "Header", "pn_ptcp.header", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Header", "pn_ptcp.header", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_block, - { "Block", "pn_ptcp.block", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Block", "pn_ptcp.block", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_block_tlvheader, - { "TLVHeader", "pn_ptcp.tlvheader", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "TLVHeader", "pn_ptcp.tlvheader", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_res1, - { "Reserved 1", "pn_ptcp.res1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Reserved 1", "pn_ptcp.res1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_res2, - { "Reserved 2", "pn_ptcp.res2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Reserved 2", "pn_ptcp.res2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_delay10ns, - { "Delay10ns", "pn_ptcp.delay10ns", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Delay10ns", "pn_ptcp.delay10ns", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_seq_id, - { "SequenceID", "pn_ptcp.sequence_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "SequenceID", "pn_ptcp.sequence_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_delay1ns_byte, - { "Delay1ns_Byte", "pn_ptcp.delay1ns_byte", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Delay1ns_Byte", "pn_ptcp.delay1ns_byte", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_delay1ns, - { "Delay1ns", "pn_ptcp.delay1ns", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Delay1ns", "pn_ptcp.delay1ns", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_delay1ns_fup, - { "Delay1ns_FUP", "pn_ptcp.delay1ns_fup", FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Delay1ns_FUP", "pn_ptcp.delay1ns_fup", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_tl_length, - { "TypeLength.Length", "pn_ptcp.tl_length", FT_UINT16, BASE_DEC, 0x0, 0x1FF, "", HFILL }}, + { "TypeLength.Length", "pn_ptcp.tl_length", FT_UINT16, BASE_DEC, 0x0, 0x1FF, NULL, HFILL }}, { &hf_pn_ptcp_tl_type, - { "TypeLength.Type", "pn_ptcp.tl_type", FT_UINT16, BASE_DEC, 0x0, 0xFE00, "", HFILL }}, + { "TypeLength.Type", "pn_ptcp.tl_type", FT_UINT16, BASE_DEC, 0x0, 0xFE00, NULL, HFILL }}, { &hf_pn_ptcp_master_source_address, - { "MasterSourceAddress", "pn_ptcp.master_source_address", FT_ETHER, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "MasterSourceAddress", "pn_ptcp.master_source_address", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_subdomain_uuid, - { "SubdomainUUID", "pn_ptcp.subdomain_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, "", HFILL }}, + { "SubdomainUUID", "pn_ptcp.subdomain_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_port_mac_address, - { "PortMACAddress", "pn_ptcp.port_mac_address", FT_ETHER, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "PortMACAddress", "pn_ptcp.port_mac_address", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_t2portrxdelay, - { "T2PortRxDelay (ns)", "pn_ptcp.t2portrxdelay", FT_UINT32, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "T2PortRxDelay (ns)", "pn_ptcp.t2portrxdelay", FT_UINT32, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_t3porttxdelay, - { "T3PortTxDelay (ns)", "pn_ptcp.t3porttxdelay", FT_UINT32, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "T3PortTxDelay (ns)", "pn_ptcp.t3porttxdelay", FT_UINT32, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_t2timestamp, - { "T2TimeStamp (ns)", "pn_ptcp.t2timestamp", FT_UINT32, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "T2TimeStamp (ns)", "pn_ptcp.t2timestamp", FT_UINT32, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_epoch_number, - { "EpochNumber", "pn_ptcp.epoch_number", FT_UINT16, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "EpochNumber", "pn_ptcp.epoch_number", FT_UINT16, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_seconds, - { "Seconds", "pn_ptcp.seconds", FT_UINT32, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "Seconds", "pn_ptcp.seconds", FT_UINT32, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_nanoseconds, - { "NanoSeconds", "pn_ptcp.nanoseconds", FT_UINT32, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "NanoSeconds", "pn_ptcp.nanoseconds", FT_UINT32, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_flags, - { "Flags", "pn_ptcp.flags", FT_UINT16, BASE_HEX, 0x0, 0x0, "", HFILL }}, + { "Flags", "pn_ptcp.flags", FT_UINT16, BASE_HEX, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_currentutcoffset, - { "CurrentUTCOffset", "pn_ptcp.currentutcoffset", FT_UINT16, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "CurrentUTCOffset", "pn_ptcp.currentutcoffset", FT_UINT16, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_master_priority1, - { "MasterPriority1", "pn_ptcp.master_priority1", FT_UINT8, BASE_DEC, VALS(pn_ptcp_master_prio1_vals), 0x0, "", HFILL }}, + { "MasterPriority1", "pn_ptcp.master_priority1", FT_UINT8, BASE_DEC, VALS(pn_ptcp_master_prio1_vals), 0x0, NULL, HFILL }}, { &hf_pn_ptcp_master_priority2, - { "MasterPriority2", "pn_ptcp.master_priority2", FT_UINT8, BASE_DEC, VALS(pn_ptcp_master_prio2_vals), 0x0, "", HFILL }}, + { "MasterPriority2", "pn_ptcp.master_priority2", FT_UINT8, BASE_DEC, VALS(pn_ptcp_master_prio2_vals), 0x0, NULL, HFILL }}, { &hf_pn_ptcp_clock_class, - { "ClockClass", "pn_ptcp.clock_class", FT_UINT8, BASE_DEC, VALS(pn_ptcp_clock_class_vals), 0x0, "", HFILL }}, + { "ClockClass", "pn_ptcp.clock_class", FT_UINT8, BASE_DEC, VALS(pn_ptcp_clock_class_vals), 0x0, NULL, HFILL }}, { &hf_pn_ptcp_clock_accuracy, - { "ClockAccuracy", "pn_ptcp.clock_accuracy", FT_UINT8, BASE_DEC, VALS(pn_ptcp_clock_accuracy_vals), 0x0, "", HFILL }}, + { "ClockAccuracy", "pn_ptcp.clock_accuracy", FT_UINT8, BASE_DEC, VALS(pn_ptcp_clock_accuracy_vals), 0x0, NULL, HFILL }}, { &hf_pn_ptcp_clockvariance, - { "ClockVariance", "pn_ptcp.clockvariance", FT_INT16, BASE_DEC, 0x0, 0x0, "", HFILL }}, + { "ClockVariance", "pn_ptcp.clockvariance", FT_INT16, BASE_DEC, 0x0, 0x0, NULL, HFILL }}, { &hf_pn_ptcp_oui, { "Organizationally Unique Identifier", "pn_ptcp.oui", FT_UINT24, BASE_HEX, - VALS(pn_ptcp_oui_vals), 0x0, "", HFILL }}, + VALS(pn_ptcp_oui_vals), 0x0, NULL, HFILL }}, { &hf_pn_ptcp_profinet_subtype, { "Subtype", "pn_ptcp.subtype", FT_UINT8, BASE_HEX, VALS(pn_ptcp_profinet_subtype_vals), 0x0, "PROFINET Subtype", HFILL }}, { &hf_pn_ptcp_irdata_uuid, - { "IRDataUUID", "pn_ptcp.irdata_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, "", HFILL }}, + { "IRDataUUID", "pn_ptcp.irdata_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }}, }; static gint *ett[] = { diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index f7d178d32a..13116c1cae 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -581,39 +581,39 @@ proto_register_pn_rt(void) { static hf_register_info hf[] = { { &hf_pn_rt_frame_id, - { "FrameID", "pn_rt.frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "FrameID", "pn_rt.frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_rt_cycle_counter, { - "CycleCounter", "pn_rt.cycle_counter", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + "CycleCounter", "pn_rt.cycle_counter", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_rt_data_status, { - "DataStatus", "pn_rt.ds", FT_UINT8, BASE_HEX, 0, 0x0, "", HFILL }}, + "DataStatus", "pn_rt.ds", FT_UINT8, BASE_HEX, 0, 0x0, NULL, HFILL }}, { &hf_pn_rt_data_status_res67, { - "Reserved (should be zero)", "pn_rt.ds_res67", FT_UINT8, BASE_HEX, 0, 0xc0, "", HFILL }}, + "Reserved (should be zero)", "pn_rt.ds_res67", FT_UINT8, BASE_HEX, 0, 0xc0, NULL, HFILL }}, { &hf_pn_rt_data_status_ok, { - "StationProblemIndicator (1:Ok/0:Problem)", "pn_rt.ds_ok", FT_UINT8, BASE_HEX, 0, 0x20, "", HFILL }}, + "StationProblemIndicator (1:Ok/0:Problem)", "pn_rt.ds_ok", FT_UINT8, BASE_HEX, 0, 0x20, NULL, HFILL }}, { &hf_pn_rt_data_status_operate, { - "ProviderState (1:Run/0:Stop)", "pn_rt.ds_operate", FT_UINT8, BASE_HEX, 0, 0x10, "", HFILL }}, + "ProviderState (1:Run/0:Stop)", "pn_rt.ds_operate", FT_UINT8, BASE_HEX, 0, 0x10, NULL, HFILL }}, { &hf_pn_rt_data_status_res3, { - "Reserved (should be zero)", "pn_rt.ds_res3", FT_UINT8, BASE_HEX, 0, 0x08, "", HFILL }}, + "Reserved (should be zero)", "pn_rt.ds_res3", FT_UINT8, BASE_HEX, 0, 0x08, NULL, HFILL }}, { &hf_pn_rt_data_status_valid, { - "DataValid (1:Valid/0:Invalid)", "pn_rt.ds_valid", FT_UINT8, BASE_HEX, 0, 0x04, "", HFILL }}, + "DataValid (1:Valid/0:Invalid)", "pn_rt.ds_valid", FT_UINT8, BASE_HEX, 0, 0x04, NULL, HFILL }}, { &hf_pn_rt_data_status_res1, { - "Reserved (should be zero)", "pn_rt.ds_res1", FT_UINT8, BASE_HEX, 0, 0x02, "", HFILL }}, + "Reserved (should be zero)", "pn_rt.ds_res1", FT_UINT8, BASE_HEX, 0, 0x02, NULL, HFILL }}, { &hf_pn_rt_data_status_primary, { - "State (1:Primary/0:Backup)", "pn_rt.ds_primary", FT_UINT8, BASE_HEX, 0, 0x01, "", HFILL }}, + "State (1:Primary/0:Backup)", "pn_rt.ds_primary", FT_UINT8, BASE_HEX, 0, 0x01, NULL, HFILL }}, { &hf_pn_rt_transfer_status, - { "TransferStatus", "pn_rt.transfer_status", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "TransferStatus", "pn_rt.transfer_status", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_rt_sf, { - "SubFrame", "pn_rt.sf", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }}, + "SubFrame", "pn_rt.sf", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_rt_sf_crc16, { - "CRC16", "pn_rt.sf.crc16", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + "CRC16", "pn_rt.sf.crc16", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_rt_sf_position, { - "Position", "pn_rt.sf.position", FT_UINT8, BASE_DEC, NULL, 0x7F, "", HFILL }}, + "Position", "pn_rt.sf.position", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL }}, { &hf_pn_rt_sf_position_control, { - "Control", "pn_rt.sf.position_control", FT_UINT8, BASE_DEC, VALS(pn_rt_position_control), 0x80, "", HFILL }}, + "Control", "pn_rt.sf.position_control", FT_UINT8, BASE_DEC, VALS(pn_rt_position_control), 0x80, NULL, HFILL }}, { &hf_pn_rt_sf_data_length, { - "DataLength", "pn_rt.sf.data_length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + "DataLength", "pn_rt.sf.data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pn_rt_sf_cycle_counter, { - "CycleCounter", "pn_rt.sf.cycle_counter", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + "CycleCounter", "pn_rt.sf.cycle_counter", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; static gint *ett[] = { &ett_pn_rt, diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c index 8828ddca78..5441050511 100644 --- a/plugins/profinet/packet-pn.c +++ b/plugins/profinet/packet-pn.c @@ -286,13 +286,13 @@ init_pn (int proto) { static hf_register_info hf[] = { { &hf_pn_padding, - { "Padding", "pn.padding", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Padding", "pn.padding", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_undecoded_data, - { "Undecoded Data", "pn.undecoded", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Undecoded Data", "pn.undecoded", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_user_data, - { "User Data", "pn.user_data", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "User Data", "pn.user_data", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_pn_malformed, - { "Malformed", "pn_rt.malformed", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }} + { "Malformed", "pn_rt.malformed", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }} }; diff --git a/plugins/sercosiii/packet-sercosiii_1v1_hp.c b/plugins/sercosiii/packet-sercosiii_1v1_hp.c index beacb5c0a0..bb3fa17154 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_hp.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_hp.c @@ -160,7 +160,7 @@ void dissect_siii_hp_init(gint proto_siii) }, { &hf_siii_mdt_hp_info, {"HP info", "siii.mdt.hp.info", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_siii_at_hotplug_address, @@ -175,7 +175,7 @@ void dissect_siii_hp_init(gint proto_siii) }, { &hf_siii_at_hp_info, {"HP info", "siii.at.hp.info", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_siii_mdt_hotplug_control_param, diff --git a/plugins/sercosiii/packet-sercosiii_1v1_svc.c b/plugins/sercosiii/packet-sercosiii_1v1_svc.c index 164b7d7866..b3eb32151c 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_svc.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_svc.c @@ -599,12 +599,12 @@ void dissect_siii_svc_init(gint proto_siii) }, { &hf_siii_mdt_svch_info, {"Svc Info", "siii.mdt.svch.info", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_siii_at_svch_info, {"Svc Info", "siii.at.svch.info", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_siii_mdt_svch_idn, diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 3beeddadea..fcb533c781 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -2682,7 +2682,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, /* FIELDBASE */ NULL, /* FIELDCONVERT */ 0x0, /* BITMASK */ - "", /* FIELDDESCR */ + NULL, /* FIELDDESCR */ HFILL /* HFILL */ } }, @@ -2695,7 +2695,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0xff, - "", + NULL, HFILL } }, @@ -2708,7 +2708,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, VALS(wimaxasncp_function_type_vals), 0x0, - "", + NULL, HFILL } }, @@ -2721,7 +2721,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_op_id_vals), 0xE0, - "", + NULL, HFILL } }, @@ -2734,7 +2734,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0x1F, - "", + NULL, HFILL } }, @@ -2747,7 +2747,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_qos_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2760,7 +2760,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_ho_control_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2773,7 +2773,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_data_path_control_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2786,7 +2786,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_context_delivery_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2799,7 +2799,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_r3_mobility_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2812,7 +2812,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_paging_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2825,7 +2825,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_rrm_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2838,7 +2838,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_authentication_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2851,7 +2851,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_ms_state_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2864,7 +2864,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_reauthentication_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2877,7 +2877,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, VALS(wimaxasncp_session_msg_vals), 0x1F, - "", + NULL, HFILL } }, @@ -2890,7 +2890,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2903,7 +2903,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_NONE, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2916,7 +2916,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2929,7 +2929,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2942,7 +2942,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2952,10 +2952,10 @@ register_wimaxasncp_fields(const char* unused _U_) "TLV", "wimaxasncp.tlv", FT_BYTES, - BASE_HEX, + BASE_NONE, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2968,7 +2968,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2981,7 +2981,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, NULL, 0x0, - "", + NULL, HFILL } }, @@ -2991,10 +2991,10 @@ register_wimaxasncp_fields(const char* unused _U_) "Value", "wimaxasncp.tlv_value_bytes", FT_BYTES, - BASE_HEX, + BASE_NONE, NULL, 0x0, - "", + NULL, HFILL } }, @@ -3007,7 +3007,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0xffff, - "", + NULL, HFILL } }, @@ -3020,7 +3020,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_HEX, NULL, 0xffffffff, - "", + NULL, HFILL } }, @@ -3033,7 +3033,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, NULL, 0x0, - "", + NULL, HFILL } }, @@ -3046,7 +3046,7 @@ register_wimaxasncp_fields(const char* unused _U_) BASE_DEC, NULL, 0x0, - "", + NULL, HFILL } } |