diff options
Diffstat (limited to 'epan')
68 files changed, 540 insertions, 550 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index c851c9d407..1af4d60d5f 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -11762,27 +11762,27 @@ proto_register_amqp(void) "Exchange is durable", HFILL}}, {&hf_amqp_0_10_struct_exchange_query_result_not_found, { "Not-found", "amqp.exchange.exchange-query-result.not-found", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Exchange was not found", HFILL}}, {&hf_amqp_0_10_struct_exchange_bound_result_exchange_not_found, { "Exchange-not-found", "amqp.exchange.exchange-bound-result.exchange-not-found", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}}, {&hf_amqp_0_10_struct_exchange_bound_result_queue_not_found, { "Queue-not-found", "amqp.exchange.exchange-bound-result.queue-not-found", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}}, {&hf_amqp_0_10_struct_exchange_bound_result_queue_not_matched, { "Queue-not-matched", "amqp.exchange.exchange-bound-result.queue-not-matched", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "No binding from exchange to queue", HFILL}}, {&hf_amqp_0_10_struct_exchange_bound_result_key_not_matched, { "Key-not-matched", "amqp.exchange.exchange-bound-result.key-not-matched", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "No binding from exchange with binding-key", HFILL}}, {&hf_amqp_0_10_struct_exchange_bound_result_args_not_matched, { "Args-not-matched", "amqp.exchange.exchange-bound-result.args-not-matched", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, "No binding from exchange with specified arguments", HFILL}}, {&hf_amqp_0_10_struct_queue_query_result_durable, { "Durable", "amqp.queue.queue-query-result.durable", @@ -12102,11 +12102,11 @@ proto_register_amqp(void) "Declaration arguments", HFILL}}, {&hf_amqp_0_10_method_queue_delete_if_unused, { "If-unused", "amqp.queue.delete.if-unused", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, "Delete the queue only if there are no consumers", HFILL}}, {&hf_amqp_0_10_method_queue_delete_if_empty, { "If-empty", "amqp.queue.delete.if-empty", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Delete queue only if empty", HFILL}}, {&hf_amqp_0_10_method_file_qos_prefetch_size, { "Prefetch-size", "amqp.file.qos.prefetch-size", @@ -12118,7 +12118,7 @@ proto_register_amqp(void) "Pre-fetch window size in messages", HFILL}}, {&hf_amqp_0_10_method_file_qos_global, { "Global", "amqp.file.qos.global", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Apply QoS to entire connection", HFILL}}, {&hf_amqp_0_10_method_file_consumer_tag, { "Consumer-tag", "amqp.file.consumer-tag", @@ -12126,19 +12126,19 @@ proto_register_amqp(void) "Consumer tag", HFILL}}, {&hf_amqp_0_10_method_file_consume_no_local, { "No-local", "amqp.file.consume.no-local", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Don't send messages to connection that publishes them", HFILL}}, {&hf_amqp_0_10_method_file_consume_no_ack, { "No-ack", "amqp.file.consume.no-ack", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "No acknowledgement needed", HFILL}}, {&hf_amqp_0_10_method_file_consume_exclusive, { "Exclusive", "amqp.file.consume.exclusive", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, "Request exclusive access", HFILL}}, {&hf_amqp_0_10_method_file_consume_nowait, { "Nowait", "amqp.file.consume.nowait", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, + FT_BOOLEAN, 8, NULL, 0x20, "Do not send a reply", HFILL}}, {&hf_amqp_0_10_method_file_consume_arguments, { "Arguments", "amqp.file.consume.arguments", @@ -12166,11 +12166,11 @@ proto_register_amqp(void) "Message routing key", HFILL}}, {&hf_amqp_0_10_method_file_publish_mandatory, { "Mandatory", "amqp.file.publish.mandatory", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Mandatory routing", HFILL}}, {&hf_amqp_0_10_method_file_publish_immediate, { "Immediate", "amqp.file.publish.immediate", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "Request immediate delivery", HFILL}}, {&hf_amqp_0_10_method_file_return_reply_code, { "Reply-code", "amqp.file.return.reply-code", @@ -12214,7 +12214,7 @@ proto_register_amqp(void) "Identifier of message being acknowledged", HFILL}}, {&hf_amqp_0_10_method_file_ack_multiple, { "Multiple", "amqp.file.ack.multiple", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, "Acknowledge multiple messages", HFILL}}, {&hf_amqp_0_10_method_file_reject_delivery_tag, { "Delivery-tag", "amqp.file.reject.delivery-tag", @@ -12240,7 +12240,7 @@ proto_register_amqp(void) #endif {&hf_amqp_0_10_method_stream_qos_global, { "Global", "amqp.stream.qos.global", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "Apply QoS to entire connection", HFILL}}, {&hf_amqp_0_10_method_stream_consumer_tag, { "Consumer-tag", "amqp.stream.consumer-tag", @@ -12248,15 +12248,15 @@ proto_register_amqp(void) NULL, HFILL}}, {&hf_amqp_0_10_method_stream_consume_no_local, { "No-local", "amqp.stream.consume.no-local", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Don't send messages to connection that publishes them", HFILL}}, {&hf_amqp_0_10_method_stream_consume_exclusive, { "Exclusive", "amqp.stream.consume.exclusive", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "Request exclusive access", HFILL}}, {&hf_amqp_0_10_method_stream_consume_nowait, { "Nowait", "amqp.stream.consume.nowait", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, "Do not send a reply", HFILL}}, {&hf_amqp_0_10_method_stream_consume_arguments, { "Arguments", "amqp.stream.consume.arguments", @@ -12272,11 +12272,11 @@ proto_register_amqp(void) "Message routing key", HFILL}}, {&hf_amqp_0_10_method_stream_publish_mandatory, { "Mandatory", "amqp.stream.publish.mandatory", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Mandatory routing", HFILL}}, {&hf_amqp_0_10_method_stream_publish_immediate, { "Immediate", "amqp.stream.publish.immediate", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "Request immediate delivery", HFILL}}, {&hf_amqp_0_10_method_stream_return_reply_code, { "Reply-code", "amqp.stream.return.reply-code", diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c index 04f4607ece..d9456982d8 100644 --- a/epan/dissectors/packet-ansi_683.c +++ b/epan/dissectors/packet-ansi_683.c @@ -3383,9 +3383,9 @@ proto_register_ansi_683(void) }, /* Generated from convert_proto_tree_add_text.pl */ - { &hf_ansi_683_fresh_incl16, { "FRESH_INCL", "ansi_683.fresh_incl", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x8000, NULL, HFILL }}, + { &hf_ansi_683_fresh_incl16, { "FRESH_INCL", "ansi_683.fresh_incl", FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }}, { &hf_ansi_683_fresh, { "FRESH", "ansi_683.fresh", FT_UINT16, BASE_DEC, NULL, 0x7fff, NULL, HFILL }}, - { &hf_ansi_683_fresh_incl8, { "FRESH_INCL", "ansi_683.fresh_incl", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, NULL, HFILL }}, + { &hf_ansi_683_fresh_incl8, { "FRESH_INCL", "ansi_683.fresh_incl", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_ansi_683_firstchp, { "First paging channel (FIRSTCHP) used in the home system", "ansi_683.firstchp", FT_UINT16, BASE_DEC, NULL, 0xffe0, NULL, HFILL }}, { &hf_ansi_683_home_sid, { "Home system identification (HOME_SID)", "ansi_683.home_sid", FT_UINT24, BASE_DEC, NULL, 0x1fffc0, NULL, HFILL }}, { &hf_ansi_683_extended_address_indicator, { "Extended address indicator (EX)", "ansi_683.extended_address_indicator", FT_UINT8, BASE_DEC, NULL, 0x20, NULL, HFILL }}, diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index c1cb92f696..7045ca74f8 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -1859,17 +1859,17 @@ proto_register_arp(void) { &hf_arp_isgratuitous, { "Is gratuitous", "arp.isgratuitous", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_arp_isprobe, { "Is probe", "arp.isprobe", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_arp_isannouncement, { "Is announcement", "arp.isannouncement", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_atmarp_spln, diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 0a91788dba..eeeebb2e02 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -8031,7 +8031,7 @@ proto_register_artnet(void) { { &hf_artnet_input_input_disabled, { "Disabled", "artnet.input.disabled", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, 8, NULL, 0x00, NULL, HFILL }}, /* ArtFirmwareMaster */ diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index a6befb353e..c978b92f31 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -8502,7 +8502,7 @@ void proto_register_r3 (void) }, { &hf_r3_mortisestatelog_waiting, { "Waiting For Door Closed", "r3.mortisestatelog.waiting", - FT_BOOLEAN, BASE_NONE, TFS (&tfs_true_false ), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_r3_mortisestatelog_state, diff --git a/epan/dissectors/packet-avsp.c b/epan/dissectors/packet-avsp.c index a231f576a9..c68347f16a 100644 --- a/epan/dissectors/packet-avsp.c +++ b/epan/dissectors/packet-avsp.c @@ -468,7 +468,7 @@ void proto_register_avsp(void) {&hf_avsp_tgen_hdr_ctrl_fcs_inverted, {"FCS Inverted", "avsp.tgen.hdr.ctrl.fcs_inverted", FT_BOOLEAN, 16, - TFS(&tfs_true_false), 0x0001, + NULL, 0x0001, NULL, HFILL} }, {&hf_avsp_tgen_hdr_ctrl_reserved, diff --git a/epan/dissectors/packet-bblog.c b/epan/dissectors/packet-bblog.c index be8e2104d2..499c0c950a 100644 --- a/epan/dissectors/packet-bblog.c +++ b/epan/dissectors/packet-bblog.c @@ -416,7 +416,7 @@ proto_register_bblog(void) { &hf_t_flags_no_push, { "No push", "bblog.t_flags_no_push", FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), BBLOG_T_FLAGS_NOPUSH, NULL, HFILL} }, { &hf_t_flags_prev_valid, { "Saved values for bad retransmission valid", "bblog.t_flags_prev_valid", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_PREVVALID, NULL, HFILL} }, { &hf_t_flags_wake_socket_receive, { "Wakeup receive socket", "bblog.t_flags_wake_socket_receive", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_WAKESOR, NULL, HFILL} }, - { &hf_t_flags_goodput_in_progress, { "Goodput measurement in progress", "bblog.t_flags_goodput_in_progress", FT_BOOLEAN, 32, TFS(&tfs_true_false), BBLOG_T_FLAGS_GPUTINPROG, NULL, HFILL} }, + { &hf_t_flags_goodput_in_progress, { "Goodput measurement in progress", "bblog.t_flags_goodput_in_progress", FT_BOOLEAN, 32, NULL, BBLOG_T_FLAGS_GPUTINPROG, NULL, HFILL} }, { &hf_t_flags_more_to_come, { "More to come", "bblog.t_flags_more_to_come", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_MORETOCOME, NULL, HFILL} }, { &hf_t_flags_listen_queue_overflow, { "Listen queue overflow", "bblog.t_flags_listen_queue_overflow", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_LQ_OVERFLOW, NULL, HFILL} }, { &hf_t_flags_last_idle, { "Connection was previously idle", "bblog.t_flags_last_idle", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_LASTIDLE, NULL, HFILL} }, @@ -427,8 +427,8 @@ proto_register_bblog(void) { &hf_t_flags_force_data, { "Force data", "bblog.t_flags_force_data", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_FORCEDATA, NULL, HFILL} }, { &hf_t_flags_tso, { "TSO", "bblog.t_flags_tso", FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), BBLOG_T_FLAGS_TSO, NULL, HFILL} }, { &hf_t_flags_toe, { "TOE", "bblog.t_flags_toe", FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), BBLOG_T_FLAGS_TOE, NULL, HFILL} }, - { &hf_t_flags_unused_1, { "Unused 1", "bblog.t_flags_unused_1", FT_BOOLEAN, 32, TFS(&tfs_true_false), BBLOG_T_FLAGS_UNUSED0, NULL, HFILL} }, - { &hf_t_flags_unused_2, { "Unused 2", "bblog.t_flags_unused_2", FT_BOOLEAN, 32, TFS(&tfs_true_false), BBLOG_T_FLAGS_UNUSED1, NULL, HFILL} }, + { &hf_t_flags_unused_1, { "Unused 1", "bblog.t_flags_unused_1", FT_BOOLEAN, 32, NULL, BBLOG_T_FLAGS_UNUSED0, NULL, HFILL} }, + { &hf_t_flags_unused_2, { "Unused 2", "bblog.t_flags_unused_2", FT_BOOLEAN, 32, NULL, BBLOG_T_FLAGS_UNUSED1, NULL, HFILL} }, { &hf_t_flags_lost_rtx_detection, { "Lost retransmission detection", "bblog.t_flags_lost_rtx_detection", FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), BBLOG_T_FLAGS_LRD, NULL, HFILL} }, { &hf_t_flags_be_in_cong_recovery, { "Currently in congestion avoidance", "bblog.t_flags_be_in_cong_recovery", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_CONGRECOVERY, NULL, HFILL} }, { &hf_t_flags_was_in_cong_recovery, { "Was in congestion avoidance", "bblog.t_flags_was_in_cong_recovery", FT_BOOLEAN, 32, TFS(&tfs_yes_no), BBLOG_T_FLAGS_WASCRECOVERY, NULL, HFILL} }, diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index d440a8698c..fef2732e94 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -8648,22 +8648,22 @@ proto_register_btmesh(void) }, { &hf_btmesh_cntr_feature_relay, { "Relay feature in use", "btmesh.cntr.feature.relay", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL } }, { &hf_btmesh_cntr_feature_proxy, { "Proxy feature in use", "btmesh.cntr.feature.proxy", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0002, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL } }, { &hf_btmesh_cntr_feature_friend, { "Friend feature in use", "btmesh.cntr.feature.friend", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0004, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL } }, { &hf_btmesh_cntr_feature_low_power, { "Low Power feature in use", "btmesh.cntr.feature.lowpower", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0008, + FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL } }, { &hf_btmesh_cntr_feature_rfu, @@ -9086,22 +9086,22 @@ proto_register_btmesh(void) }, { &hf_btmesh_config_heartbeat_publication_status_features_relay, { "Relay feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_status.features.relay", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_status_features_proxy, { "Proxy feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_status.features.proxy", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0002, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_status_features_friend, { "Friend feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_status.features.friend", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0004, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_status_features_low_power, { "Low Power feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_status.features.low_power", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0008, + FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_status_features_rfu, @@ -9876,22 +9876,22 @@ proto_register_btmesh(void) }, { &hf_btmesh_config_heartbeat_publication_set_features_relay, { "Relay feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_set.features.relay", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_set_features_proxy, { "Proxy feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_set.features.proxy", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0002, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_set_features_friend, { "Friend feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_set.features.friend", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0004, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_set_features_low_power, { "Low Power feature change triggers a Heartbeat message", "btmesh.model.config_heartbeat_publication_set.features.low_power", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0008, + FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL } }, { &hf_btmesh_config_heartbeat_publication_set_features_rfu, diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index b30fe56c68..e011cc24c5 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -3652,12 +3652,12 @@ proto_register_capwap_control(void) }, { &hf_capwap_msg_element_type_ac_descriptor_security_s, { "AC supports the pre-shared", "capwap.control.message_element.ac_descriptor.security.s", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_capwap_msg_element_type_ac_descriptor_security_x, { "AC supports X.509 Certificate", "capwap.control.message_element.ac_descriptor.security.x", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_capwap_msg_element_type_ac_descriptor_security_r, @@ -3684,12 +3684,12 @@ proto_register_capwap_control(void) }, { &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_d, { "DTLS-Enabled Data Channel Supported", "capwap.control.message_element.ac_descriptor.dtls_policy.d", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_c, { "Clear Text Data Channel Supported", "capwap.control.message_element.ac_descriptor.dtls_policy.c", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_r, @@ -4085,17 +4085,17 @@ proto_register_capwap_control(void) }, { &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_n, { "Native Frame Tunnel Mode", "capwap.control.message_element.wtp_frame_tunnel_mode.n", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_e, { "802.3 Frame Tunnel Mode", "capwap.control.message_element.wtp_frame_tunnel_mode.e", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_l, { "Local Bridging", "capwap.control.message_element.wtp_frame_tunnel_mode.l", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_r, @@ -4945,22 +4945,22 @@ proto_register_capwap_control(void) }, { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_n, { "Radio Type 802.11n", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_n", - FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x8, + FT_BOOLEAN, 4, NULL, 0x8, NULL, HFILL } }, { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_g, { "Radio Type 802.11g", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_g", - FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x4, + FT_BOOLEAN, 4, NULL, 0x4, NULL, HFILL } }, { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_a, { "Radio Type 802.11a", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_a", - FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x2, + FT_BOOLEAN, 4, NULL, 0x2, NULL, HFILL } }, { &hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_b, { "Radio Type 802.11b", "capwap.control.message_element.ieee80211_wtp_info_radio.radio_type_b", - FT_BOOLEAN, 4, TFS(&tfs_true_false), 0x1, + FT_BOOLEAN, 4, NULL, 0x1, NULL, HFILL } }, diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index ff9dbeffb1..4449e78455 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -7614,17 +7614,17 @@ proto_register_ceph(void) } }, { &hf_pgpool_flag_hashpool, { "Hash Seed and Pool Together", "ceph.pgpool.flag.hashpool", - FT_BOOLEAN, 32, TFS(&tfs_true_false), C_PGPOOL_FLAG_HASHPSPOOL, + FT_BOOLEAN, 32, NULL, C_PGPOOL_FLAG_HASHPSPOOL, NULL, HFILL } }, { &hf_pgpool_flag_full, { "Pool Full", "ceph.pgpool.flag.full", - FT_BOOLEAN, 32, TFS(&tfs_true_false), C_PGPOOL_FLAG_FULL, + FT_BOOLEAN, 32, NULL, C_PGPOOL_FLAG_FULL, NULL, HFILL } }, { &hf_pgpool_flag_fake_ec_pool, { "Fake Erasure-Coded Pool", "ceph.pgpool.flag.fake_ec_pool", - FT_BOOLEAN, 32, TFS(&tfs_true_false), C_PGPOOL_FLAG_FAKE_EC_POOL, + FT_BOOLEAN, 32, NULL, C_PGPOOL_FLAG_FAKE_EC_POOL, NULL, HFILL } }, { &hf_monmap, { diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 7670f86297..d5549cd566 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -6424,7 +6424,7 @@ proto_register_cigi(void) }, { &hf_cigi2_ig_control_boresight, { "Tracking Device Boresight", "cigi.ig_control.boresight", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, "Used by the host to enable boresight mode", HFILL } }, { &hf_cigi2_ig_control_frame_ctr, @@ -7381,7 +7381,7 @@ proto_register_cigi(void) }, { &hf_cigi3_rate_control_apply_to_part, { "Apply to Articulated Part", "cigi.rate_control.apply_to_part", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, "Determines whether the rate is applied to the articulated part specified by the Articulated Part ID parameter", HFILL } }, { &hf_cigi3_rate_control_x_rate, @@ -7433,7 +7433,7 @@ proto_register_cigi(void) }, { &hf_cigi3_2_rate_control_apply_to_part, { "Apply to Articulated Part", "cigi.rate_control.apply_to_part", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, "Determines whether the rate is applied to the articulated part specified by the Articulated Part ID parameter", HFILL } }, { &hf_cigi3_2_rate_control_coordinate_system, @@ -8616,7 +8616,7 @@ proto_register_cigi(void) }, { &hf_cigi2_view_definition_tracker_assign, { "Tracker Assign", "cigi.view_def.tracker_assign", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, "Specifies whether the view should be controlled by an external tracking device", HFILL } }, { &hf_cigi2_view_definition_near_enable, diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 000308f709..13cb87a22e 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -9537,7 +9537,7 @@ proto_register_cip(void) { &hf_cip_path_segment, { "Path Segment", "cip.path_segment", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_path_segment_type, { "Path Segment Type", "cip.path_segment.type", FT_UINT8, BASE_DEC, VALS(cip_path_seg_vals), CI_SEGMENT_TYPE_MASK, NULL, HFILL }}, - { &hf_cip_port_ex_link_addr, { "Extended Link Address", "cip.ex_linkaddress", FT_BOOLEAN, 8, TFS(&tfs_true_false), CI_PORT_SEG_EX_LINK_ADDRESS, NULL, HFILL }}, + { &hf_cip_port_ex_link_addr, { "Extended Link Address", "cip.ex_linkaddress", FT_BOOLEAN, 8, NULL, CI_PORT_SEG_EX_LINK_ADDRESS, NULL, HFILL }}, { &hf_cip_port, { "Port", "cip.port", FT_UINT8, BASE_DEC, VALS(cip_port_number_vals), CI_PORT_SEG_PORT_ID_MASK, "Port Identifier", HFILL } }, { &hf_cip_port_extended,{ "Port Extended", "cip.port", FT_UINT16, BASE_HEX, NULL, 0, "Port Identifier Extended", HFILL } }, { &hf_cip_link_address_byte, { "Link Address", "cip.linkaddress.byte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -9699,7 +9699,7 @@ proto_register_cip(void) { &hf_file_filename, { "File Name", "cip.file.file_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_time_sync_ptp_enable, { "PTP Enable", "cip.time_sync.ptp_enable", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0, NULL, HFILL }}, - { &hf_time_sync_is_synchronized, { "Is Synchronized", "cip.time_sync.is_synchronized", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, NULL, HFILL }}, + { &hf_time_sync_is_synchronized, { "Is Synchronized", "cip.time_sync.is_synchronized", FT_BOOLEAN, 8, NULL, 0, NULL, HFILL }}, { &hf_time_sync_sys_time_micro, { "System Time (Microseconds)", "cip.time_sync.sys_time_micro", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_time_sync_sys_time_nano, { "System Time (Nanoseconds)", "cip.time_sync.sys_time_nano", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }}, { &hf_time_sync_offset_from_master, { "Offset from Master", "cip.time_sync.offset_from_master", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index c6c4612281..3ab4cf5d5c 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -2294,27 +2294,27 @@ proto_register_cipmotion(void) }, { &hf_cip_node_control_remote, { "Remote Control", "cipm.remote", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, "Node Control: Remote Control", HFILL} }, { &hf_cip_node_control_sync, { "Sync Control", "cipm.sync", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, "Node Control: Synchronous Operation", HFILL} }, { &hf_cip_node_data_valid, { "Data Valid", "cipm.valid", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Node Control: Data Valid", HFILL} }, { &hf_cip_node_fault_reset, { "Node Fault Reset", "cipm.fltrst", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "Node Control: Node Fault Reset", HFILL} }, { &hf_cip_node_device_faulted, { "Faulted", "cipm.flt", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, "Node Control: Device Faulted", HFILL} }, { &hf_cip_node_fltalarms, @@ -2329,22 +2329,22 @@ proto_register_cipmotion(void) }, { &hf_cip_time_data_stamp, { "Time Stamp", "cipm.time.stamp", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TIME_DATA_SET_TIME_STAMP, + FT_BOOLEAN, 8, NULL, TIME_DATA_SET_TIME_STAMP, "Time Data Set: Time Stamp", HFILL} }, { &hf_cip_time_data_offset, { "Time Offset", "cipm.time.offset", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TIME_DATA_SET_TIME_OFFSET, + FT_BOOLEAN, 8, NULL, TIME_DATA_SET_TIME_OFFSET, "Time Data Set: Time Offset", HFILL} }, { &hf_cip_time_data_diag, { "Update Diagnostics", "cipm.time.update", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TIME_DATA_SET_UPDATE_DIAGNOSTICS, + FT_BOOLEAN, 8, NULL, TIME_DATA_SET_UPDATE_DIAGNOSTICS, "Time Data Set: Update Diagnostics", HFILL} }, { &hf_cip_time_data_time_diag, { "Time Diagnostics", "cipm.time.diag", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TIME_DATA_SET_TIME_DIAGNOSTICS, + FT_BOOLEAN, 8, NULL, TIME_DATA_SET_TIME_DIAGNOSTICS, "Time Data Set: Time Diagnostics", HFILL} }, @@ -2418,15 +2418,15 @@ proto_register_cipmotion(void) }, { &hf_connection_configuration_bits_power, { "Verify Power Ratings", "cipm.ccb.verify_power_ratings", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_connection_configuration_bits_safety_bit_valid, { "Networked Safety Bit Valid", "cipm.ccb.networked_safety_bit_valid", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_connection_configuration_bits_allow_network_safety, { "Allow Networked Safety", "cipm.ccb.allow_networked_safety", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_cip_axis_control, @@ -2441,19 +2441,19 @@ proto_register_cipmotion(void) }, { &hf_cip_control_status_complete, { "Configuration Complete", "cipm.control_status.complete", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_cip_control_status_bus_up, { "Converter Bus Up", "cipm.control_status.bus_up", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_cip_control_status_bus_unload, { "Converter Bus Unload", "cipm.control_status.bus_unload", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_cip_control_status_power_loss, { "Converter AC Power Loss", "cipm.control_status.power_loss", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_cip_axis_response, { "Axis Response", "cipm.axisresp", @@ -2489,59 +2489,59 @@ proto_register_cipmotion(void) // Command Data Set { &hf_cip_cmd_data_pos_cmd, { "Command Position", "cipm.cmd.pos", - FT_BOOLEAN, 8, TFS(&tfs_true_false), COMMAND_DATA_SET_POSITION, + FT_BOOLEAN, 8, NULL, COMMAND_DATA_SET_POSITION, "Command Data Set: Command Position", HFILL} }, { &hf_cip_cmd_data_vel_cmd, { "Command Velocity", "cipm.cmd.vel", - FT_BOOLEAN, 8, TFS(&tfs_true_false), COMMAND_DATA_SET_VELOCITY, + FT_BOOLEAN, 8, NULL, COMMAND_DATA_SET_VELOCITY, "Command Data Set: Command Velocity", HFILL} }, { &hf_cip_cmd_data_acc_cmd, { "Command Acceleration", "cipm.cmd.acc", - FT_BOOLEAN, 8, TFS(&tfs_true_false), COMMAND_DATA_SET_ACCELERATION, + FT_BOOLEAN, 8, NULL, COMMAND_DATA_SET_ACCELERATION, "Command Data Set: Command Acceleration", HFILL} }, { &hf_cip_cmd_data_trq_cmd, { "Command Torque", "cipm.cmd.trq", - FT_BOOLEAN, 8, TFS(&tfs_true_false), COMMAND_DATA_SET_TORQUE, + FT_BOOLEAN, 8, NULL, COMMAND_DATA_SET_TORQUE, "Command Data Set: Command Torque", HFILL} }, { &hf_cip_cmd_data_unwind_cycle_count, { "Unwind Cycle Count", "cipm.cmd.unwind", - FT_BOOLEAN, 8, TFS(&tfs_true_false), COMMAND_DATA_SET_UNWIND_CYCLE_COUNT, + FT_BOOLEAN, 8, NULL, COMMAND_DATA_SET_UNWIND_CYCLE_COUNT, "Command Data Set: Unwind Cycle Count", HFILL} }, { &hf_cip_cmd_data_pos_displacement, { "Position Displacement", "cipm.cmd.pos_displacement", - FT_BOOLEAN, 8, TFS(&tfs_true_false), COMMAND_DATA_SET_POSITION_DISPLACE, + FT_BOOLEAN, 8, NULL, COMMAND_DATA_SET_POSITION_DISPLACE, "Command Data Set: Position Displacement", HFILL} }, // Actual Data Set { &hf_cip_act_data_pos, { "Actual Position", "cipm.act.pos", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ACTUAL_DATA_SET_POSITION, + FT_BOOLEAN, 8, NULL, ACTUAL_DATA_SET_POSITION, "Actual Data Set: Actual Position", HFILL} }, { &hf_cip_act_data_vel, { "Actual Velocity", "cipm.act.vel", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ACTUAL_DATA_SET_VELOCITY, + FT_BOOLEAN, 8, NULL, ACTUAL_DATA_SET_VELOCITY, "Actual Data Set: Actual Velocity", HFILL} }, { &hf_cip_act_data_acc, { "Actual Acceleration", "cipm.act.acc", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ACTUAL_DATA_SET_ACCELERATION, + FT_BOOLEAN, 8, NULL, ACTUAL_DATA_SET_ACCELERATION, "Actual Data Set: Actual Acceleration", HFILL} }, { &hf_cip_act_unwind_cycle_count, { "Unwind Cycle Count", "cipm.act.unwind", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ACTUAL_DATA_SET_UNWIND_CYCLE_COUNT, + FT_BOOLEAN, 8, NULL, ACTUAL_DATA_SET_UNWIND_CYCLE_COUNT, "Actual Data Set: Unwind Cycle Count", HFILL} }, { &hf_cip_act_pos_displacement, { "Position Displacement", "cipm.act.pos_displacement", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ACTUAL_DATA_SET_POSITION_DISPLACE, + FT_BOOLEAN, 8, NULL, ACTUAL_DATA_SET_POSITION_DISPLACE, "Actual Data Set: Position Displacement", HFILL} }, @@ -2627,27 +2627,27 @@ proto_register_cipmotion(void) }, { &hf_cip_sts_flt, { "Axis Fault Codes", "cipm.sts.flt", - FT_BOOLEAN, 8, TFS(&tfs_true_false), STATUS_DATA_SET_AXIS_FAULT, + FT_BOOLEAN, 8, NULL, STATUS_DATA_SET_AXIS_FAULT, "Status Data Set: Axis Fault Codes", HFILL} }, { &hf_cip_sts_alrm, { "Axis Alarm Codes", "cipm.sts.alarm", - FT_BOOLEAN, 8, TFS(&tfs_true_false), STATUS_DATA_SET_AXIS_ALARM, + FT_BOOLEAN, 8, NULL, STATUS_DATA_SET_AXIS_ALARM, "Status Data Set: Axis Alarm Codes", HFILL} }, { &hf_cip_sts_sts, { "Axis Status", "cipm.sts.sts", - FT_BOOLEAN, 8, TFS(&tfs_true_false), STATUS_DATA_SET_AXIS_STATUS, + FT_BOOLEAN, 8, NULL, STATUS_DATA_SET_AXIS_STATUS, "Status Data Set: Axis Status", HFILL} }, { &hf_cip_sts_iosts, { "Axis I/O Status", "cipm.sts.iosts", - FT_BOOLEAN, 8, TFS(&tfs_true_false), STATUS_DATA_SET_AXIS_IO_STATUS, + FT_BOOLEAN, 8, NULL, STATUS_DATA_SET_AXIS_IO_STATUS, "Status Data Set: Axis I/O Status", HFILL} }, { &hf_cip_sts_axis_safety, { "Axis Safety Status", "cipm.sts.safety", - FT_BOOLEAN, 8, TFS(&tfs_true_false), STATUS_DATA_SET_AXIS_SAFETY, + FT_BOOLEAN, 8, NULL, STATUS_DATA_SET_AXIS_SAFETY, "Status Data Set: Axis Safety Status", HFILL} }, { &hf_cip_intrp, @@ -2733,82 +2733,82 @@ proto_register_cipmotion(void) { &hf_cip_evnt_ctrl_reg1_pos, { "Reg 1 Pos Edge", "cipm.evnt.ctrl.reg1posedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, "Event Checking Control: Reg 1 Pos Edge", HFILL} }, { &hf_cip_evnt_ctrl_reg1_neg, { "Reg 1 Neg Edge", "cipm.evnt.ctrl.reg1negedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, "Event Checking Control: Reg 1 Neg Edge", HFILL} }, { &hf_cip_evnt_ctrl_reg2_pos, { "Reg 2 Pos Edge", "cipm.evnt.ctrl.reg2posedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, "Event Checking Control: Reg 2 Pos Edge", HFILL} }, { &hf_cip_evnt_ctrl_reg2_neg, { "Reg 2 Neg Edge", "cipm.evnt.ctrl.reg2negedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, "Event Checking Control: Reg 2 Neg Edge", HFILL} }, { &hf_cip_evnt_ctrl_reg1_posrearm, { "Reg 1 Pos Rearm", "cipm.evnt.ctrl.reg1posrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000100, + FT_BOOLEAN, 32, NULL, 0x00000100, "Event Checking Control: Reg 1 Pos Rearm", HFILL} }, { &hf_cip_evnt_ctrl_reg1_negrearm, { "Reg 1 Neg Rearm", "cipm.evnt.ctrl.reg1negrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000200, + FT_BOOLEAN, 32, NULL, 0x00000200, "Event Checking Control: Reg 1 Neg Rearm", HFILL} }, { &hf_cip_evnt_ctrl_reg2_posrearm, { "Reg 2 Pos Rearm", "cipm.evnt.ctrl.reg2posrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000400, + FT_BOOLEAN, 32, NULL, 0x00000400, "Event Checking Control: Reg 2 Pos Rearm", HFILL} }, { &hf_cip_evnt_ctrl_reg2_negrearm, { "Reg 2 Neg Rearm", "cipm.evnt.ctrl.reg2negrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000800, + FT_BOOLEAN, 32, NULL, 0x00000800, "Event Checking Control: Reg 2 Neg Rearm", HFILL} }, { &hf_cip_evnt_ctrl_marker_pos, { "Marker Pos Edge", "cipm.evnt.ctrl.mrkrpos", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00010000, + FT_BOOLEAN, 32, NULL, 0x00010000, "Event Checking Control: Marker Pos Edge", HFILL} }, { &hf_cip_evnt_ctrl_marker_neg, { "Marker Neg Edge", "cipm.evnt.ctrl.mrkrneg", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00020000, + FT_BOOLEAN, 32, NULL, 0x00020000, "Event Checking Control: Marker Neg Edge", HFILL} }, { &hf_cip_evnt_ctrl_home_pos, { "Home Pos Edge", "cipm.evnt.ctrl.homepos", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00040000, + FT_BOOLEAN, 32, NULL, 0x00040000, "Event Checking Control: Home Pos Edge", HFILL} }, { &hf_cip_evnt_ctrl_home_neg, { "Home Neg Edge", "cipm.evnt.ctrl.homeneg", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00080000, + FT_BOOLEAN, 32, NULL, 0x00080000, "Event Checking Control: Home Neg Edge", HFILL} }, { &hf_cip_evnt_ctrl_home_pp, { "Home-Switch-Marker Plus Plus", "cipm.evnt.ctrl.homepp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00100000, + FT_BOOLEAN, 32, NULL, 0x00100000, "Event Checking Control: Home-Switch-Marker Plus Plus", HFILL} }, { &hf_cip_evnt_ctrl_home_pm, { "Home-Switch-Marker Plus Minus", "cipm.evnt.ctrl.homepm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00200000, + FT_BOOLEAN, 32, NULL, 0x00200000, "Event Checking Control: Home-Switch-Marker Plus Minus", HFILL} }, { &hf_cip_evnt_ctrl_home_mp, { "Home-Switch-Marker Minus Plus", "cipm.evnt.ctrl.homemp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00400000, + FT_BOOLEAN, 32, NULL, 0x00400000, "Event Checking Control: Home-Switch-Marker Minus Plus", HFILL} }, { &hf_cip_evnt_ctrl_home_mm, { "Home-Switch-Marker Minus Minus", "cipm.evnt.ctrl.homemm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00800000, + FT_BOOLEAN, 32, NULL, 0x00800000, "Event Checking Control: Home-Switch-Marker Minus Minus", HFILL} }, { &hf_cip_evnt_ctrl_acks, @@ -2818,88 +2818,88 @@ proto_register_cipmotion(void) }, { &hf_cip_evnt_extend_format, { "Extended Event Format", "cipm.evnt.extend", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x80000000, + FT_BOOLEAN, 32, NULL, 0x80000000, "Event Checking Control: Extended Event Format", HFILL} }, { &hf_cip_evnt_sts_reg1_pos, { "Reg 1 Pos Edge", "cipm.evnt.sts.reg1posedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, "Event Checking Status: Reg 1 Pos Edge", HFILL} }, { &hf_cip_evnt_sts_reg1_neg, { "Reg 1 Neg Edge", "cipm.evnt.sts.reg1negedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, "Event Checking Status: Reg 1 Neg Edge", HFILL } }, { &hf_cip_evnt_sts_reg2_pos, { "Reg 2 Pos Edge", "cipm.evnt.sts.reg2posedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, "Event Checking Status: Reg 2 Pos Edge", HFILL} }, { &hf_cip_evnt_sts_reg2_neg, { "Reg 2 Neg Edge", "cipm.evnt.sts.reg2negedge", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, "Event Checking Status: Reg 2 Neg Edge", HFILL} }, { &hf_cip_evnt_sts_reg1_posrearm, { "Reg 1 Pos Rearm", "cipm.evnt.sts.reg1posrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000100, + FT_BOOLEAN, 32, NULL, 0x00000100, "Event Checking Status: Reg 1 Pos Rearm", HFILL} }, { &hf_cip_evnt_sts_reg1_negrearm, { "Reg 1 Neg Rearm", "cipm.evnt.sts.reg1negrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000200, + FT_BOOLEAN, 32, NULL, 0x00000200, "Event Checking Status: Reg 1 Neg Rearm", HFILL} }, { &hf_cip_evnt_sts_reg2_posrearm, { "Reg 2 Pos Rearm", "cipm.evnt.sts.reg2posrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000400, + FT_BOOLEAN, 32, NULL, 0x00000400, "Event Checking Status: Reg 2 Pos Rearm", HFILL} }, { &hf_cip_evnt_sts_reg2_negrearm, { "Reg 2 Neg Rearm", "cipm.evnt.sts.reg2negrearm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000800, + FT_BOOLEAN, 32, NULL, 0x00000800, "Event Checking Status: Reg 2 Neg Rearm", HFILL} }, { &hf_cip_evnt_sts_marker_pos, { "Marker Pos Edge", "cipm.evnt.sts.mrkrpos", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00010000, + FT_BOOLEAN, 32, NULL, 0x00010000, "Event Checking Status: Marker Pos Edge", HFILL} }, { &hf_cip_evnt_sts_marker_neg, { "Marker Neg Edge", "cipm.evnt.sts.mrkrneg", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00020000, + FT_BOOLEAN, 32, NULL, 0x00020000, "Event Checking Status: Marker Neg Edge", HFILL } }, { &hf_cip_evnt_sts_home_pos, { "Home Pos Edge", "cipm.evnt.sts.homepos", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00040000, + FT_BOOLEAN, 32, NULL, 0x00040000, "Event Checking Status: Home Pos Edge", HFILL} }, { &hf_cip_evnt_sts_home_neg, { "Home Neg Edge", "cipm.evnt.sts.homeneg", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00080000, + FT_BOOLEAN, 32, NULL, 0x00080000, "Event Checking Status: Home Neg Edge", HFILL } }, { &hf_cip_evnt_sts_home_pp, { "Home-Switch-Marker Plus Plus", "cipm.evnt.sts.homepp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00100000, + FT_BOOLEAN, 32, NULL, 0x00100000, "Event Checking Status: Home-Switch-Marker Plus Plus", HFILL} }, { &hf_cip_evnt_sts_home_pm, { "Home-Switch-Marker Plus Minus", "cipm.evnt.sts.homepm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00200000, + FT_BOOLEAN, 32, NULL, 0x00200000, "Event Checking Status: Home-Switch-Marker Plus Minus", HFILL} }, { &hf_cip_evnt_sts_home_mp, { "Home-Switch-Marker Minus Plus", "cipm.evnt.sts.homemp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00400000, + FT_BOOLEAN, 32, NULL, 0x00400000, "Event Checking Status: Home-Switch-Marker Minus Plus", HFILL} }, { &hf_cip_evnt_sts_home_mm, { "Home-Switch-Marker Minus Minus", "cipm.evnt.sts.homemm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00800000, + FT_BOOLEAN, 32, NULL, 0x00800000, "Event Checking Status: Home-Switch-Marker Minus Minus", HFILL} }, { &hf_cip_evnt_sts_nfs, @@ -3090,127 +3090,127 @@ proto_register_cipmotion(void) }, { &hf_cip_axis_sts_local_ctrl, { "Local Control", "cipm.axis.local", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, "Axis Status Data Set: Local Control", HFILL } }, { &hf_cip_axis_sts_alarm, { "Alarm", "cipm.axis.alarm", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, "Axis Status Data Set: Alarm", HFILL } }, { &hf_cip_axis_sts_dc_bus, { "DC Bus", "cipm.axis.bus", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, "Axis Status Data Set: DC Bus", HFILL } }, { &hf_cip_axis_sts_pwr_struct, { "Power Struct", "cipm.axis.pwr", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, "Axis Status Data Set: Power Struct", HFILL } }, { &hf_cip_axis_sts_flux_up, { "Motor Flux Up", "cipm.axis.flx", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010, + FT_BOOLEAN, 32, NULL, 0x00000010, "Axis Status Data Set: Motor Flux Up", HFILL } }, { &hf_cip_axis_sts_tracking, { "Tracking", "cipm.axis.track", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020, + FT_BOOLEAN, 32, NULL, 0x00000020, "Axis Status Data Set: Tracking", HFILL } }, { &hf_cip_axis_sts_pos_lock, { "Pos Lock", "cipm.axis.poslock", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000040, + FT_BOOLEAN, 32, NULL, 0x00000040, "Axis Status Data Set: Pos Lock", HFILL } }, { &hf_cip_axis_sts_vel_lock, { "Vel Lock", "cipm.axis.vellock", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080, + FT_BOOLEAN, 32, NULL, 0x00000080, "Axis Status Data Set: Vel Lock", HFILL } }, { &hf_cip_axis_sts_vel_standstill, { "Vel Standstill", "cipm.axis.nomo", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000100, + FT_BOOLEAN, 32, NULL, 0x00000100, "Axis Status Data Set: Vel Standstill", HFILL } }, { &hf_cip_axis_sts_vel_threshold, { "Vel Threshold", "cipm.axis.vthresh", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000200, + FT_BOOLEAN, 32, NULL, 0x00000200, "Axis Status Data Set: Vel Threshold", HFILL } }, { &hf_cip_axis_sts_vel_limit, { "Vel Limit", "cipm.axis.vlim", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000400, + FT_BOOLEAN, 32, NULL, 0x00000400, "Axis Status Data Set: Vel Limit", HFILL } }, { &hf_cip_axis_sts_acc_limit, { "Acc Limit", "cipm.axis.alim", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000800, + FT_BOOLEAN, 32, NULL, 0x00000800, "Axis Status Data Set: Acc Limit", HFILL } }, { &hf_cip_axis_sts_dec_limit, { "Decel Limit", "cipm.axis.dlim", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00001000, + FT_BOOLEAN, 32, NULL, 0x00001000, "Axis Status Data Set: Decel Limit", HFILL } }, { &hf_cip_axis_sts_torque_threshold, { "Torque Threshold", "cipm.axis.tthresh", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00002000, + FT_BOOLEAN, 32, NULL, 0x00002000, "Axis Status Data Set: Torque Threshold", HFILL } }, { &hf_cip_axis_sts_torque_limit, { "Torque Limit", "cipm.axis.tlim", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00004000, + FT_BOOLEAN, 32, NULL, 0x00004000, "Axis Status Data Set: Torque Limit", HFILL } }, { &hf_cip_axis_sts_cur_limit, { "Current Limit", "cipm.axis.ilim", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00008000, + FT_BOOLEAN, 32, NULL, 0x00008000, "Axis Status Data Set: Current Limit", HFILL } }, { &hf_cip_axis_sts_therm_limit, { "Thermal Limit", "cipm.axis.hot", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00010000, + FT_BOOLEAN, 32, NULL, 0x00010000, "Axis Status Data Set: Thermal Limit", HFILL } }, { &hf_cip_axis_sts_feedback_integ, { "Feedback Integrity", "cipm.axis.fgood", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00020000, + FT_BOOLEAN, 32, NULL, 0x00020000, "Axis Status Data Set: Feedback Integrity", HFILL } }, { &hf_cip_axis_sts_shutdown, { "Shutdown", "cipm.axis.sdwn", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00040000, + FT_BOOLEAN, 32, NULL, 0x00040000, "Axis Status Data Set: Shutdown", HFILL } }, { &hf_cip_axis_sts_in_process, { "In Process", "cipm.axis.inp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00080000, + FT_BOOLEAN, 32, NULL, 0x00080000, "Axis Status Data Set: In Process", HFILL } }, { &hf_cip_axis_sts_dc_bus_unload, { "DC Bus Unload", "cipm.axis.dcunload", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00100000, + FT_BOOLEAN, 32, NULL, 0x00100000, "Axis Status Data Set: DC Bus Unload", HFILL } }, { &hf_cip_axis_sts_ac_pwr_loss, { "AC Power Loss", "cipm.axis.acpwrloss", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00200000, + FT_BOOLEAN, 32, NULL, 0x00200000, "Axis Status Data Set: AC Power Loss", HFILL } }, { &hf_cip_axis_sts_pos_cntrl_mode, { "Pos Control Mode", "cipm.axis.poscntrl", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00400000, + FT_BOOLEAN, 32, NULL, 0x00400000, "Axis Status Data Set: Position Control Mode", HFILL } }, { &hf_cip_axis_sts_vel_cntrl_mode, { "Vel Control Mode", "cipm.axis.velcntrl", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00800000, + FT_BOOLEAN, 32, NULL, 0x00800000, "Axis Status Data Set: Velocity Control Mode", HFILL } }, { &hf_cip_axis_sts_trq_cntrl_mode, { "Torque Control Mode", "cipm.axis.trqcntrl", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x01000000, + FT_BOOLEAN, 32, NULL, 0x01000000, "Axis Status Data Set: Torque Control Mode", HFILL } }, @@ -3222,123 +3222,123 @@ proto_register_cipmotion(void) }, { &hf_cip_axis_sts2_motor, { "Motoring", "cipm.axis2.motor", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL } }, { &hf_cip_axis_sts2_regenerate, { "Regenerating", "cipm.axis2.regen", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL } }, { &hf_cip_axis_sts2_ride_thru, { "Ride Thru", "cipm.axis2.ridethru", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL } }, { &hf_cip_axis_sts2_ac_line_sync, { "AC Line Sync", "cipm.axis2.acsync", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, NULL, HFILL } }, { &hf_cip_axis_sts2_bus_volt_lock, { "Bus Voltage Lock", "cipm.axis2.voltlock", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010, + FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL } }, { &hf_cip_axis_sts2_react_pwr_only, { "Reactive Power Only Mode", "cipm.axis2.reactpwr", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020, + FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL } }, { &hf_cip_axis_sts2_volt_ctrl_mode, { "Voltage Control Mode", "cipm.axis2.voltmode", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000040, + FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL } }, { &hf_cip_axis_sts2_pwr_loss, { "Power Loss", "cipm.axis2.pwrloss", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080, + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL } }, { &hf_cip_axis_sts2_ac_volt_sag, { "AC Line Voltage Sag", "cipm.axis2.voltsag", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000100, + FT_BOOLEAN, 32, NULL, 0x00000100, NULL, HFILL } }, { &hf_cip_axis_sts2_ac_phase_loss, { "AC Line Phase Loss", "cipm.axis2.phaseloss", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000200, + FT_BOOLEAN, 32, NULL, 0x00000200, NULL, HFILL } }, { &hf_cip_axis_sts2_ac_freq_change, { "AC Line Frequency Change", "cipm.axis2.freqchange", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000400, + FT_BOOLEAN, 32, NULL, 0x00000400, NULL, HFILL } }, { &hf_cip_axis_sts2_ac_sync_loss, { "AC Line Sync Loss", "cipm.axis2.syncloss", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000800, + FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL } }, { &hf_cip_axis_sts2_single_phase, { "Single Phase", "cipm.axis2.singlephase", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00001000, + FT_BOOLEAN, 32, NULL, 0x00001000, NULL, HFILL } }, { &hf_cip_axis_sts2_bus_volt_limit, { "Bus Voltage Limit", "cipm.axis2.bus_volt_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00002000, + FT_BOOLEAN, 32, NULL, 0x00002000, NULL, HFILL } }, { &hf_cip_axis_sts2_bus_volt_rate_limit, { "Bus Voltage Rate Limit", "cipm.axis2.bus_volt_rate_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00004000, + FT_BOOLEAN, 32, NULL, 0x00004000, NULL, HFILL } }, { &hf_cip_axis_sts2_active_current_rate_limit, { "Active Current Rate Limit", "cipm.axis2.active_current_rate_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00008000, + FT_BOOLEAN, 32, NULL, 0x00008000, NULL, HFILL } }, { &hf_cip_axis_sts2_reactive_current_rate_limit, { "Reactive Current Rate Limit", "cipm.axis2.reactive_current_rate_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00010000, + FT_BOOLEAN, 32, NULL, 0x00010000, NULL, HFILL } }, { &hf_cip_axis_sts2_reactive_pwr_limit, { "Reactive Power Limit", "cipm.axis2.reactive_pwr_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00020000, + FT_BOOLEAN, 32, NULL, 0x00020000, NULL, HFILL } }, { &hf_cip_axis_sts2_reactive_pwr_rate_limit, { "Reactive Power Rate Limit", "cipm.axis2.reactive_pwr_rate_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00040000, + FT_BOOLEAN, 32, NULL, 0x00040000, NULL, HFILL } }, { &hf_cip_axis_sts2_active_current_limit, { "Active Current Limit", "cipm.axis2.active_current_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00080000, + FT_BOOLEAN, 32, NULL, 0x00080000, NULL, HFILL } }, { &hf_cip_axis_sts2_reactive_current_limit, { "Reactive Current Limit", "cipm.axis2.reactive_current_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00100000, + FT_BOOLEAN, 32, NULL, 0x00100000, NULL, HFILL } }, { &hf_cip_axis_sts2_motor_pwr_limit, { "Motoring Power Limit", "cipm.axis2.motor_pwr_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00200000, + FT_BOOLEAN, 32, NULL, 0x00200000, NULL, HFILL } }, { &hf_cip_axis_sts2_regen_pwr_limit, { "Regenerative Power Limit", "cipm.axis2.regen_pwr_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00400000, + FT_BOOLEAN, 32, NULL, 0x00400000, NULL, HFILL } }, { &hf_cip_axis_sts2_convert_therm_limit, { "Converter Thermal Limit", "cipm.axis2.convert_therm_limit", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00800000, + FT_BOOLEAN, 32, NULL, 0x00800000, NULL, HFILL } }, diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index b94c784cb5..76cf6f47c0 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -2538,35 +2538,35 @@ proto_register_cipsafety(void) }, { &hf_cip_ssupervisor_reset_attr_bitmap_macid, { "Preserve MacID", "cipsafety.ssupervisor.reset.attr_bitmap.macid", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_baudrate, { "Preserve Baud Rate", "cipsafety.ssupervisor.reset.attr_bitmap.baudrate", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_tunid, { "Preserve TUNID", "cipsafety.ssupervisor.reset.attr_bitmap.tunid", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_password, { "Preserve Password", "cipsafety.ssupervisor.reset.attr_bitmap.password", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_cfunid, { "Preserve CFUNID", "cipsafety.ssupervisor.reset.attr_bitmap.cfunid", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_ocpunid, { "Preserve OPCUNID", "cipsafety.ssupervisor.reset.attr_bitmap.ocpunid", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_reserved, { "Reserved", "cipsafety.ssupervisor.reset.attr_bitmap.reserved", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x40, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_attr_bitmap_extended, { "Use Extended Map", "cipsafety.ssupervisor.reset.attr_bitmap.extended", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_password_data_size, { "Data Size", "cipsafety.ssupervisor.reset_password.data_size", @@ -2686,11 +2686,11 @@ proto_register_cipsafety(void) }, { &hf_cip_ssupervisor_alarm_enable, { "Exception Detail Alarm", "cipsafety.ssupervisor.alarm_enable", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0, NULL, HFILL } + FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_warning_enable, { "Exception Detail Warning", "cipsafety.ssupervisor.warning_enable", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0, NULL, HFILL } + FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_time, { "Time", "cipsafety.ssupervisor.time", diff --git a/epan/dissectors/packet-dect-dlc.c b/epan/dissectors/packet-dect-dlc.c index 7567656d2d..ec0167b3f0 100644 --- a/epan/dissectors/packet-dect-dlc.c +++ b/epan/dissectors/packet-dect-dlc.c @@ -314,12 +314,12 @@ void proto_register_dect_dlc(void) }, { &hf_dect_dlc_p, { "Poll", "dect_dlc.control.p", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x10, NULL, HFILL + NULL, 0x10, NULL, HFILL } }, { &hf_dect_dlc_f, { "Final", "dect_dlc.control.f", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x10, NULL, HFILL + NULL, 0x10, NULL, HFILL } }, { &hf_dect_dlc_s_ftype, diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 97f11f968e..f4677c276b 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -1412,7 +1412,7 @@ proto_register_dhcpfo(void) }, {&hf_dhcpfo_ms_client_nap_capable, {"Client NAP capable (Microsoft-specific)", "dhcpfo.microsoft.clientnapcapable", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0, + FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL } }, {&hf_dhcpfo_ms_client_nap_probation, diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index 4d0c482e69..99a841a714 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -8058,7 +8058,7 @@ proto_register_dhcp(void) { &hf_dhcp_option_value_boolean, { "Value", "dhcp.option.value.bool", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Boolean DHCP/BOOTP option value", HFILL }}, { &hf_dhcp_option_padding, @@ -8946,7 +8946,7 @@ proto_register_dhcp(void) { &hf_dhcp_option63_value_boolean, { "Value", "dhcp.option.novell_options.value.bool", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Option 63: Suboption Boolean value", HFILL }}, { &hf_dhcp_option63_broadcast, diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index d20b7d68ed..b65ea9b6ec 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -3337,9 +3337,9 @@ proto_register_dhcpv6(void) { &hf_option_failover_connect_flags, { "Flags", "dhcpv6.failover.connect.flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_option_failover_connect_reserved_flag, - { "Reserved", "dhcpv6.failover.connect.flags.reserved", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0xfffe, NULL, HFILL }}, + { "Reserved", "dhcpv6.failover.connect.flags.reserved", FT_BOOLEAN, 16, NULL, 0xfffe, NULL, HFILL }}, { &hf_option_failover_connect_f_flag, - { "Fixed PD Length (F)", "dhcpv6.failover.connect.flags.f", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, + { "Fixed PD Length (F)", "dhcpv6.failover.connect.flags.f", FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }}, { &hf_option_failover_dns_hostname, { "DNS Hostname", "dhcpv6.failover.dns_hostname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_option_failover_dns_zonename, @@ -3347,15 +3347,15 @@ proto_register_dhcpv6(void) { &hf_option_failover_dns_flags, { "Flags", "dhcpv6.failover.dns.flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_option_failover_dns_reserved_flag, - { "Reserved", "dhcpv6.failover.dns.flags.reserved", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0xfff0, NULL, HFILL }}, + { "Reserved", "dhcpv6.failover.dns.flags.reserved", FT_BOOLEAN, 16, NULL, 0xfff0, NULL, HFILL }}, { &hf_option_failover_dns_u_flag, - { "Using Requested FQDN (U)", "dhcpv6.failover.dns.flags.u", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0008, NULL, HFILL }}, + { "Using Requested FQDN (U)", "dhcpv6.failover.dns.flags.u", FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL }}, { &hf_option_failover_dns_s_flag, - { "Synthesized Name (S)", "dhcpv6.failover.dns.flags.s", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0004, NULL, HFILL }}, + { "Synthesized Name (S)", "dhcpv6.failover.dns.flags.s", FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL }}, { &hf_option_failover_dns_r_flag, - { "Rev Uptodate (R)", "dhcpv6.failover.dns.flags.r", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, + { "Rev Uptodate (R)", "dhcpv6.failover.dns.flags.r", FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL }}, { &hf_option_failover_dns_f_flag, - { "Fwd Uptodate (F)", "dhcpv6.failover.dns.flags.f", FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, + { "Fwd Uptodate (F)", "dhcpv6.failover.dns.flags.f", FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }}, { &hf_option_failover_expiration_time, { "Expiration Time", "dhcpv6.failover.expiration_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_option_failover_max_unacked_bndupd, @@ -3385,13 +3385,13 @@ proto_register_dhcpv6(void) { &hf_option_failover_server_flags, { "Flags", "dhcpv6.failover.server.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_option_failover_server_reserved_flag, - { "Reserved", "dhcpv6.failover.server.flags.reserved", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0xf8, NULL, HFILL }}, + { "Reserved", "dhcpv6.failover.server.flags.reserved", FT_BOOLEAN, 8, NULL, 0xf8, NULL, HFILL }}, { &hf_option_failover_server_a_flag, - { "Ack Startup (A)", "dhcpv6.failover.server.flags.a", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, NULL, HFILL }}, + { "Ack Startup (A)", "dhcpv6.failover.server.flags.a", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_option_failover_server_s_flag, - { "Startup (S)", "dhcpv6.failover.server.flags.s", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, NULL, HFILL }}, + { "Startup (S)", "dhcpv6.failover.server.flags.s", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_option_failover_server_c_flag, - { "Communicated (C)", "dhcpv6.failover.server.flags.c", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL }}, + { "Communicated (C)", "dhcpv6.failover.server.flags.c", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_option_failover_server_state, { "Server State", "dhcpv6.failover.server_state", FT_UINT8, BASE_DEC, VALS(failover_server_state_vals), 0, NULL, HFILL }}, { &hf_option_failover_start_time_of_state, @@ -3447,7 +3447,7 @@ proto_register_dhcpv6(void) { &hf_packetcable_cccV6_tgt_flag, { "TGT Flags", "dhcpv6.packetcable.cccV6.tgt_flag", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_packetcable_cccV6_tgt_flag_fetch, - { "Fetch TGT", "dhcpv6.packetcable.cccV6.tgt_flag.fetch", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL }}, + { "Fetch TGT", "dhcpv6.packetcable.cccV6.tgt_flag.fetch", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_packetcable_cccV6_prov_timer, { "Provisioning timer", "dhcpv6.packetcable.cccV6.prov_timer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_packetcable_cccV6_sec_tcm, @@ -3471,9 +3471,9 @@ proto_register_dhcpv6(void) { &hf_option_s46_rule_flags, { "Flags", "dhcpv6.s46_rule.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_option_s46_rule_reserved_flag, - { "Reserved", "dhcpv6.s46_rule.flags.reserved", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0xfe, NULL, HFILL }}, + { "Reserved", "dhcpv6.s46_rule.flags.reserved", FT_BOOLEAN, 8, NULL, 0xfe, NULL, HFILL }}, { &hf_option_s46_rule_fmr_flag, - { "Forwarding Mapping Rule", "dhcpv6.s46_rule.flags.fmr", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL }}, + { "Forwarding Mapping Rule", "dhcpv6.s46_rule.flags.fmr", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_option_s46_rule_ea_len, { "EA-bit length", "dhcpv6.s46_rule.ea_len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_option_s46_rule_ipv4_pref_len, diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 5a2426fda6..35ab1f6365 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -6501,7 +6501,7 @@ proto_register_dns(void) { &hf_dns_wins_local_flag, { "Local Flag", "dns.wins.local_flag", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x1, + FT_BOOLEAN, 32, NULL, 0x1, NULL, HFILL }}, { &hf_dns_wins_lookup_timeout, @@ -6526,7 +6526,7 @@ proto_register_dns(void) { &hf_dns_winsr_local_flag, { "Local Flag", "dns.winsr.local_flag", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x1, + FT_BOOLEAN, 32, NULL, 0x1, NULL, HFILL }}, { &hf_dns_winsr_lookup_timeout, diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c index 3a619cef31..2917bd1255 100644 --- a/epan/dissectors/packet-ecp.c +++ b/epan/dissectors/packet-ecp.c @@ -468,7 +468,7 @@ proto_register_vdp(void) NULL, 0x20, NULL, HFILL }}, { &hf_vdp_tlv_assoc_flag_req_rsp, { "Response", "vdp21.assoc.flags.req_rsp", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x40, NULL, HFILL }}, + NULL, 0x40, NULL, HFILL }}, { &hf_vdp_tlv_assoc_flag_hard_error, { "Hard Error", "vdp21.assoc.flags.hard_error", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index af8caa5a14..3cb1a64fa0 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -3326,7 +3326,7 @@ void proto_register_edonkey(void) { { &hf_edonkey_end_offset_64, { "End Offset", "edonkey.end_offset64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_emule_file_length, { "File Length", "edonkey.emule.file_length", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_overnet_peer_type, { "Peer Type", "edonkey.overnet_peer_type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_edonkey_more_search_file_results, { "More", "edonkey.more_search_file_results", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, NULL, HFILL }}, + { &hf_edonkey_more_search_file_results, { "More", "edonkey.more_search_file_results", FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_file_size, { "File size", "edonkey.file_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_large_file_size, { "Large file size", "edonkey.large_file_size", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_edonkey_number_of_users, { "Number of Users", "edonkey.number_of_users", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 7945cdab10..86df9d2aad 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -2961,22 +2961,22 @@ proto_register_eigrp(void) */ { &hf_eigrp_metric_flags_srcwd, { "Source Withdraw", "eigrp.metric.flags.srcwd", - FT_BOOLEAN, 8, TFS(&tfs_true_false), EIGRP_OPAQUE_SRCWD, + FT_BOOLEAN, 8, NULL, EIGRP_OPAQUE_SRCWD, "Route Source Withdraw", HFILL } }, { &hf_eigrp_metric_flags_cd, { "Candidate Default", "eigrp.metric.flags.cd", - FT_BOOLEAN, 8, TFS(&tfs_true_false), EIGRP_OPAQUE_CD, + FT_BOOLEAN, 8, NULL, EIGRP_OPAQUE_CD, NULL, HFILL } }, { &hf_eigrp_metric_flags_active, { "Route is Active", "eigrp.metric.flags.active", - FT_BOOLEAN, 8, TFS(&tfs_true_false), EIGRP_OPAQUE_ACTIVE, + FT_BOOLEAN, 8, NULL, EIGRP_OPAQUE_ACTIVE, "Route is currently in active state", HFILL } }, { &hf_eigrp_metric_flags_repl, { "Route is Replicated", "eigrp.metric.flags.repl", - FT_BOOLEAN, 8, TFS(&tfs_true_false), EIGRP_OPAQUE_REPL, + FT_BOOLEAN, 8, NULL, EIGRP_OPAQUE_REPL, "Route is replicated from different tableid", HFILL } }, @@ -3031,12 +3031,12 @@ proto_register_eigrp(void) { &hf_eigrp_extdata_flag_ext, { "Route is External", "eigrp.opaque.flag.ext", - FT_BOOLEAN, 8, TFS(&tfs_true_false), EIGRP_OPAQUE_EXT, + FT_BOOLEAN, 8, NULL, EIGRP_OPAQUE_EXT, "External route", HFILL } }, { &hf_eigrp_extdata_flag_cd, { "Route is Candidate Default", "eigrp.opaque.flag.cd", - FT_BOOLEAN, 8, TFS(&tfs_true_false), EIGRP_OPAQUE_CD, + FT_BOOLEAN, 8, NULL, EIGRP_OPAQUE_CD, "Candidate-Default route", HFILL } }, diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index db2f1fb588..e627021867 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -3549,12 +3549,12 @@ proto_register_enip(void) { &hf_enip_lsr_tcp, { "Supports CIP Encapsulation via TCP", "enip.lsr.capaflags.tcp", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0020, + FT_BOOLEAN, 16, NULL, 0x0020, "ListServices Reply: Supports CIP Encapsulation via TCP", HFILL }}, { &hf_enip_lsr_udp, { "Supports CIP Class 0 or 1 via UDP", "enip.lsr.capaflags.udp", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0100, + FT_BOOLEAN, 16, NULL, 0x0100, "ListServices Reply: Supports CIP Class 0 or 1 via UDP", HFILL }}, { &hf_enip_lsr_servicename, @@ -3822,12 +3822,12 @@ proto_register_enip(void) { &hf_tcpip_status_mcast_pending, { "MCast Pending", "cip.tcpip.status.mcast_pending", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010, + FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL }}, { &hf_tcpip_status_interface_config_pending, { "Interface Configuration Pending", "cip.tcpip.status.interface_config_pending", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020, + FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL }}, { &hf_tcpip_status_acd, @@ -3837,17 +3837,17 @@ proto_register_enip(void) { &hf_tcpip_acd_fault, { "ACD Fault", "cip.tcpip.status.acd_fault", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080, + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL }}, { &hf_tcpip_status_iana_port_admin_change, { "IANA Port Admin Change Pending", "cip.tcpip.status.iana_port_admin", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000100, + FT_BOOLEAN, 32, NULL, 0x00000100, NULL, HFILL }}, { &hf_tcpip_status_iana_protocol_admin_change, { "IANA Protocol Admin Change Pending", "cip.tcpip.status.iana_protocol_admin", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000200, + FT_BOOLEAN, 32, NULL, 0x00000200, NULL, HFILL }}, { &hf_tcpip_status_reserved, @@ -3862,42 +3862,42 @@ proto_register_enip(void) { &hf_tcpip_config_cap_bootp, { "BOOTP Client", "cip.tcpip.config_cap.bootp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, { &hf_tcpip_config_cap_dns, { "DNS Client", "cip.tcpip.config_cap.dns", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, { &hf_tcpip_config_cap_dhcp, { "DHCP Client", "cip.tcpip.config_cap.dhcp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }}, { &hf_tcpip_config_cap_dhcp_dns_update, { "DHCP-DNS Update", "cip.tcpip.config_cap.dhcp_dns_update", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, NULL, HFILL }}, { &hf_tcpip_config_cap_config_settable, { "Configuration Settable", "cip.tcpip.config_cap.config_settable", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010, + FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL }}, { &hf_tcpip_config_cap_hardware_config, { "Hardware Configurable", "cip.tcpip.config_cap.hardware_config", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020, + FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL }}, { &hf_tcpip_config_cap_interface_reset, { "Interface Configuration Change Requires Reset", "cip.tcpip.config_cap.interface_reset", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000040, + FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL }}, { &hf_tcpip_config_cap_acd, { "ACD Capable", "cip.tcpip.config_cap.acd", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080, + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL }}, { &hf_tcpip_config_cap_reserved, @@ -3917,7 +3917,7 @@ proto_register_enip(void) { &hf_tcpip_config_control_dns, { "DNS Enable", "cip.tcpip.config_control.dns", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010, + FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL }}, { &hf_tcpip_config_control_reserved, @@ -4040,8 +4040,8 @@ proto_register_enip(void) { &hf_tcpip_port_admin_state, { "Admin State", "cip.tcpip.admin_state", FT_BOOLEAN, BASE_NONE, TFS(&tfs_open_closed), 0, NULL, HFILL } }, { &hf_tcpip_port_admin_capability, { "Admin Capability", "cip.tcpip.admin_capability", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } }, - { &hf_tcpip_admin_capability_configurable, { "Configurable", "cip.tcpip.admin_capability.configurable", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL } }, - { &hf_tcpip_admin_capability_reset_required, { "Reset Required", "cip.tcpip.admin_capability.reset_required", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, NULL, HFILL } }, + { &hf_tcpip_admin_capability_configurable, { "Configurable", "cip.tcpip.admin_capability.configurable", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, + { &hf_tcpip_admin_capability_reset_required, { "Reset Required", "cip.tcpip.admin_capability.reset_required", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_tcpip_admin_capability_reserved, { "Reserved", "cip.tcpip.admin_capability", FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL } }, { &hf_elink_interface_speed, @@ -4416,7 +4416,7 @@ proto_register_enip(void) { &hf_dlr_rsc_ring_supervisor_enable, { "Ring Supervisor Enable", "cip.dlr.rscconfig.supervisor_enable", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL }}, { &hf_dlr_rsc_ring_supervisor_precedence, @@ -4501,12 +4501,12 @@ proto_register_enip(void) { &hf_dlr_capflags_announce_base_node, { "Announce-based Ring Node", "cip.dlr.capflags.announce_based", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, { &hf_dlr_capflags_beacon_base_node, { "Beacon-based Ring Node", "cip.dlr.capflags.beacon_based", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, { &hf_dlr_capflags_reserved1, @@ -4516,17 +4516,17 @@ proto_register_enip(void) { &hf_dlr_capflags_supervisor_capable, { "Supervisor Capable", "cip.dlr.capflags.supervisor_capable", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020, + FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL }}, { &hf_dlr_capflags_redundant_gateway_capable, { "Redundant Gateway Capable", "cip.dlr.capflags.redundant_gateway_capable", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000040, + FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL }}, { &hf_dlr_capflags_flush_frame_capable, { "Flush_Table Frame Capable", "cip.dlr.capflags.flush_frame_capable", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080, + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL }}, { &hf_dlr_capflags_reserved2, @@ -4536,7 +4536,7 @@ proto_register_enip(void) { &hf_dlr_rgc_red_gateway_enable, { "Redundant Gateway Enable", "cip.dlr.rgc.gateway_enable", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL }}, { &hf_dlr_rgc_gateway_precedence, @@ -4556,7 +4556,7 @@ proto_register_enip(void) { &hf_dlr_rgc_learning_update_enable, { "Learning Update Enable", "cip.dlr.rgc.learning_update_enable", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL }}, { &hf_dlr_redundant_gateway_status, @@ -4895,12 +4895,12 @@ proto_register_enip(void) }, { &hf_dlr_lnknbrstatus_port1, { "Port 1 Active", "enip.dlr.lnknbrstatus.port1", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_dlr_lnknbrstatus_port2, { "Port 2 Active", "enip.dlr.lnknbrstatus.port2", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_dlr_lnknbrstatus_reserved, diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 495306e8a5..dcf50527d3 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -986,97 +986,97 @@ void proto_register_erldp(void) { FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_erldp_flags_published, { "Published", "erldp.flags.published", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x1, + FT_BOOLEAN, 64, NULL, 0x1, NULL, HFILL }}, { &hf_erldp_flags_atom_cache, { "Atom Cache", "erldp.flags.atom_cache", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x2, + FT_BOOLEAN, 64, NULL, 0x2, NULL, HFILL }}, { &hf_erldp_flags_extended_references, { "Extended References", "erldp.flags.extended_references", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x4, + FT_BOOLEAN, 64, NULL, 0x4, NULL, HFILL }}, { &hf_erldp_flags_dist_monitor, { "Dist Monitor", "erldp.flags.dist_monitor", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x8, + FT_BOOLEAN, 64, NULL, 0x8, NULL, HFILL }}, { &hf_erldp_flags_fun_tags, { "Fun Tags", "erldp.flags.fun_tags", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 64, NULL, 0x10, NULL, HFILL }}, { &hf_erldp_flags_dist_monitor_name, { "Dist Monitor Name", "erldp.flags.dist_monitor_name", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x20, + FT_BOOLEAN, 64, NULL, 0x20, NULL, HFILL }}, { &hf_erldp_flags_hidden_atom_cache, { "Hidden Atom Cache", "erldp.flags.hidden_atom_cache", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x40, + FT_BOOLEAN, 64, NULL, 0x40, NULL, HFILL }}, { &hf_erldp_flags_new_fun_tags, { "New Fun Tags", "erldp.flags.new_fun_tags", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 64, NULL, 0x80, NULL, HFILL }}, { &hf_erldp_flags_extended_pids_ports, { "Extended Pids Ports", "erldp.flags.extended_pids_ports", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x100, + FT_BOOLEAN, 64, NULL, 0x100, NULL, HFILL }}, { &hf_erldp_flags_export_ptr_tag, { "Export PTR Tag", "erldp.flags.export_ptr_tag", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x200, + FT_BOOLEAN, 64, NULL, 0x200, NULL, HFILL }}, { &hf_erldp_flags_bit_binaries, { "Bit Binaries", "erldp.flags.bit_binaries", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x400, + FT_BOOLEAN, 64, NULL, 0x400, NULL, HFILL }}, { &hf_erldp_flags_new_floats, { "New Floats", "erldp.flags.new_floats", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x800, + FT_BOOLEAN, 64, NULL, 0x800, NULL, HFILL }}, { &hf_erldp_flags_unicode_io, { "Unicode IO", "erldp.flags.unicode_io", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x1000, + FT_BOOLEAN, 64, NULL, 0x1000, NULL, HFILL }}, { &hf_erldp_flags_dist_hdr_atom_cache, { "Dist HDR Atom Cache", "erldp.flags.dist_hdr_atom_cache", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x2000, + FT_BOOLEAN, 64, NULL, 0x2000, NULL, HFILL }}, { &hf_erldp_flags_small_atom_tags, { "Small Atom Tags", "erldp.flags.small_atom_tags", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x4000, + FT_BOOLEAN, 64, NULL, 0x4000, NULL, HFILL }}, { &hf_erldp_flags_ets_compressed, { "ETS Compressed", "erldp.flags.ets_compressed", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x8000, + FT_BOOLEAN, 64, NULL, 0x8000, NULL, HFILL }}, { &hf_erldp_flags_utf8_atoms, { "UTF8 Atoms", "erldp.flags.utf8_atoms", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x10000, + FT_BOOLEAN, 64, NULL, 0x10000, NULL, HFILL }}, { &hf_erldp_flags_map_tag, { "Map Tag", "erldp.flags.map_tag", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x20000, + FT_BOOLEAN, 64, NULL, 0x20000, NULL, HFILL }}, { &hf_erldp_flags_big_creation, { "Big Creation", "erldp.flags.big_creation", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x40000, + FT_BOOLEAN, 64, NULL, 0x40000, NULL, HFILL }}, { &hf_erldp_flags_send_sender, { "Send Sender", "erldp.flags.send_sender", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x80000, + FT_BOOLEAN, 64, NULL, 0x80000, NULL, HFILL }}, { &hf_erldp_flags_big_seqtrace_labels, { "Big Seqtrace Labels", "erldp.flags.big_seqtrace_labels", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x100000, + FT_BOOLEAN, 64, NULL, 0x100000, NULL, HFILL }}, { &hf_erldp_flags_pending_connect, { "Pending Connect", "erldp.flags.pending_connect", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x200000, + FT_BOOLEAN, 64, NULL, 0x200000, NULL, HFILL }}, { &hf_erldp_flags_exit_payload, { "Exit Payload", "erldp.flags.exit_payload", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x400000, + FT_BOOLEAN, 64, NULL, 0x400000, NULL, HFILL }}, { &hf_erldp_flags_fragments, { "Fragments", "erldp.flags.fragments", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x800000, + FT_BOOLEAN, 64, NULL, 0x800000, NULL, HFILL }}, { &hf_erldp_flags_handshake_23, { "Handshake 23", "erldp.flags.handshake_23", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x1000000, + FT_BOOLEAN, 64, NULL, 0x1000000, NULL, HFILL }}, { &hf_erldp_flags_unlink_id, { "Unlink Id", "erldp.flags.unlink_id", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 0x2000000, + FT_BOOLEAN, 64, NULL, 0x2000000, NULL, HFILL }}, { &hf_erldp_flags_reserved, { "Reserved", "erldp.flags.reserved", FT_UINT64, BASE_DEC, NULL, 0xfc000000, NULL, HFILL }}, { &hf_erldp_flags_spawn, { "Spawn", "erldp.flags.spawn", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 1ULL << 32, + FT_BOOLEAN, 64, NULL, 1ULL << 32, NULL, HFILL }}, { &hf_erldp_flags_name_me, { "Name ME", "erldp.flags.name_me", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 1ULL << 33, + FT_BOOLEAN, 64, NULL, 1ULL << 33, NULL, HFILL }}, { &hf_erldp_flags_v4_nc, { "V4 NC", "erldp.flags.v4_nc", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 1ULL << 34, + FT_BOOLEAN, 64, NULL, 1ULL << 34, NULL, HFILL }}, { &hf_erldp_flags_alias, { "Alias", "erldp.flags.alias", - FT_BOOLEAN, 64, TFS(&tfs_true_false), 1ULL << 35, + FT_BOOLEAN, 64, NULL, 1ULL << 35, NULL, HFILL }}, { &hf_erldp_flags_spare, { "Spare", "erldp.flags.spare", FT_UINT64, BASE_DEC, NULL, ~(0ULL) << 36, diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 866e0278d7..b15cefb1fd 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -2014,7 +2014,7 @@ proto_register_frame(void) { &hf_frame_bblog_t_flags_goodput_in_progress, { "Goodput measurement in progress", "frame.bblog.t_flags_goodput_in_progress", - FT_BOOLEAN, 32, TFS(&tfs_true_false), BBLOG_T_FLAGS_GPUTINPROG, + FT_BOOLEAN, 32, NULL, BBLOG_T_FLAGS_GPUTINPROG, NULL, HFILL} }, { &hf_frame_bblog_t_flags_more_to_come, @@ -2069,12 +2069,12 @@ proto_register_frame(void) { &hf_frame_bblog_t_flags_unused_0, { "Unused 1", "frame.bblog.t_flags_unused_0", - FT_BOOLEAN, 32, TFS(&tfs_true_false), BBLOG_T_FLAGS_UNUSED0, + FT_BOOLEAN, 32, NULL, BBLOG_T_FLAGS_UNUSED0, NULL, HFILL} }, { &hf_frame_bblog_t_flags_unused_1, { "Unused 2", "frame.bblog.t_flags_unused_1", - FT_BOOLEAN, 32, TFS(&tfs_true_false), BBLOG_T_FLAGS_UNUSED1, + FT_BOOLEAN, 32, NULL, BBLOG_T_FLAGS_UNUSED1, NULL, HFILL} }, { &hf_frame_bblog_t_flags_lost_rtx_detection, diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c index 154ccd0172..aed1a0c68a 100644 --- a/epan/dissectors/packet-ged125.c +++ b/epan/dissectors/packet-ged125.c @@ -1526,7 +1526,7 @@ proto_register_ged125 (void) { &hf_ged125_ResultCode, { "Errors running script", "ged125.result_code", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, { &hf_ged125_LabelType, { "Label Type", "ged125.label_type", diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index e611b4f610..1cf85fc1bb 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -4079,17 +4079,17 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_pgsm_supported, { "P-GSM Supported", "gsm_a.classmark3.pgsmSupported", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_egsm_supported, { "E-GSM or R-GSM Supported", "gsm_a.classmark3.egsmSupported", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_gsm1800_supported, { "GSM 1800 Supported", "gsm_a.classmark3.gsm1800Supported", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_ass_radio_cap1, @@ -4109,7 +4109,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_rsupport, { "R Support", "gsm_a.classmark3.rsupport", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_r_capabilities, @@ -4119,7 +4119,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_multislot_capabilities, { "HSCSD Multi Slot Capability", "gsm_a.classmark3.multislot_capabilities", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_multislot_class, @@ -4134,12 +4134,12 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_extended_measurement_cap, { "Extended Measurement Capability", "gsm_a.classmark3.ext_meas_cap", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_ms_measurement_capability, { "MS measurement capability", "gsm_a.classmark3.ms_measurement_capability", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL} }, { &hf_gsm_a_sms_value, @@ -4154,7 +4154,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_ms_pos_method_cap_present, { "MS Positioning Method Capability present", "gsm_a.classmark3.ms_pos_method_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_ms_pos_method, @@ -4189,7 +4189,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_ecsd_multi_slot_capability, { "ECSD Multi Slot Capability present", "gsm_a.classmark3.ecsd_multi_slot_capability", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_ecsd_multi_slot_class, @@ -4199,7 +4199,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_8_psk_struct_present, { "8-PSK Struct present", "gsm_a.classmark3.8_psk_struct_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_8_psk_struct, @@ -4214,7 +4214,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_8_psk_rf_power_capability_1_present, { "8-PSK RF Power Capability 1 present", "gsm_a.classmark3.8_psk_rf_power_capability_1_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_8_psk_rf_power_capability_1, @@ -4224,7 +4224,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_8_psk_rf_power_capability_2_present, { "8-PSK RF Power Capability 2 present", "gsm_a.classmark3.8_psk_rf_power_capability_2_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_8_psk_rf_power_capability_2, @@ -4234,7 +4234,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_400_band_info_present, { "GSM 400 Band Information present", "gsm_a.classmark3.gsm_400_band_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_400_bands_supported, @@ -4249,7 +4249,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_850_assoc_radio_cap_present, { "GSM 850 Associated Radio Capability present", "gsm_a.classmark3.gsm_850_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_850_assoc_radio_cap, @@ -4259,7 +4259,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_1900_assoc_radio_cap_present, { "GSM 1900 Associated Radio Capability present", "gsm_a.classmark3.gsm_1900_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_1900_assoc_radio_cap, @@ -4284,7 +4284,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_e_gprs_multi_slot_info_present, { "DTM E/GPRS Multi Slot Information present", "gsm_a.classmark3.dtm_e_gprs_multi_slot_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_gprs_multi_slot_class, @@ -4299,7 +4299,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_egprs_multi_slot_class_present, { "DTM EGPRS Multi Slot Class present", "gsm_a.classmark3.dtm_egprs_multi_slot_class_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_egprs_multi_slot_class, @@ -4309,7 +4309,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_single_band_support, { "Single Band Support", "gsm_a.classmark3.single_band_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_band, @@ -4319,7 +4319,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_750_assoc_radio_cap_present, { "GSM 750 Associated Radio Capability present", "gsm_a.classmark3.gsm_750_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_750_assoc_radio_cap, @@ -4339,7 +4339,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_ext_dtm_e_gprs_multi_slot_info_present, { "Extended DTM E/GPRS Multi Slot Information present", "gsm_a.classmark3.ext_dtm_e_gprs_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_ext_dtm_gprs_multi_slot_class, @@ -4354,7 +4354,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_high_multislot_cap_present, { "High Multislot Capability present", "gsm_a.classmark3.high_multislot_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_high_multislot_cap, @@ -4364,7 +4364,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_geran_iu_mode_support, { "GERAN Iu Mode Support", "gsm_a.classmark3.geran_iu_mode_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_geran_iu_mode_cap, @@ -4399,7 +4399,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_t_gsm_400_band_info_present, { "T-GSM 400 Band Information present", "gsm_a.classmark3.gsm_400_band_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_t_gsm_400_bands_supported, @@ -4414,7 +4414,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_t_gsm_900_assoc_radio_cap_present, { "T-GSM 900 Associated Radio Capability present", "gsm_a.classmark3.t_gsm_900_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_t_gsm_900_assoc_radio_cap, @@ -4434,7 +4434,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_e_gprs_high_multi_slot_info_present, { "DTM E/GPRS High Multi Slot Information present", "gsm_a.classmark3.dtm_e_gprs_high_mutli_slot_info_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_gprs_high_multi_slot_class, @@ -4449,7 +4449,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_dtm_egprs_high_multi_slot_class_present, { "DTM EGPRS High Multi Slot Class present", "gsm_a.classmark3.dtm_egprs_high_multi_slot_class_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_dtm_egprs_high_multi_slot_class, @@ -4464,7 +4464,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_gsm_710_assoc_radio_cap_present, { "GSM 710 Associated Radio Capability present", "gsm_a.classmark3.gsm_710_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_gsm_710_assoc_radio_cap, @@ -4474,7 +4474,7 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_t_gsm_810_assoc_radio_cap_present, { "T-GSM 810 Associated Radio Capability present", "gsm_a.classmark3.t_gsm_810_assoc_radio_cap_present", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_t_gsm_810_assoc_radio_cap, @@ -4544,32 +4544,32 @@ proto_register_gsm_a_common(void) }, { &hf_gsm_a_geran_network_sharing_support, { "GERAN Network Sharing support", "gsm_a.classmark3.geran_network_sharing_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_eutra_wb_rsrq_support, { "E-UTRA Wideband RSRQ measurements support", "gsm_a.classmark3.eutra_wb_rsrq_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_er_band_support, { "ER Band support", "gsm_a.classmark3.er_band_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_utra_mfbi_support, { "UTRA Multiple Frequency Band Indicators support", "gsm_a.classmark3.utra_mfbi_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_eutra_mfbi_support, { "E-UTRA Multiple Frequency Band Indicators support", "gsm_a.classmark3.eutra_mfbi_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_ext_tsc_set_cap_support, { "Extended TSC Set Capability support", "gsm_a.classmark3.ext_tsc_set_cap_support", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, + FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL} }, { &hf_gsm_a_ext_earfcn_value_range, diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 04debf2f81..db2a6a8791 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -6038,13 +6038,13 @@ proto_register_icmpv6(void) { "Flag", "icmpv6.rpl.opt.solicited.flag", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_icmpv6_rpl_opt_solicited_flag_v, - { "Version predicate", "icmpv6.rpl.opt.solicited.flag.v", FT_BOOLEAN, 8, TFS(&tfs_true_false), RPL_OPT_SOLICITED_FLAG_V, + { "Version predicate", "icmpv6.rpl.opt.solicited.flag.v", FT_BOOLEAN, 8, NULL, RPL_OPT_SOLICITED_FLAG_V, "The Version predicate is true if the receiver's DODAGVersionNumber matches the requested Version Number", HFILL }}, { &hf_icmpv6_rpl_opt_solicited_flag_i, - { "InstanceID predicate","icmpv6.rpl.opt.solicited.flag.i", FT_BOOLEAN, 8, TFS(&tfs_true_false), RPL_OPT_SOLICITED_FLAG_I, + { "InstanceID predicate","icmpv6.rpl.opt.solicited.flag.i", FT_BOOLEAN, 8, NULL, RPL_OPT_SOLICITED_FLAG_I, "The InstanceID predicate is true when the RPL node's current RPLInstanceID matches the requested RPLInstanceID", HFILL }}, { &hf_icmpv6_rpl_opt_solicited_flag_d, - { "DODAGID predicate", "icmpv6.rpl.opt.solicited.flag.d", FT_BOOLEAN, 8, TFS(&tfs_true_false), RPL_OPT_SOLICITED_FLAG_D, + { "DODAGID predicate", "icmpv6.rpl.opt.solicited.flag.d", FT_BOOLEAN, 8, NULL, RPL_OPT_SOLICITED_FLAG_D, "The DODAGID predicate is true if the RPL node's parent set has the same DODAGID as the DODAGID field", HFILL }}, { &hf_icmpv6_rpl_opt_solicited_flag_rsv, { "Reserved", "icmpv6.rpl.opt.solicited.flag.rsv", FT_UINT8, BASE_DEC, NULL, RPL_OPT_SOLICITED_FLAG_RSV, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index d3c10b6227..01f0598974 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -51048,7 +51048,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_tag_measure_map_field_unmeasured, {"Unmeasured", "wlan.measure.rep.repmode.mapfield.unmeasured", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, {&hf_ieee80211_tag_measure_map_field_reserved, diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 916968a3e1..812a427971 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -3509,18 +3509,18 @@ proto_register_ipmi_se(void) { &hf_ipmi_se_0f_extension_code_err, { "Extension code", "ipmi.se0f.extension_code", FT_UINT8, BASE_HEX, VALS(ssi_0f_2_err_vals), 0x0, NULL, HFILL }}, { &hf_ipmi_se_0f_extension_code_progress, { "Extension code", "ipmi.se0f.extension_code", FT_UINT8, BASE_HEX, VALS(ssi_0f_2_progress_vals), 0x0, NULL, HFILL }}, { &hf_ipmi_se_10_memory_module, { "Memory module/device ID", "ipmi.se10.memory_module", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ipmi_se_10_logging_disable, { "Logging disable for all events of given type", "ipmi.se10.logging_disable", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, NULL, HFILL }}, + { &hf_ipmi_se_10_logging_disable, { "Logging disable for all events of given type", "ipmi.se10.logging_disable", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_ipmi_se_10_event, { "Event", "ipmi.se10.event", FT_BOOLEAN, 8, TFS(&tfs_deassertion_assertion), 0x10, NULL, HFILL }}, { &hf_ipmi_se_10_event_offset, { "Event Offset", "ipmi.se10.event_offset", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }}, { &hf_ipmi_se_10_sel_filled, { "SEL filled (%)", "ipmi.se10.sel_filled", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipmi_se_12_log_entry_action, { "Log entry action", "ipmi.se12.log_entry_action", FT_UINT8, BASE_HEX, VALS(ssi_12_2_act_vals), 0xF0, NULL, HFILL }}, { &hf_ipmi_se_12_log_type, { "Log type", "ipmi.se12.log_type", FT_UINT8, BASE_HEX, VALS(ssi_12_2_type_vals), 0x0F, NULL, HFILL }}, - { &hf_ipmi_se_12_diagnostic_interrupt, { "Diagnostic interrupt (NMI)", "ipmi.se12.diagnostic_interrupt", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, NULL, HFILL }}, - { &hf_ipmi_se_12_oem_action, { "OEM Action", "ipmi.se12.oem_action", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, NULL, HFILL }}, - { &hf_ipmi_se_12_power_cycle, { "Power Cycle", "ipmi.se12.power_cycle", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, NULL, HFILL }}, - { &hf_ipmi_se_12_reset, { "Reset", "ipmi.se12.reset", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, NULL, HFILL }}, - { &hf_ipmi_se_12_power_off, { "Power Off", "ipmi.se12.power_off", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, NULL, HFILL }}, - { &hf_ipmi_se_12_alert, { "Alert", "ipmi.se12.alert", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL }}, + { &hf_ipmi_se_12_diagnostic_interrupt, { "Diagnostic interrupt (NMI)", "ipmi.se12.diagnostic_interrupt", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, + { &hf_ipmi_se_12_oem_action, { "OEM Action", "ipmi.se12.oem_action", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_ipmi_se_12_power_cycle, { "Power Cycle", "ipmi.se12.power_cycle", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_ipmi_se_12_reset, { "Reset", "ipmi.se12.reset", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, + { &hf_ipmi_se_12_power_off, { "Power Off", "ipmi.se12.power_off", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, + { &hf_ipmi_se_12_alert, { "Alert", "ipmi.se12.alert", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_ipmi_se_12_event, { "Event", "ipmi.se12.event", FT_BOOLEAN, 8, TFS(&tfs_second_first_pair), 0x80, NULL, HFILL }}, { &hf_ipmi_se_12_timestamp_clock_type, { "Timestamp clock type", "ipmi.se12.timestamp_clock_type", FT_UINT8, BASE_HEX, VALS(ssi_12_2_clock_vals), 0x0F, NULL, HFILL }}, { &hf_ipmi_se_19_requested_power_state, { "Requested power state", "ipmi.se19.requested_power_state", FT_UINT8, BASE_HEX, VALS(ssoff_22), 0x0, NULL, HFILL }}, @@ -3532,7 +3532,7 @@ proto_register_ipmi_se(void) { &hf_ipmi_se_23_interrupt_type, { "Interrupt type", "ipmi.se23.interrupt_type", FT_UINT8, BASE_HEX, VALS(ssi_23_2_intr_vals), 0xF0, NULL, HFILL }}, { &hf_ipmi_se_23_timer_use_at_expiration, { "Timer use at expiration", "ipmi.se23.timer_use_at_expiration", FT_UINT8, BASE_HEX, VALS(ssi_23_2_use_vals), 0x0F, NULL, HFILL }}, { &hf_ipmi_se_28_sensor_number, { "Sensor number", "ipmi.se28.sensor_number", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ipmi_se_28_logical_fru_device, { "Logical FRU device", "ipmi.se28.logical_fru_device", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, NULL, HFILL }}, + { &hf_ipmi_se_28_logical_fru_device, { "Logical FRU device", "ipmi.se28.logical_fru_device", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_ipmi_se_28_lun_for_master_read_write_command, { "LUN for Master Read-Write command", "ipmi.se28.lun_for_master_read_write_command", FT_UINT8, BASE_HEX, NULL, 0x18, NULL, HFILL }}, { &hf_ipmi_se_28_private_bus_id, { "Private Bus ID", "ipmi.se28.private_bus_id", FT_UINT8, BASE_HEX, NULL, 0x07, NULL, HFILL }}, { &hf_ipmi_se_28_fru_device_id_within_controller, { "FRU Device ID within controller", "ipmi.se28.fru_device_id_within_controller", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index e8a1200346..aa24f01e03 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -364,27 +364,27 @@ proto_register_ipvs_syncd(void) { &hf_flags_hashed_entry, { "Hashed Entry", "ipvs.flags.hashed_entry", FT_BOOLEAN, 16, - TFS(&tfs_true_false), IP_VS_CONN_F_HASHED, NULL, HFILL }}, + NULL, IP_VS_CONN_F_HASHED, NULL, HFILL }}, { &hf_flags_no_output_packets, { "No Output Packets", "ipvs.flags.no_output_packets", FT_BOOLEAN, 16, - TFS(&tfs_true_false), IP_VS_CONN_F_NOOUTPUT, NULL, HFILL }}, + NULL, IP_VS_CONN_F_NOOUTPUT, NULL, HFILL }}, { &hf_flags_conn_not_established, { "Connection Not Established", "ipvs.flags.conn_not_established", FT_BOOLEAN, 16, - TFS(&tfs_true_false), IP_VS_CONN_F_INACTIVE, NULL, HFILL }}, + NULL, IP_VS_CONN_F_INACTIVE, NULL, HFILL }}, { &hf_flags_adjust_output_seq, { "Adjust Output Sequence", "ipvs.flags.adjust_output_seq", FT_BOOLEAN, 16, - TFS(&tfs_true_false), IP_VS_CONN_F_OUT_SEQ, NULL, HFILL }}, + NULL, IP_VS_CONN_F_OUT_SEQ, NULL, HFILL }}, { &hf_flags_adjust_input_seq, { "Adjust Input Sequence", "ipvs.flags.adjust_input_seq", FT_BOOLEAN, 16, - TFS(&tfs_true_false), IP_VS_CONN_F_IN_SEQ, NULL, HFILL }}, + NULL, IP_VS_CONN_F_IN_SEQ, NULL, HFILL }}, { &hf_flags_no_client_port_set, { "No Client Port Set", "ipvs.flags.no_client_port_set", FT_BOOLEAN, 16, - TFS(&tfs_true_false), IP_VS_CONN_F_NO_CPORT, NULL, HFILL }}, + NULL, IP_VS_CONN_F_NO_CPORT, NULL, HFILL }}, { &hf_state, { "State", "ipvs.state", FT_UINT16, BASE_HEX, diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index d78f5138e1..19b06eaee8 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -1544,17 +1544,17 @@ proto_register_isis_hello(void) { &hf_isis_hello_clv_restart_flags_rr, { "Restart Request", "isis.hello.clv_restart_flags.rr", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_RR, + FT_BOOLEAN, 8, NULL, ISIS_RESTART_RR, "When set, the router is beginning a graceful restart", HFILL }}, { &hf_isis_hello_clv_restart_flags_ra, { "Restart Acknowledgment", "isis.hello.clv_restart_flags.ra", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_RA, + FT_BOOLEAN, 8, NULL, ISIS_RESTART_RA, "When set, the router is willing to enter helper mode", HFILL }}, { &hf_isis_hello_clv_restart_flags_sa, { "Suppress Adjacency", "isis.hello.clv_restart_flags.sa", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_SA, + FT_BOOLEAN, 8, NULL, ISIS_RESTART_SA, "When set, the router is starting as opposed to restarting", HFILL }}, { &hf_isis_hello_clv_restart_remain_time, diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 5d9c5573f4..ba7b9a1652 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -469,16 +469,6 @@ static value_string_ext isns_attribute_tags_ext = VALUE_STRING_EXT_INIT(isns_att #define ISNS_FLAGS_FIRST_PDU 0x0400 -#define tfs_isns_scn_bitmap_initiator_and_self_information_only tfs_true_false -#define tfs_isns_scn_bitmap_target_and_self_information_only tfs_true_false -#define tfs_isns_scn_bitmap_management_registration_scn tfs_true_false -#define tfs_isns_scn_bitmap_object_removed tfs_true_false -#define tfs_isns_scn_bitmap_object_added tfs_true_false -#define tfs_isns_scn_bitmap_object_updated tfs_true_false -#define tfs_isns_scn_bitmap_dd_dds_member_removed tfs_true_false -#define tfs_isns_scn_bitmap_dd_dds_member_added tfs_true_false - - #define tfs_isns_psb_tunnel_mode tfs_preferred_no_preference #define tfs_isns_psb_transport_mode tfs_preferred_no_preference @@ -1298,42 +1288,42 @@ void proto_register_isns(void) }, { &hf_isns_scn_bitmap_initiator_and_self_information_only, { "Initiator And Self Information Only", "isns.scn_bitmap.initiator_and_self_information_only", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_initiator_and_self_information_only), 0x00000080, /* bit 24 */ + FT_BOOLEAN, 32, NULL, 0x00000080, /* bit 24 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_target_and_self_information_only, { "Target And Self Information Only", "isns.scn_bitmap.target_and_self_information_only", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_target_and_self_information_only), 0x00000040, /* bit 25 */ + FT_BOOLEAN, 32, NULL, 0x00000040, /* bit 25 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_management_registration_scn, { "Management Registration/SCN", "isns.scn_bitmap.management_registration_scn", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_management_registration_scn), 0x00000020, /* bit 26 */ + FT_BOOLEAN, 32, NULL, 0x00000020, /* bit 26 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_object_removed, { "Object Removed", "isns.scn_bitmap.object_removed", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_object_removed), 0x00000010, /* bit 27 */ + FT_BOOLEAN, 32, NULL, 0x00000010, /* bit 27 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_object_added, { "Object Added", "isns.scn_bitmap.object_added", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_object_added), 0x00000008, /* bit 28 */ + FT_BOOLEAN, 32, NULL, 0x00000008, /* bit 28 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_object_updated, { "Object Updated", "isns.scn_bitmap.object_updated", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_object_updated), 0x00000004, /* bit 29 */ + FT_BOOLEAN, 32, NULL, 0x00000004, /* bit 29 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_dd_dds_member_removed, { "DD/DDS Member Removed (Mgmt Reg/SCN only)", "isns.scn_bitmap.dd_dds_member_removed", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_dd_dds_member_removed), 0x00000002, /* bit 30 */ + FT_BOOLEAN, 32, NULL, 0x00000002, /* bit 30 */ NULL, HFILL } }, { &hf_isns_scn_bitmap_dd_dds_member_added, { "DD/DDS Member Added (Mgmt Reg/SCN only)", "isns.scn_bitmap.dd_dds_member_added", - FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_dd_dds_member_added), 0x00000001, /* bit 31 */ + FT_BOOLEAN, 32, NULL, 0x00000001, /* bit 31 */ NULL, HFILL } }, diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 49c73b9b2e..e887bd6af0 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -1760,11 +1760,11 @@ proto_register_iso14443(void) }, { &hf_iso14443_cid_following, { "CID following", "iso14443.cid_following", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x08, NULL, HFILL } + NULL, 0x08, NULL, HFILL } }, { &hf_iso14443_nad_following, { "NAD following", "iso14443.nad_following", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x04, NULL, HFILL } + NULL, 0x04, NULL, HFILL } }, { &hf_iso14443_nak, { "NAK/ACK", "iso14443.nak", FT_BOOLEAN, 8, diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index d65111095c..96375874da 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -379,7 +379,7 @@ proto_register_itdm(void) { &hf_itdm_sop_eop,{ "Start/End of Packet", "itdm.sop_eop", FT_UINT8, BASE_DEC, VALS(sop_eop_vals), 0xc0, NULL, HFILL } }, { &hf_itdm_last_pack,{ "Last Packet", "itdm.last_pack", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, NULL, HFILL } }, + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, { &hf_itdm_pktlen,{ "Packet Length", "itdm.pktlen", FT_UINT16, BASE_DEC, NULL, 0x07ff, NULL, HFILL } }, { &hf_itdm_chksum,{ "Checksum", "itdm.chksum", @@ -389,7 +389,7 @@ proto_register_itdm(void) { &hf_itdm_ack,{ "ACK", "itdm.ack", FT_BOOLEAN, 8, TFS(&ack_tfs), 0x20, NULL, HFILL } }, { &hf_itdm_act,{ "Activate", "itdm.act", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, NULL, HFILL } }, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_itdm_chcmd,{ "Channel Command", "itdm.chcmd", FT_UINT8, BASE_DEC, VALS(chcmd_vals), 0x0f, NULL, HFILL } }, { &hf_itdm_chid,{ "Channel ID", "itdm.chid", diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 8b096e0285..6f0236117d 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -3616,10 +3616,10 @@ proto_register_l2tp(void) { &hf_l2tp_avp_error_message, { "Error Message", "l2tp.avp.error_message", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_protocol_version, { "Version", "l2tp.avp.protocol_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_protocol_revision, { "Revision", "l2tp.avp.protocol_revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_l2tp_avp_async_framing_supported, { "Async Framing Supported", "l2tp.avp.async_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, - { &hf_l2tp_avp_sync_framing_supported, { "Sync Framing Supported", "l2tp.avp.sync_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, - { &hf_l2tp_avp_analog_access_supported, { "Analog Access Supported", "l2tp.avp.analog_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, - { &hf_l2tp_avp_digital_access_supported, { "Digital Access Supported", "l2tp.avp.digital_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, + { &hf_l2tp_avp_async_framing_supported, { "Async Framing Supported", "l2tp.avp.async_framing_supported", FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_sync_framing_supported, { "Sync Framing Supported", "l2tp.avp.sync_framing_supported", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, + { &hf_l2tp_avp_analog_access_supported, { "Analog Access Supported", "l2tp.avp.analog_access_supported", FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_digital_access_supported, { "Digital Access Supported", "l2tp.avp.digital_access_supported", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, { &hf_l2tp_avp_firmware_revision, { "Firmware Revision", "l2tp.avp.firmware_revision", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_host_name, { "Host Name", "l2tp.avp.host_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_vendor_name, { "Vendor Name", "l2tp.avp.vendor_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -3632,10 +3632,10 @@ proto_register_l2tp(void) { &hf_l2tp_avp_call_serial_number, { "Call Serial Number", "l2tp.avp.call_serial_number", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_minimum_bps, { "Minimum BPS", "l2tp.avp.minimum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_maximum_bps, { "Maximum BPS", "l2tp.avp.maximum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_l2tp_avp_analog_bearer_type, { "Analog Bearer Type", "l2tp.avp.analog_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, - { &hf_l2tp_avp_digital_bearer_type, { "Digital Bearer Type", "l2tp.avp.digital_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, - { &hf_l2tp_avp_async_framing_type, { "Async Framing Type", "l2tp.avp.async_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, - { &hf_l2tp_avp_sync_framing_type, { "Sync Framing Type", "l2tp.avp.sync_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, + { &hf_l2tp_avp_analog_bearer_type, { "Analog Bearer Type", "l2tp.avp.analog_bearer_type", FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_digital_bearer_type, { "Digital Bearer Type", "l2tp.avp.digital_bearer_type", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, + { &hf_l2tp_avp_async_framing_type, { "Async Framing Type", "l2tp.avp.async_framing_type", FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_sync_framing_type, { "Sync Framing Type", "l2tp.avp.sync_framing_type", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, { &hf_l2tp_avp_sub_address, { "Sub-Address", "l2tp.avp.sub_address", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_connect_speed, { "Connect Speed", "l2tp.avp.connect_speed", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_physical_channel, { "Physical Channel", "l2tp.avp.physical_channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 77721ac32c..91e3fc2c84 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -440,11 +440,11 @@ proto_register_lapdm(void) { &hf_lapdm_p, { "Poll", "lapdm.control.p", FT_BOOLEAN, 8, - TFS(&tfs_true_false), XDLC_P_F, NULL, HFILL }}, + NULL, XDLC_P_F, NULL, HFILL }}, { &hf_lapdm_f, { "Final", "lapdm.control.f", FT_BOOLEAN, 8, - TFS(&tfs_true_false), XDLC_P_F, NULL, HFILL }}, + NULL, XDLC_P_F, NULL, HFILL }}, { &hf_lapdm_s_ftype, { "Supervisory frame type", "lapdm.control.s_ftype", FT_UINT8, BASE_HEX, diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 77d09cb934..ce3f844686 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -628,17 +628,17 @@ proto_register_lapsat(void) }, { &hf_lapsat_ctl_p, { "Poll", "lapsat.control.p", - FT_BOOLEAN, 16, TFS(&tfs_true_false), LAPSAT_CTL_P_F << 4, + FT_BOOLEAN, 16, NULL, LAPSAT_CTL_P_F << 4, NULL, HFILL } }, { &hf_lapsat_ctl_f, { "Final", "lapsat.control.f", - FT_BOOLEAN, 16, TFS(&tfs_true_false), LAPSAT_CTL_P_F << 4, + FT_BOOLEAN, 16, NULL, LAPSAT_CTL_P_F << 4, NULL, HFILL } }, { &hf_lapsat_ctl_mii, { "MII", "lapsat.control.mii", - FT_BOOLEAN, 16, TFS(&tfs_true_false), LAPSAT_CTL_MII << 4, + FT_BOOLEAN, 16, NULL, LAPSAT_CTL_MII << 4, "Mobile Identity Indicator", HFILL } }, diff --git a/epan/dissectors/packet-lltd.c b/epan/dissectors/packet-lltd.c index d01faa13e5..f57ebcba39 100644 --- a/epan/dissectors/packet-lltd.c +++ b/epan/dissectors/packet-lltd.c @@ -826,11 +826,11 @@ proto_register_lltd(void) { &hf_lltd_tlv_type, {"Type", "lltd.tlv.type", FT_UINT8, BASE_HEX, VALS(lltd_tlv_type_vals), 0, NULL, HFILL }}, { &hf_lltd_tlv_length, {"Length", "lltd.tlv.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lltd_host_id, { "Host ID", "lltd.host_id", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_lltd_char_p, {"Public NAT", "lltd.characteristic.public_nat", FT_BOOLEAN, 32, TFS(&tfs_true_false), LLTD_CHARACTERISTIC_P_MASK, NULL, HFILL }}, - { &hf_lltd_char_x, {"Private NAT", "lltd.characteristic.private_nat", FT_BOOLEAN, 32, TFS(&tfs_true_false), LLTD_CHARACTERISTIC_X_MASK, NULL, HFILL }}, + { &hf_lltd_char_p, {"Public NAT", "lltd.characteristic.public_nat", FT_BOOLEAN, 32, NULL, LLTD_CHARACTERISTIC_P_MASK, NULL, HFILL }}, + { &hf_lltd_char_x, {"Private NAT", "lltd.characteristic.private_nat", FT_BOOLEAN, 32, NULL, LLTD_CHARACTERISTIC_X_MASK, NULL, HFILL }}, { &hf_lltd_char_f, {"Duplex", "lltd.characteristic.duplex", FT_BOOLEAN, 32, TFS(&tfs_full_half_duplex), LLTD_CHARACTERISTIC_F_MASK, NULL, HFILL }}, { &hf_lltd_char_m, {"Management Web Page", "lltd.characteristic.web_page", FT_BOOLEAN, 32, TFS(&tfs_present_absent), LLTD_CHARACTERISTIC_M_MASK, NULL, HFILL }}, - { &hf_lltd_char_l, {"Looping Outbound Packets", "lltd.characteristic.loop", FT_BOOLEAN, 32, TFS(&tfs_true_false), LLTD_CHARACTERISTIC_L_MASK, NULL, HFILL }}, + { &hf_lltd_char_l, {"Looping Outbound Packets", "lltd.characteristic.loop", FT_BOOLEAN, 32, NULL, LLTD_CHARACTERISTIC_L_MASK, NULL, HFILL }}, { &hf_lltd_char_reserved, {"Reserved", "lltd.characteristic.reserved", FT_UINT32, BASE_HEX, NULL, LLTD_CHARACTERISTIC_RESERVE_MASK, NULL, HFILL }}, { &hf_lltd_physical_medium, {"Physical Medium", "lltd.physical_medium", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lltd_wireless_mode, {"Wireless Mode", "lltd.wireless_mode", FT_UINT8, BASE_HEX, VALS(lltd_wireless_mode_vals), 0, NULL, HFILL }}, @@ -845,7 +845,7 @@ proto_register_lltd(void) { &hf_lltd_machine_name, { "Machine Name", "lltd.machine_name", FT_STRING /*FT_UCS2_LE */, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lltd_support_info, { "Support Information", "lltd.support_info", FT_STRING /*FT_UCS2_LE */, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lltd_device_uuid, { "Device UUID", "lltd.device_uuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_lltd_qos_char_e, {"Layer 2 Forwarding", "lltd.qos_characteristic.layer2_forwarding", FT_BOOLEAN, 32, TFS(&tfs_true_false), LLTD_QOS_CHARACTERISTIC_E_MASK, NULL, HFILL }}, + { &hf_lltd_qos_char_e, {"Layer 2 Forwarding", "lltd.qos_characteristic.layer2_forwarding", FT_BOOLEAN, 32, NULL, LLTD_QOS_CHARACTERISTIC_E_MASK, NULL, HFILL }}, { &hf_lltd_qos_char_q, {"802.1q VLAN", "lltd.qos_characteristic.vlan", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), LLTD_QOS_CHARACTERISTIC_Q_MASK, NULL, HFILL }}, { &hf_lltd_qos_char_p, {"802.1q Priority Tagging", "lltd.qos_characteristic.tagging", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), LLTD_QOS_CHARACTERISTIC_P_MASK, NULL, HFILL }}, { &hf_lltd_qos_char_reserved, {"Reserved", "lltd.qos_characteristic.reserved", FT_UINT32, BASE_HEX, NULL, LLTD_QOS_CHARACTERISTIC_RESERVE_MASK, NULL, HFILL }}, @@ -857,8 +857,8 @@ proto_register_lltd(void) { &hf_lltd_emit_pause, {"Pause (ms)", "lltd.emit.pause", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lltd_emit_src_addr, { "Source Address", "lltd.emit.src_addr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lltd_emit_dest_addr, { "Destination Address", "lltd.emit.dest_addr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_lltd_queryresp_more_descs, {"More RecveeDescs", "lltd.queryresp.more", FT_BOOLEAN, 16, TFS(&tfs_true_false), LLTD_QUERY_RESP_M_MASK, NULL, HFILL }}, - { &hf_lltd_queryresp_memory_descs, {"No memory left", "lltd.queryresp.memory", FT_BOOLEAN, 16, TFS(&tfs_true_false), LLTD_QUERY_RESP_E_MASK, NULL, HFILL }}, + { &hf_lltd_queryresp_more_descs, {"More RecveeDescs", "lltd.queryresp.more", FT_BOOLEAN, 16, NULL, LLTD_QUERY_RESP_M_MASK, NULL, HFILL }}, + { &hf_lltd_queryresp_memory_descs, {"No memory left", "lltd.queryresp.memory", FT_BOOLEAN, 16, NULL, LLTD_QUERY_RESP_E_MASK, NULL, HFILL }}, { &hf_lltd_queryresp_num_descs, {"Number of RecveeDescs", "lltd.queryresp.num_descs", FT_UINT16, BASE_DEC, NULL, LLTD_QUERY_RESP_NUM_DESCS_MASK, NULL, HFILL }}, { &hf_lltd_queryresp_type, {"Type", "lltd.queryresp.type", FT_UINT16, BASE_HEX, VALS(lltd_queryresp_type_vals), 0, NULL, HFILL }}, { &hf_lltd_queryresp_real_src_addr, { "Real Source Address", "lltd.queryresp.real_src_addr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -868,8 +868,8 @@ proto_register_lltd(void) { &hf_lltd_flat_crc_packets, {"Current Transmit Credit (packets)", "lltd.flat.crc_packets", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lltd_query_large_tlv_type, {"Type", "lltd.query_large_tlv.type", FT_UINT8, BASE_HEX, VALS(lltd_query_large_tlv_type_vals), 0, NULL, HFILL }}, { &hf_lltd_query_large_tlv_offset, {"Offset", "lltd.query_large_tlv.offset", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_lltd_querylargeresp_more_descs, {"More RecveeDescs", "lltd.querylargeresp.more", FT_BOOLEAN, 16, TFS(&tfs_true_false), LLTD_QUERY_RESP_M_MASK, NULL, HFILL }}, - { &hf_lltd_querylargeresp_memory_descs, {"No memory left", "lltd.querylargeresp.memory", FT_BOOLEAN, 16, TFS(&tfs_true_false), LLTD_QUERY_RESP_E_MASK, NULL, HFILL }}, + { &hf_lltd_querylargeresp_more_descs, {"More RecveeDescs", "lltd.querylargeresp.more", FT_BOOLEAN, 16, NULL, LLTD_QUERY_RESP_M_MASK, NULL, HFILL }}, + { &hf_lltd_querylargeresp_memory_descs, {"No memory left", "lltd.querylargeresp.memory", FT_BOOLEAN, 16, NULL, LLTD_QUERY_RESP_E_MASK, NULL, HFILL }}, { &hf_lltd_querylargeresp_num_descs, {"Number of RecveeDescs", "lltd.querylargeresp.num_descs", FT_UINT16, BASE_DEC, NULL, LLTD_QUERY_RESP_NUM_DESCS_MASK, NULL, HFILL }}, { &hf_lltd_querylargeresp_data, { "Data", "lltd.querylargeresp.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -890,8 +890,8 @@ proto_register_lltd(void) { &hf_lltd_qos_probe_payload, {"Payload", "lltd.qos_probe.payload", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lltd_qos_error_value, {"Error Code", "lltd.qos_error", FT_UINT16, BASE_DEC, VALS(lltd_qos_error_vals), 0, NULL, HFILL }}, { &hf_lltd_qos_count_snapshot_history, {"History Size", "lltd.qos_count_snapshot.history", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_lltd_qos_query_resp_r, {"Receipt", "lltd.qos_query_resp.receipt", FT_BOOLEAN, 16, TFS(&tfs_true_false), LLTD_QUERY_RESP_M_MASK, NULL, HFILL }}, - { &hf_lltd_qos_query_resp_e, {"No memory left", "lltd.qos_query_resp.memory", FT_BOOLEAN, 16, TFS(&tfs_true_false), LLTD_QUERY_RESP_E_MASK, NULL, HFILL }}, + { &hf_lltd_qos_query_resp_r, {"Receipt", "lltd.qos_query_resp.receipt", FT_BOOLEAN, 16, NULL, LLTD_QUERY_RESP_M_MASK, NULL, HFILL }}, + { &hf_lltd_qos_query_resp_e, {"No memory left", "lltd.qos_query_resp.memory", FT_BOOLEAN, 16, NULL, LLTD_QUERY_RESP_E_MASK, NULL, HFILL }}, { &hf_lltd_qos_query_resp_num_events, {"Number of Events", "lltd.qos_query_resp.num_events", FT_UINT16, BASE_DEC, NULL, LLTD_QUERY_RESP_NUM_DESCS_MASK, NULL, HFILL }}, { &hf_lltd_qos_query_resp_controller_timestamp, {"Controller Transmit Timestamp", "lltd.qos_query_resp.controller_timestamp", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_lltd_qos_query_resp_sink_timestamp, {"Sink Receive Timestamp", "lltd.qos_query_resp.sink_timestamp", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 691547f129..d392396315 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -2143,7 +2143,7 @@ proto_register_mausb(void) }, { &hf_mausb_clear_transfers_partial, { "Partial Delivery", "mausb.clear_transfers.partial", FT_BOOLEAN, 6, - TFS(&tfs_true_false), MAUSB_CLEAR_TRANSFERS_PARTIAL_MASK, + NULL, MAUSB_CLEAR_TRANSFERS_PARTIAL_MASK, NULL, HFILL } }, diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c index 6b70bc7861..44aeaaa151 100644 --- a/epan/dissectors/packet-metamako.c +++ b/epan/dissectors/packet-metamako.c @@ -546,17 +546,17 @@ proto_register_metamako(void) {&hf_metamako_flags_ts_degraded, { "Timestamp degraded", "metamako.flags.ts_degraded", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}}, {&hf_metamako_flags_duplicate, { "Duplicate Packet", "metamako.flags.is_duplicate", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}}, {&hf_metamako_flags_has_ext, { "Has Trailer Extensions", "metamako.flags.has_extensions", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}}, {&hf_metamako_flags_orig_fcs_vld, { diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index ed86c95d2b..9b57220716 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -4626,7 +4626,7 @@ proto_register_mip6(void) }, { &hf_mip6_bi_h_flag, { "Simultaneous Home and Foreign Binding (H)", "mip6.bi.h_flag", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_mip6_bi_coa_ipv4, diff --git a/epan/dissectors/packet-netlink.c b/epan/dissectors/packet-netlink.c index 6a62adc94d..b437ed3475 100644 --- a/epan/dissectors/packet-netlink.c +++ b/epan/dissectors/packet-netlink.c @@ -631,12 +631,12 @@ proto_register_netlink(void) }, { &hf_netlink_attr_type_nested, { "Nested", "netlink.attr_type.nested", - FT_BOOLEAN, 16, TFS(&tfs_true_false), NLA_F_NESTED, + FT_BOOLEAN, 16, NULL, NLA_F_NESTED, "Carries nested attributes", HFILL } }, { &hf_netlink_attr_type_net_byteorder, { "Network byte order", "netlink.attr_type.net_byteorder", - FT_BOOLEAN, 16, TFS(&tfs_true_false), NLA_F_NET_BYTEORDER, + FT_BOOLEAN, 16, NULL, NLA_F_NET_BYTEORDER, "Payload stored in host or network byte order", HFILL } }, { &hf_netlink_attr_index, diff --git a/epan/dissectors/packet-nfapi.c b/epan/dissectors/packet-nfapi.c index 936a11ba76..42558d2eea 100644 --- a/epan/dissectors/packet-nfapi.c +++ b/epan/dissectors/packet-nfapi.c @@ -9407,12 +9407,12 @@ void proto_register_nfapi(void) }, { &hf_nfapi_shared_bands, { "Shared bands", "nfapi.shared.bands", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, "Indication that the PNF device shares the list of RF band options available across all available PHYs, so each may only be used with a single PHY.", HFILL } }, { &hf_nfapi_shared_pa, { "Shared pa", "nfapi.shared.pa", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, "Indication that the PNF device shares a single RF PA across all available PHYs, so that the maximum Total Power is shared across all available PHYs.", HFILL } }, { &hf_nfapi_maximum_total_power, diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c index 2614dcb401..bd158950ee 100644 --- a/epan/dissectors/packet-oampdu.c +++ b/epan/dissectors/packet-oampdu.c @@ -2428,37 +2428,37 @@ proto_register_oampdu(void) { &hf_oampdu_flags_link_fault, { "Link Fault", "oampdu.flags.linkFault", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_LINK_FAULT, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_LINK_FAULT, "The PHY detected a fault in the receive direction. True = 1, False = 0", HFILL }}, { &hf_oampdu_flags_dying_gasp, { "Dying Gasp", "oampdu.flags.dyingGasp", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_DYING_GASP, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_DYING_GASP, "An unrecoverable local failure occurred. True = 1, False = 0", HFILL }}, { &hf_oampdu_flags_critical_event, { "Critical Event", "oampdu.flags.criticalEvent", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_CRITICAL_EVENT, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_CRITICAL_EVENT, "A critical event has occurred. True = 1, False = 0", HFILL }}, { &hf_oampdu_flags_local_evaluating, { "Local Evaluating", "oampdu.flags.localEvaluating", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_LOCAL_EVAL, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_LOCAL_EVAL, "Local DTE Discovery process in progress. True = 1, False = 0", HFILL }}, { &hf_oampdu_flags_local_stable, { "Local Stable", "oampdu.flags.localStable", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_LOCAL_STABLE, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_LOCAL_STABLE, "Local DTE is Stable. True = 1, False = 0", HFILL }}, { &hf_oampdu_flags_remote_evaluating, { "Remote Evaluating", "oampdu.flags.remoteEvaluating", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_REMOTE_EVAL, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_REMOTE_EVAL, "Remote DTE Discovery process in progress. True = 1, False = 0", HFILL }}, { &hf_oampdu_flags_remote_stable, { "Remote Stable", "oampdu.flags.remoteStable", - FT_BOOLEAN, 8, TFS(&tfs_true_false), OAMPDU_FLAGS_REMOTE_STABLE, + FT_BOOLEAN, 8, NULL, OAMPDU_FLAGS_REMOTE_STABLE, "Remote DTE is Stable. True = 1, False = 0", HFILL }}, { &hf_oampdu_code, diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index e400a17c2c..db1f04ceb5 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -5134,7 +5134,7 @@ proto_register_ospf(void) { &hf_ospf_ls_id_te_lsa_reserved, { "Link State ID TE-LSA Reserved", "ospf.lsid_te_lsa.reserved", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ospf_ls_id_opaque_id, { "Link State ID Opaque ID", "ospf.lsid.opaque_id", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ospf_lsa_number_of_links, { "Number of Links", "ospf.lsa.number_of_links", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ospf_v3_lsa_do_not_age, { "Do Not Age", "ospf.v3.lsa.do_not_age", FT_BOOLEAN, 16, TFS(&tfs_true_false), OSPF_DNA_LSA, NULL, HFILL }}, + { &hf_ospf_v3_lsa_do_not_age, { "Do Not Age", "ospf.v3.lsa.do_not_age", FT_BOOLEAN, 16, NULL, OSPF_DNA_LSA, NULL, HFILL }}, { &hf_ospf_v3_lsa_interface_id, { "Interface ID", "ospf.v3.lsa.interface_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ospf_v3_lsa_neighbor_interface_id, { "Neighbor Interface ID", "ospf.v3.lsa.neighbor_interface_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ospf_v3_lsa_neighbor_router_id, { "Neighbor Router ID", "ospf.v3.lsa.neighbor_router_id", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 4e7abdd553..ae18890aa8 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -985,12 +985,12 @@ void proto_register_packetbb(void) { }, { &hf_packetbb_header_flags_phasseqnum, { "Has sequence number", "packetbb.flags.phasseqnum", - FT_BOOLEAN, 8, TFS(&tfs_true_false), PACKET_HEADER_HASSEQNR, + FT_BOOLEAN, 8, NULL, PACKET_HEADER_HASSEQNR, NULL, HFILL } }, { &hf_packetbb_header_flags_phastlv, { "Has tlv block", "packetbb.flags.phastlv", - FT_BOOLEAN, 8, TFS(&tfs_true_false), PACKET_HEADER_HASTLV, + FT_BOOLEAN, 8, NULL, PACKET_HEADER_HASTLV, NULL, HFILL } }, { &hf_packetbb_seqnr, @@ -1020,22 +1020,22 @@ void proto_register_packetbb(void) { }, { &hf_packetbb_msgheader_flags_mhasorig, { "Has originator address", "packetbb.msg.flags.mhasorig", - FT_BOOLEAN, 8, TFS(&tfs_true_false), MSG_HEADER_HASORIG, + FT_BOOLEAN, 8, NULL, MSG_HEADER_HASORIG, NULL, HFILL } }, { &hf_packetbb_msgheader_flags_mhashoplimit, { "Has hoplimit", "packetbb.msg.flags.mhashoplimit", - FT_BOOLEAN, 8, TFS(&tfs_true_false), MSG_HEADER_HASHOPLIMIT, + FT_BOOLEAN, 8, NULL, MSG_HEADER_HASHOPLIMIT, NULL, HFILL } }, { &hf_packetbb_msgheader_flags_mhashopcount, { "Has hopcount", "packetbb.msg.flags.mhashopcount", - FT_BOOLEAN, 8, TFS(&tfs_true_false), MSG_HEADER_HASHOPCOUNT, + FT_BOOLEAN, 8, NULL, MSG_HEADER_HASHOPCOUNT, NULL, HFILL } }, { &hf_packetbb_msgheader_flags_mhasseqnr, { "Has sequence number", "packetbb.msg.flags.mhasseqnum", - FT_BOOLEAN, 8, TFS(&tfs_true_false), MSG_HEADER_HASSEQNR, + FT_BOOLEAN, 8, NULL, MSG_HEADER_HASSEQNR, NULL, HFILL } }, { &hf_packetbb_msgheader_addresssize, @@ -1101,27 +1101,27 @@ void proto_register_packetbb(void) { }, { &hf_packetbb_addr_flags_hashead, { "Has head", "packetbb.msg.addr.hashead", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ADDR_HASHEAD, + FT_BOOLEAN, 8, NULL, ADDR_HASHEAD, NULL, HFILL } }, { &hf_packetbb_addr_flags_hasfulltail, { "Has full tail", "packetbb.msg.addr.hasfulltail", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ADDR_HASFULLTAIL, + FT_BOOLEAN, 8, NULL, ADDR_HASFULLTAIL, NULL, HFILL } }, { &hf_packetbb_addr_flags_haszerotail, { "Has zero tail", "packetbb.msg.addr.haszerotail", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ADDR_HASZEROTAIL, + FT_BOOLEAN, 8, NULL, ADDR_HASZEROTAIL, NULL, HFILL } }, { &hf_packetbb_addr_flags_hassingleprelen, { "Has single prelen", "packetbb.msg.addr.hassingleprelen", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ADDR_HASSINGLEPRELEN, + FT_BOOLEAN, 8, NULL, ADDR_HASSINGLEPRELEN, NULL, HFILL } }, { &hf_packetbb_addr_flags_hasmultiprelen, { "Has multiple prelen", "packetbb.msg.addr.hasmultiprelen", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ADDR_HASMULTIPRELEN, + FT_BOOLEAN, 8, NULL, ADDR_HASMULTIPRELEN, NULL, HFILL } }, { &hf_packetbb_addr_head, @@ -1206,32 +1206,32 @@ void proto_register_packetbb(void) { }, { &hf_packetbb_tlv_flags_hastypext, { "Has type-ext", "packetbb.tlv.hastypeext", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TLV_HAS_TYPEEXT, + FT_BOOLEAN, 8, NULL, TLV_HAS_TYPEEXT, NULL, HFILL } }, { &hf_packetbb_tlv_flags_hassingleindex, { "Has single index", "packetbb.tlv.hassingleindex", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TLV_HAS_SINGLEINDEX, + FT_BOOLEAN, 8, NULL, TLV_HAS_SINGLEINDEX, NULL, HFILL } }, { &hf_packetbb_tlv_flags_hasmultiindex, { "Has multiple indices", "packetbb.tlv.hasmultiindex", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TLV_HAS_MULTIINDEX, + FT_BOOLEAN, 8, NULL, TLV_HAS_MULTIINDEX, NULL, HFILL } }, { &hf_packetbb_tlv_flags_hasvalue, { "Has value", "packetbb.tlv.hasvalue", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TLV_HAS_VALUE, + FT_BOOLEAN, 8, NULL, TLV_HAS_VALUE, NULL, HFILL } }, { &hf_packetbb_tlv_flags_hasextlen, { "Has extended length", "packetbb.tlv.hasextlen", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TLV_HAS_EXTLEN, + FT_BOOLEAN, 8, NULL, TLV_HAS_EXTLEN, NULL, HFILL } }, { &hf_packetbb_tlv_flags_hasmultivalue, { "Has multiple values", "packetbb.tlv.hasmultivalue", - FT_BOOLEAN, 8, TFS(&tfs_true_false), TLV_HAS_MULTIVALUE, + FT_BOOLEAN, 8, NULL, TLV_HAS_MULTIVALUE, NULL, HFILL } }, { &hf_packetbb_tlv_indexstart, @@ -1316,22 +1316,22 @@ void proto_register_packetbb(void) { }, { &hf_packetbb_tlv_linkmetric_flags_linkin, { "Incoming link", "packetbb.tlv.linkmetriclinkin", - FT_BOOLEAN, 16, TFS(&tfs_true_false), RFC7181_LINKMETRIC_INCOMING_LINK, + FT_BOOLEAN, 16, NULL, RFC7181_LINKMETRIC_INCOMING_LINK, NULL, HFILL } }, { &hf_packetbb_tlv_linkmetric_flags_linkout, { "Outgoing link", "packetbb.tlv.linkmetriclinkout", - FT_BOOLEAN, 16, TFS(&tfs_true_false), RFC7181_LINKMETRIC_OUTGOING_LINK, + FT_BOOLEAN, 16, NULL, RFC7181_LINKMETRIC_OUTGOING_LINK, NULL, HFILL } }, { &hf_packetbb_tlv_linkmetric_flags_neighin, { "Incoming neighbor", "packetbb.tlv.linkmetricneighin", - FT_BOOLEAN, 16, TFS(&tfs_true_false), RFC7181_LINKMETRIC_INCOMING_NEIGH, + FT_BOOLEAN, 16, NULL, RFC7181_LINKMETRIC_INCOMING_NEIGH, NULL, HFILL } }, { &hf_packetbb_tlv_linkmetric_flags_neighout, { "Outgoing neighbor", "packetbb.tlv.linkmetricneighout", - FT_BOOLEAN, 16, TFS(&tfs_true_false), RFC7181_LINKMETRIC_OUTGOING_NEIGH, + FT_BOOLEAN, 16, NULL, RFC7181_LINKMETRIC_OUTGOING_NEIGH, NULL, HFILL } }, { &hf_packetbb_tlv_linkmetric_value, diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index ec037a32f2..a0fd6d5bd3 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -4944,42 +4944,42 @@ proto_register_pcep(void) }, { &hf_pcep_no_path_tlvs_pce, { "PCE currently unavailable", "pcep.no_path_tlvs.pce", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_unk_dest, { "Unknown destination", "pcep.no_path_tlvs.unk_dest", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_unk_src, { "Unknown source", "pcep.no_path_tlvs.unk_src", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_brpc, { "BRPC Path computation chain unavailable", "pcep.no_path_tlvs.brpc", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_pks, { "PKS expansion failure", "pcep.no_path_tlvs.pks", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010, + FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_no_gco_migr, { "No GCO migration path found", "pcep.no_path_tlvs.no_gco_migr", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020, + FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_no_gco_soln, { "No GCO solution found", "pcep.no_path_tlvs.no_gco_soln", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000040, + FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL } }, { &hf_pcep_no_path_tlvs_p2mp, { "P2MP Reachability Problem", "pcep.no_path_tlvs.p2mp", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080, + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL } }, { &hf_pcep_stateful_pce_capability_flags, @@ -4990,32 +4990,32 @@ proto_register_pcep(void) { &hf_pcep_lsp_update_capability, { "LSP-UPDATE-CAPABILITY (U)", "pcep.stateful-pce-capability.lsp-update", - FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_U, + FT_BOOLEAN, 32, NULL, PCEP_TLV_STATEFUL_PCE_CAPABILITY_U, NULL, HFILL } }, { &hf_pcep_include_db_version, { "INCLUDE-DB-VERSION (S)", "pcep.sync-capability.include-db-version", - FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_S, + FT_BOOLEAN, 32, NULL, PCEP_TLV_STATEFUL_PCE_CAPABILITY_S, NULL, HFILL } }, { &hf_pcep_lsp_instantiation_capability, { "LSP-INSTANTIATION-CAPABILITY (I)", "pcep.stateful-pce-capability.lsp-instantiation", - FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_I, + FT_BOOLEAN, 32, NULL, PCEP_TLV_STATEFUL_PCE_CAPABILITY_I, NULL, HFILL } }, { &hf_pcep_triggered_resync, { "TRIGGERED-RESYNC (T)", "pcep.stateful-pce-capability.triggered-resync", - FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_T, + FT_BOOLEAN, 32, NULL, PCEP_TLV_STATEFUL_PCE_CAPABILITY_T, NULL, HFILL } }, { &hf_pcep_delta_lsp_sync_capability, { "DELTA-LSP-SYNC-CAPABILITY (D)", "pcep.stateful-pce-capability.delta-lsp-sync", - FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_D, + FT_BOOLEAN, 32, NULL, PCEP_TLV_STATEFUL_PCE_CAPABILITY_D, NULL, HFILL } }, { &hf_pcep_triggered_initial_sync, { "TRIGGERED-INITIAL-SYNC (F)", "pcep.stateful-pce-capability.triggered-initial-sync", - FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_F, + FT_BOOLEAN, 32, NULL, PCEP_TLV_STATEFUL_PCE_CAPABILITY_F, NULL, HFILL } }, { &hf_pcep_sr_pce_capability_reserved, diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 705795c3fd..9205cbc423 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -1322,25 +1322,25 @@ proto_register_ppi(void) FT_UINT32, BASE_HEX, NULL, 0x0, "PPI 802.11n MAC flags", HFILL } }, { &hf_80211n_mac_flags_greenfield, { "Greenfield flag", "ppi.80211n-mac.flags.greenfield", - FT_BOOLEAN, 32, TFS(&tfs_true_false), DOT11N_FLAG_GREENFIELD, "PPI 802.11n MAC Greenfield Flag", HFILL } }, + FT_BOOLEAN, 32, NULL, DOT11N_FLAG_GREENFIELD, "PPI 802.11n MAC Greenfield Flag", HFILL } }, { &hf_80211n_mac_flags_ht20_40, { "HT20/HT40 flag", "ppi.80211n-mac.flags.ht20_40", FT_BOOLEAN, 32, TFS(&tfs_ht20_40), DOT11N_FLAG_HT40, "PPI 802.11n MAC HT20/HT40 Flag", HFILL } }, { &hf_80211n_mac_flags_rx_guard_interval, { "RX Short Guard Interval (SGI) flag", "ppi.80211n-mac.flags.rx.short_guard_interval", - FT_BOOLEAN, 32, TFS(&tfs_true_false), DOT11N_FLAG_SHORT_GI, "PPI 802.11n MAC RX Short Guard Interval (SGI) Flag", HFILL } }, + FT_BOOLEAN, 32, NULL, DOT11N_FLAG_SHORT_GI, "PPI 802.11n MAC RX Short Guard Interval (SGI) Flag", HFILL } }, { &hf_80211n_mac_flags_duplicate_rx, { "Duplicate RX flag", "ppi.80211n-mac.flags.rx.duplicate", - FT_BOOLEAN, 32, TFS(&tfs_true_false), DOT11N_FLAG_DUPLICATE_RX, "PPI 802.11n MAC Duplicate RX Flag", HFILL } }, + FT_BOOLEAN, 32, NULL, DOT11N_FLAG_DUPLICATE_RX, "PPI 802.11n MAC Duplicate RX Flag", HFILL } }, { &hf_80211n_mac_flags_aggregate, { "Aggregate flag", "ppi.80211n-mac.flags.agg", - FT_BOOLEAN, 32, TFS(&tfs_true_false), DOT11N_FLAG_IS_AGGREGATE, "PPI 802.11 MAC Aggregate Flag", HFILL } }, + FT_BOOLEAN, 32, NULL, DOT11N_FLAG_IS_AGGREGATE, "PPI 802.11 MAC Aggregate Flag", HFILL } }, { &hf_80211n_mac_flags_more_aggregates, { "More aggregates flag", "ppi.80211n-mac.flags.more_agg", - FT_BOOLEAN, 32, TFS(&tfs_true_false), DOT11N_FLAG_MORE_AGGREGATES, "PPI 802.11n MAC More Aggregates Flag", HFILL } }, + FT_BOOLEAN, 32, NULL, DOT11N_FLAG_MORE_AGGREGATES, "PPI 802.11n MAC More Aggregates Flag", HFILL } }, { &hf_80211n_mac_flags_delimiter_crc_after, { "A-MPDU Delimiter CRC error after this frame flag", "ppi.80211n-mac.flags.delim_crc_error_after", - FT_BOOLEAN, 32, TFS(&tfs_true_false), DOT11N_FLAG_AGG_CRC_ERROR, "PPI 802.11n MAC A-MPDU Delimiter CRC Error After This Frame Flag", HFILL } }, + FT_BOOLEAN, 32, NULL, DOT11N_FLAG_AGG_CRC_ERROR, "PPI 802.11n MAC A-MPDU Delimiter CRC Error After This Frame Flag", HFILL } }, { &hf_80211n_mac_ampdu_id, { "AMPDU-ID", "ppi.80211n-mac.ampdu_id", FT_UINT32, BASE_HEX, NULL, 0x0, "PPI 802.11n MAC AMPDU-ID", HFILL } }, @@ -1491,25 +1491,25 @@ proto_register_ppi(void) FT_UINT32, BASE_HEX, NULL, 0x0, "PPI 802.3 Extension Flags", HFILL } }, { &hf_8023_extension_flags_fcs_present, { "FCS Present Flag", "ppi.8023_extension.flags.fcs_present", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, "FCS (4 bytes) is present at the end of the packet", HFILL } }, + FT_BOOLEAN, 32, NULL, 0x00000001, "FCS (4 bytes) is present at the end of the packet", HFILL } }, { &hf_8023_extension_errors, { "Errors", "ppi.8023_extension.errors", FT_UINT32, BASE_HEX, NULL, 0x0, "PPI 802.3 Extension Errors", HFILL } }, { &hf_8023_extension_errors_fcs, { "FCS Error", "ppi.8023_extension.errors.fcs", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, + FT_BOOLEAN, 32, NULL, 0x00000001, "PPI 802.3 Extension FCS Error", HFILL } }, { &hf_8023_extension_errors_sequence, { "Sequence Error", "ppi.8023_extension.errors.sequence", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, + FT_BOOLEAN, 32, NULL, 0x00000002, "PPI 802.3 Extension Sequence Error", HFILL } }, { &hf_8023_extension_errors_symbol, { "Symbol Error", "ppi.8023_extension.errors.symbol", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004, + FT_BOOLEAN, 32, NULL, 0x00000004, "PPI 802.3 Extension Symbol Error", HFILL } }, { &hf_8023_extension_errors_data, { "Data Error", "ppi.8023_extension.errors.data", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008, + FT_BOOLEAN, 32, NULL, 0x00000008, "PPI 802.3 Extension Data Error", HFILL } }, /* Generated from convert_proto_tree_add_text.pl */ diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 8c5e96e1ac..d50babc81d 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -2757,7 +2757,7 @@ register_radius_fields(const char *unused _U_) { "Extended Type", "radius.avp.extended_type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_radius_avp_extended_more, - { "Extended More", "radius.avp.extended_more", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + { "Extended More", "radius.avp.extended_more", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_radius_egress_vlanid_tag, { "Tag", "radius.egress_vlanid_tag", FT_UINT32, BASE_HEX, VALS(egress_vlan_tag_vals), 0xFF000000, diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index d160c11e5d..b6aa3948af 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -15197,37 +15197,37 @@ void proto_register_rtps(void) { { &hf_rtps_expects_inline_qos, { "Inline QoS", "rtps.expects_inline_qos", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_presentation_coherent_access, { "Coherent Access", "rtps.presentation.coherent_access", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_presentation_ordered_access, { "Ordered Access", "rtps.presentation.ordered_access", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_direct_communication, { "Direct Communication", "rtps.direct_communication", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_expects_ack, { "expectsAck", "rtps.expects_ack", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_expects_virtual_heartbeat, { "expectsVirtualHB", "rtps.expects_virtual_heartbeat", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, @@ -15339,7 +15339,7 @@ void proto_register_rtps(void) { { &hf_rtps_disable_positive_ack, { "disablePositiveAcks", "rtps.disable_positive_ack", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, @@ -16307,7 +16307,7 @@ void proto_register_rtps(void) { }, { &hf_rtps_type_object_element_shared, { "Element shared", "rtps.type_object.shared", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_flag_typeflag_final, { @@ -16604,7 +16604,7 @@ void proto_register_rtps(void) { }, { &hf_rtps_param_enable_authentication, { "Authentication enabled", "rtps.secure.enable_authentication", - FT_BOOLEAN, 32, TFS(&tfs_true_false), 0, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0, NULL, HFILL } }, { &hf_rtps_param_builtin_endpoint_qos, { "Built-in Endpoint QoS", "rtps.param.builtin_endpoint_qos", @@ -16755,7 +16755,7 @@ void proto_register_rtps(void) { #endif { &hf_rtps_param_topic_query_publication_enable, { "Enable", "rtps.param.topic_query_publication_enable", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, NULL, HFILL } + FT_BOOLEAN, 8, NULL, 0, NULL, HFILL } }, { &hf_rtps_param_topic_query_publication_sessions, { "Number of sessions", "rtps.param.topic_query_publication_sessions", diff --git a/epan/dissectors/packet-shicp.c b/epan/dissectors/packet-shicp.c index c4012fc40d..80b9640fba 100644 --- a/epan/dissectors/packet-shicp.c +++ b/epan/dissectors/packet-shicp.c @@ -475,7 +475,7 @@ proto_register_shicp(void) { &hf_shicp_auth_req, { "Authentication required", "shicp.authreq", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x0, + NULL, 0x0, NULL, HFILL } }, { &hf_shicp_module_version, diff --git a/epan/dissectors/packet-stcsig.c b/epan/dissectors/packet-stcsig.c index 7cf1eabc23..5fa0c0081c 100644 --- a/epan/dissectors/packet-stcsig.c +++ b/epan/dissectors/packet-stcsig.c @@ -311,7 +311,7 @@ proto_register_stcsig(void) }, { &hf_stcsig_prbseq, { "Pseudo-Random Binary Sequence", "stcsig.prbseq", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_stcsig_tslr, diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index b9debb6289..51ae81562b 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -4888,7 +4888,7 @@ proto_register_ua3g(void) { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_delay_distribution, { "Delay Distribution", "ua3g.ip.cs.cmd03.parameter.delay_distribution", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_consecutive_bfi, { "Consecutive BFI", "ua3g.ip.cs.cmd03.parameter.consecutive_bfi", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_bfi_distribution, { "BFI Distribution", "ua3g.ip.cs.cmd03.parameter.bfi_distribution", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021Q_used, { "802.1 Q Used", "ua3g.ip.cs.cmd03.parameter.8021Q_used", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, NULL, HFILL }}, + { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021Q_used, { "802.1 Q Used", "ua3g.ip.cs.cmd03.parameter.8021Q_used", FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021P_priority, { "802.1p Priority", "ua3g.ip.cs.cmd03.parameter.8021P_priority", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_vlan_id, { "VLAN Id", "ua3g.ip.cs.cmd03.parameter.vlan_id", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_diffserv, { "DiffServ", "ua3g.ip.cs.cmd03.parameter.diffserv", FT_UINT8, BASE_DEC, NULL, 0xFC, NULL, HFILL }}, diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 7d844acba5..70ff4aeea2 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -6727,21 +6727,21 @@ proto_register_wsp(void) { &hf_hdr_push_flag_auth, { "Initiator URI is authenticated", "wsp.header.push_flag.authenticated", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, "The X-Wap-Initiator-URI has been authenticated.", HFILL } }, { &hf_hdr_push_flag_trust, { "Content is trusted", "wsp.header.push_flag.trusted", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, "The push content is trusted.", HFILL } }, { &hf_hdr_push_flag_last, { "Last push message", "wsp.header.push_flag.last", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, "Indicates whether this is the last push message.", HFILL } }, diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 719d4142ba..6b05104446 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -859,7 +859,7 @@ proto_register_wtp(void) }, { &hf_wtp_header_Ack_flag_TVETOK, { "Tve/Tok flag", "wtp.ack.tvetok", - FT_BOOLEAN, 8, TFS( &tfs_true_false ), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 26c5b2ecc1..d041e71f68 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -1252,7 +1252,7 @@ proto_register_xmcp(void) { &xmcp_attr_flag_removal_reason_network_withdraw, { "Network Withdraw", "xmcp.attr.flag.removal-reason.network-withdraw", - FT_BOOLEAN, 16, TFS(&tfs_true_false), + FT_BOOLEAN, 16, NULL, XMCP_REMOVAL_REASON_NETWORK_WITHDRAW, NULL, HFILL } }, { &xmcp_attr_flag_removal_reason_reserved, diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 1d7b842462..70ff6359e5 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -2001,7 +2001,7 @@ proto_register_zbee_zcl_groups(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_groups_group_name_support, - { "Group Name Support", "zbee_zcl_general.groups.attr.group_name_support", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Group Name Support", "zbee_zcl_general.groups.attr.group_name_support", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_CMD_ID_GROUPS_NAME_SUPPORT_MASK, NULL, HFILL } }, { &hf_zbee_zcl_groups_group_id, @@ -3059,7 +3059,7 @@ proto_register_zbee_zcl_scenes(void) ZBEE_ZCL_CMD_ID_SCENES_NAME_SUPPORT_MASK, NULL, HFILL } }, { &hf_zbee_zcl_scenes_attr_id_scene_valid, - { "Scene Valid", "zbee_zcl_general.scenes.scene_valid", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Scene Valid", "zbee_zcl_general.scenes.scene_valid", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_ATTR_SCENES_SCENE_VALID_MASK, NULL, HFILL } }, { &hf_zbee_zcl_scenes_attr_str_len, @@ -3099,7 +3099,7 @@ proto_register_zbee_zcl_scenes(void) 0x00, NULL, HFILL }}, { &hf_zbee_zcl_scenes_extension_set_color_loop_active, - { "Color Loop Active", "zbee_zcl_general.scenes.extension_set.color_loop_active", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Color Loop Active", "zbee_zcl_general.scenes.extension_set.color_loop_active", FT_BOOLEAN, 8, NULL, 0x00, NULL, HFILL }}, { &hf_zbee_zcl_scenes_extension_set_color_loop_direction, @@ -3488,7 +3488,7 @@ proto_register_zbee_zcl_on_off(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_on_off_attr_globalscenecontrol, - { "Global Scene Control", "zbee_zcl_general.onoff.attr.globalscenecontrol", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Global Scene Control", "zbee_zcl_general.onoff.attr.globalscenecontrol", FT_BOOLEAN, 8, NULL, 0x00, NULL, HFILL } }, { &hf_zbee_zcl_on_off_attr_ontime, @@ -4307,19 +4307,19 @@ proto_register_zbee_zcl_time(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_time_status_master, - { "Master", "zbee_zcl_general.time.attr.time_status.master", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Master", "zbee_zcl_general.time.attr.time_status.master", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_TIME_MASTER, NULL, HFILL } }, { &hf_zbee_zcl_time_status_synchronized, - { "Synchronized", "zbee_zcl_general.time.attr.time_status.synchronized", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Synchronized", "zbee_zcl_general.time.attr.time_status.synchronized", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_TIME_SYNCHRONIZED, NULL, HFILL } }, { &hf_zbee_zcl_time_status_master_zone_dst, - { "Master for Time Zone and DST", "zbee_zcl_general.time.attr.time_status.master_zone_dst", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Master for Time Zone and DST", "zbee_zcl_general.time.attr.time_status.master_zone_dst", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_TIME_MASTER_ZONE_DST, NULL, HFILL } }, { &hf_zbee_zcl_time_status_superseding, - { "Superseded", "zbee_zcl_general.time.attr.time_status.superseding", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Superseded", "zbee_zcl_general.time.attr.time_status.superseding", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_TIME_SUPERSEDING, NULL, HFILL } } /* end Time Status Mask fields */ }; @@ -6222,19 +6222,19 @@ proto_register_zbee_zcl_analog_input_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_analog_input_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.analog_input_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.analog_input_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_analog_input_basic_status_fault, - { "Fault Status", "zbee_zcl_general.analog_input_basic.attr.status.fault",FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.analog_input_basic.attr.status.fault",FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_analog_input_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.analog_input_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.analog_input_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_analog_input_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.analog_input_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.analog_input_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } } /* end Status Flags fields */ }; @@ -6496,19 +6496,19 @@ proto_register_zbee_zcl_analog_output_basic(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_analog_output_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.analog_output_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.analog_output_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_analog_output_basic_status_fault, - { "Fault Status", "zbee_zcl_general.analog_output_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.analog_output_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_analog_output_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.analog_output_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.analog_output_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_analog_output_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.analog_output_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.analog_output_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -6779,19 +6779,19 @@ proto_register_zbee_zcl_analog_value_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_analog_value_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.analog_value_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.analog_value_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_analog_value_basic_status_fault, - { "Fault Status", "zbee_zcl_general.analog_value_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.analog_value_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_analog_value_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.analog_value_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.analog_value_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_analog_value_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.analog_value_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.analog_value_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -7046,19 +7046,19 @@ proto_register_zbee_zcl_binary_input_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_binary_input_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.binary_input_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.binary_input_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_binary_input_basic_status_fault, - { "Fault Status", "zbee_zcl_general.binary_input_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.binary_input_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_binary_input_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.binary_input_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.binary_input_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_binary_input_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.binary_input_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.binary_input_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -7336,19 +7336,19 @@ proto_register_zbee_zcl_binary_output_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_binary_output_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.binary_output_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.binary_output_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_binary_output_basic_status_fault, - { "Fault Status", "zbee_zcl_general.binary_output_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.binary_output_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_binary_output_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.binary_output_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.binary_output_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_binary_output_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.binary_output_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.binary_output_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -7629,19 +7629,19 @@ proto_register_zbee_zcl_binary_value_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_binary_value_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.binary_value_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.binary_value_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_binary_value_basic_status_fault, - { "Fault Status", "zbee_zcl_general.binary_value_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.binary_value_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_binary_value_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.binary_value_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.binary_value_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_binary_value_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.binary_value_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.binary_value_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -7881,19 +7881,19 @@ proto_register_zbee_zcl_multistate_input_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_multistate_input_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.multistate_input_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.multistate_input_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_multistate_input_basic_status_fault, - { "Fault Status", "zbee_zcl_general.multistate_input_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.multistate_input_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_multistate_input_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.multistate_input_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.multistate_input_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_multistate_input_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.multistate_input_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.multistate_input_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } } /* end Status Flags fields */ }; @@ -8152,19 +8152,19 @@ proto_register_zbee_zcl_multistate_output_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_multistate_output_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.multistate_output_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.multistate_output_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_multistate_output_basic_status_fault, - { "Fault Status", "zbee_zcl_general.multistate_output_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.multistate_output_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_multistate_output_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.multistate_output_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.multistate_output_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_multistate_output_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.multistate_output_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.multistate_output_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -8442,19 +8442,19 @@ proto_register_zbee_zcl_multistate_value_basic(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_multistate_value_basic_status_in_alarm, - { "In Alarm Status", "zbee_zcl_general.multistate_value_basic.attr.status.in_alarm", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "In Alarm Status", "zbee_zcl_general.multistate_value_basic.attr.status.in_alarm", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_IN_ALARM, NULL, HFILL } }, { &hf_zbee_zcl_multistate_value_basic_status_fault, - { "Fault Status", "zbee_zcl_general.multistate_value_basic.attr.status.fault", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Fault Status", "zbee_zcl_general.multistate_value_basic.attr.status.fault", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_multistate_value_basic_status_overridden, - { "Overridden Status", "zbee_zcl_general.multistate_value_basic.attr.status.overridden", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Overridden Status", "zbee_zcl_general.multistate_value_basic.attr.status.overridden", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OVERRIDDEN, NULL, HFILL } }, { &hf_zbee_zcl_multistate_value_basic_status_out_of_service, - { "Out of Service Status", "zbee_zcl_general.multistate_value_basic.attr.status.out_of_service", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Out of Service Status", "zbee_zcl_general.multistate_value_basic.attr.status.out_of_service", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_STATUS_OUT_OF_SERVICE, NULL, HFILL } }, /* end Status Flags fields */ @@ -11900,7 +11900,7 @@ proto_register_zbee_zcl_pwr_prof(void) { &hf_zbee_zcl_pwr_prof_energy_format_noleadingzero, { "Suppress leading zeros.", "zbee_zcl_general.pwrprof.attr.energyformat.noleadingzero", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ZBEE_ZCL_OPT_PWRPROF_NO_LEADING_ZERO, NULL, HFILL } }, + FT_BOOLEAN, 8, NULL, ZBEE_ZCL_OPT_PWRPROF_NO_LEADING_ZERO, NULL, HFILL } }, /* End EnergyFormatting fields */ { &hf_zbee_zcl_pwr_prof_energy_remote, @@ -12015,7 +12015,7 @@ proto_register_zbee_zcl_pwr_prof(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_options_01, - { "PowerProfileStartTime Field Present", "zbee_zcl_general.pwrprof.options.01", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "PowerProfileStartTime Field Present", "zbee_zcl_general.pwrprof.options.01", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_OPT_PWRPROF_STIME_PRESENT, NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_options_res, @@ -12966,7 +12966,7 @@ proto_register_zbee_zcl_poll_ctrl(void) VALS(zbee_zcl_poll_ctrl_srv_tx_cmd_names), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_poll_ctrl_start_fast_polling, - { "Start Fast Polling", "zbee_zcl_general.poll.start", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + { "Start Fast Polling", "zbee_zcl_general.poll.start", FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_poll_ctrl_fast_poll_timeout, diff --git a/epan/dissectors/packet-zbee-zcl-lighting.c b/epan/dissectors/packet-zbee-zcl-lighting.c index c7a9258d7b..ca9ccd9458 100644 --- a/epan/dissectors/packet-zbee-zcl-lighting.c +++ b/epan/dissectors/packet-zbee-zcl-lighting.c @@ -1367,7 +1367,7 @@ proto_register_zbee_zcl_color_control(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_color_control_attr_color_loop_active, - { "Active", "zbee_zcl_lighting.color_control.attr.color_loop_active", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Active", "zbee_zcl_lighting.color_control.attr.color_loop_active", FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL } }, { &hf_zbee_zcl_color_control_attr_color_loop_direction, diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index 3d6701bbaa..7a4b95bc12 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -1824,7 +1824,7 @@ proto_register_zbee_zcl_occ_sen(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_occ_sen_occupancy_occupied, - { "Occupied", "zbee_zcl_meas_sensing.occsen.attr.occupancy_occupied", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Occupied", "zbee_zcl_meas_sensing.occsen.attr.occupancy_occupied", FT_BOOLEAN, 8, NULL, ZBEE_ZCL_OCCUPANCY_SENSED_OCC, NULL, HFILL } }, { &hf_zbee_zcl_occ_sen_occ_sensor_type, diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c index 41340674b2..a7476b1c18 100644 --- a/epan/dissectors/packet-zbee-zcl-misc.c +++ b/epan/dissectors/packet-zbee-zcl-misc.c @@ -489,35 +489,35 @@ proto_register_zbee_zcl_thermostat(void) 0x0, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_sunday, - { "Sunday", "zbee_zcl_hvac.thermostat.day.sunday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, + { "Sunday", "zbee_zcl_hvac.thermostat.day.sunday", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_monday, - { "Monday", "zbee_zcl_hvac.thermostat.day.monday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, NULL, + { "Monday", "zbee_zcl_hvac.thermostat.day.monday", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_tuesday, - { "Tuesday", "zbee_zcl_hvac.thermostat.day.tuesday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, NULL, + { "Tuesday", "zbee_zcl_hvac.thermostat.day.tuesday", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_wednesday, - { "Wednesday", "zbee_zcl_hvac.thermostat.day.wednesday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, NULL, + { "Wednesday", "zbee_zcl_hvac.thermostat.day.wednesday", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_thursday, - { "Thursday", "zbee_zcl_hvac.thermostat.day.thursday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, NULL, + { "Thursday", "zbee_zcl_hvac.thermostat.day.thursday", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_friday, - { "Friday", "zbee_zcl_hvac.thermostat.day.friday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, NULL, + { "Friday", "zbee_zcl_hvac.thermostat.day.friday", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_saturday, - { "Saturday", "zbee_zcl_hvac.thermostat.day.saturday", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x40, NULL, + { "Saturday", "zbee_zcl_hvac.thermostat.day.saturday", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_day_vacation, - { "Away/Vacation", "zbee_zcl_hvac.thermostat.day.vacation", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, NULL, + { "Away/Vacation", "zbee_zcl_hvac.thermostat.day.vacation", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_mode_sequence, @@ -525,10 +525,10 @@ proto_register_zbee_zcl_thermostat(void) 0x0, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_mode_heat, - { "Heating", "zbee_zcl_hvac.thermostat.mode.heat", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, NULL, HFILL }}, + { "Heating", "zbee_zcl_hvac.thermostat.mode.heat", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_mode_cool, - { "Cooling", "zbee_zcl_hvac.thermostat.mode.cool", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, NULL, HFILL }}, + { "Cooling", "zbee_zcl_hvac.thermostat.mode.cool", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_zbee_zcl_thermostat_schedule_time, { "Transition Time", "zbee_zcl_hvac.thermostat.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index d91e862f36..e31f28a3c7 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -8985,7 +8985,7 @@ proto_register_zbee_zcl_tun(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_tun_flow_control_support, - { "Flow Control Supported", "zbee_zcl_se.tun.flow_control_supported", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "Flow Control Supported", "zbee_zcl_se.tun.flow_control_supported", FT_BOOLEAN, 8, NULL, 0x00, NULL, HFILL } }, { &hf_zbee_zcl_tun_max_in_size, @@ -9017,7 +9017,7 @@ proto_register_zbee_zcl_tun(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_tun_protocol_list_complete, - { "List Complete", "zbee_zcl_se.tun.protocol_list_complete", FT_BOOLEAN, 8, TFS(&tfs_true_false), + { "List Complete", "zbee_zcl_se.tun.protocol_list_complete", FT_BOOLEAN, 8, NULL, 0x00, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index d6cab22c46..c42a7acc78 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -2595,7 +2595,7 @@ void proto_register_zbee_zcl(void) &zbee_zcl_data_type_names_ext, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_boolean, - { "Boolean", "zbee_zcl.attr.boolean", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0xff, + { "Boolean", "zbee_zcl.attr.boolean", FT_BOOLEAN, 8, NULL, 0xff, NULL, HFILL }}, { &hf_zbee_zcl_attr_bitmap8, diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 22ed6a909d..914456986e 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -450,7 +450,7 @@ static const value_string zbee_zdp_ieee_join_policy_vals[] = { }; /* The reason this has it's own value_string and doesn't use - tfs_true_false, is that some hf_ fields use bitmasks larger + tfs_get_string(), is that some hf_ fields use bitmasks larger than 0x01, and it's intentional that those other values be "Unknown" (which is what value_string will give us) */ diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index b1294e1708..c2ff18a3e6 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -1138,6 +1138,23 @@ boolean_from_literal(fvalue_t *fv, const char *s, gboolean allow_partial_value _ return FALSE; } +static gboolean +boolean_from_string(fvalue_t *fv, const char *s, size_t len, gchar **err_msg _U_) +{ + if (g_ascii_strncasecmp(s, "true", len) == 0) { + fv->value.uinteger64 = 1; + return TRUE; + } + if (g_ascii_strncasecmp(s, "false", len) == 0) { + fv->value.uinteger64 = 0; + return TRUE; + } + + if (err_msg) + *err_msg = ws_strdup_printf("expected \"True\" or \"False\", not \"%s\"", s); + return FALSE; +} + static char * boolean_to_repr(wmem_allocator_t *scope, const fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_) { @@ -1869,7 +1886,7 @@ ftype_register_integers(void) NULL, /* copy_value */ NULL, /* free_value */ boolean_from_literal, /* val_from_literal */ - NULL, /* val_from_string */ + boolean_from_string, /* val_from_string */ uint64_from_charconst, /* val_from_charconst */ boolean_to_repr, /* val_to_string_repr */ diff --git a/epan/proto.c b/epan/proto.c index c3c5b8f265..68db7245e4 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -6687,7 +6687,6 @@ proto_item_fill_display_label(field_info *finfo, gchar *display_label_str, const const guint8 *bytes; guint32 number; guint64 number64; - const true_false_string *tfstring; const char *hf_str_val; char number_buf[48]; const char *number_out; @@ -6725,12 +6724,8 @@ proto_item_fill_display_label(field_info *finfo, gchar *display_label_str, const case FT_BOOLEAN: number64 = fvalue_get_uinteger64(finfo->value); - tfstring = &tfs_true_false; - if (hfinfo->strings) { - tfstring = (const struct true_false_string*) hfinfo->strings; - } label_len = protoo_strlcpy(display_label_str, - tfs_get_string(!!number64, tfstring), label_str_size); + tfs_get_string(!!number64, hfinfo->strings), label_str_size); break; case FT_CHAR: @@ -9749,11 +9744,6 @@ fill_label_boolean(field_info *fi, gchar *label_str) guint64 value; header_field_info *hfinfo = fi->hfinfo; - const true_false_string *tfstring = &tfs_true_false; - - if (hfinfo->strings) { - tfstring = (const struct true_false_string*) hfinfo->strings; - } value = fvalue_get_uinteger64(fi->value); if (hfinfo->bitmask) { @@ -9770,7 +9760,7 @@ fill_label_boolean(field_info *fi, gchar *label_str) } /* Fill in the textual info */ - label_fill(label_str, bitfield_byte_length, hfinfo, tfs_get_string(!!value, tfstring)); + label_fill(label_str, bitfield_byte_length, hfinfo, tfs_get_string(!!value, hfinfo->strings)); } static const char * @@ -12653,8 +12643,6 @@ _proto_tree_add_bits_ret_val(proto_tree *tree, const int hfindex, tvbuff_t *tvb, proto_item *pi; header_field_info *hf_field; - const true_false_string *tfstring; - /* We can't fake it just yet. We have to fill in the 'return_value' parameter */ PROTO_REGISTRAR_GET_NTH(hfindex, hf_field); @@ -12718,12 +12706,9 @@ _proto_tree_add_bits_ret_val(proto_tree *tree, const int hfindex, tvbuff_t *tvb, switch (hf_field->type) { case FT_BOOLEAN: /* Boolean field */ - tfstring = &tfs_true_false; - if (hf_field->strings) - tfstring = (const true_false_string *)hf_field->strings; return proto_tree_add_boolean_format(tree, hfindex, tvb, offset, length, (guint32)value, "%s = %s: %s", - bf_str, hf_field->name, tfs_get_string(!!value, tfstring)); + bf_str, hf_field->name, tfs_get_string(!!value, hf_field->strings)); break; case FT_CHAR: @@ -12805,7 +12790,6 @@ proto_tree_add_split_bits_item_ret_val(proto_tree *tree, const int hfindex, tvbu guint64 composite_bitmap; header_field_info *hf_field; - const true_false_string *tfstring; /* We can't fake it just yet. We have to fill in the 'return_value' parameter */ PROTO_REGISTRAR_GET_NTH(hfindex, hf_field); @@ -12911,13 +12895,10 @@ proto_tree_add_split_bits_item_ret_val(proto_tree *tree, const int hfindex, tvbu switch (hf_field->type) { case FT_BOOLEAN: /* it is a bit odd to have a boolean encoded as split-bits, but possible, I suppose? */ /* Boolean field */ - tfstring = &tfs_true_false; - if (hf_field->strings) - tfstring = (const true_false_string *) hf_field->strings; return proto_tree_add_boolean_format(tree, hfindex, tvb, octet_offset, octet_length, (guint32)value, "%s = %s: %s", - bf_str, hf_field->name, tfs_get_string(!!value, tfstring)); + bf_str, hf_field->name, tfs_get_string(!!value, hf_field->strings)); break; case FT_CHAR: diff --git a/epan/tfs.c b/epan/tfs.c index 276d5e7eea..55d3282441 100644 --- a/epan/tfs.c +++ b/epan/tfs.c @@ -20,6 +20,8 @@ /** Returns the string representing the true or false value. */ const char *tfs_get_string(gboolean value, const true_false_string *tfs) { + if (tfs == NULL) + return value ? "True" : "False"; return value ? tfs->true_string : tfs->false_string; } diff --git a/epan/tfs.h b/epan/tfs.h index bbe8c40cd8..83dde898ed 100644 --- a/epan/tfs.h +++ b/epan/tfs.h @@ -40,7 +40,7 @@ WS_DLL_PUBLIC const char *tfs_get_string(gboolean value, const true_false_string /* * A default set of true/false strings that dissectors can use for - * FT_BOOLEAN header fields. + * FT_BOOLEAN header fields. By default tfs_true_false is used. */ WS_DLL_PUBLIC const true_false_string tfs_true_false; WS_DLL_PUBLIC const true_false_string tfs_yes_no; |