diff options
| author | Gerald Combs <gerald@zing.org> | 2015-02-15 17:58:12 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-18 00:05:38 +0000 |
| commit | 3f765b3ef94fd6044279d47d0b30b46c344e5943 (patch) | |
| tree | 1218985b912e24bc88d72617d61a7491911ee092 /epan/dissectors | |
| parent | be5e595da7beb355d385c6a9d96fdd1dad569e61 (diff) | |
| download | wireshark-3f765b3ef94fd6044279d47d0b30b46c344e5943.tar.gz | |
Add a CF_FUNC macro for casting BASE_CUSTOM functions.
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
the following warning:
warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]
We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
more consistent with the other macros in proto.h. Update each instance
of BASE_CUSTOM to use CF_FUNC.
Adjust a dummy variable name generated by asn2wrs.py that was triggering
an invalid error in checkhf.pl.
Fix an encoding arguement in packet-elasticsearch.c found by
fix-encoding-args.pl.
Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
Reviewed-on: https://code.wireshark.org/review/7150
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors')
48 files changed, 676 insertions, 678 deletions
diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index 04a621f995..b134c2ccc8 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -755,12 +755,12 @@ proto_register_acr122(void) }, { &hf_led_t1_duration, { "T1 Duration", "acr122.led.t1_duration", - FT_UINT8, BASE_CUSTOM, duration_base, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(duration_base), 0x00, "Initial Blinking State", HFILL } }, { &hf_led_t2_duration, { "T2 Duration", "acr122.led.t2_duration", - FT_UINT8, BASE_CUSTOM, duration_base, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(duration_base), 0x00, "Toggle Blinking State", HFILL } }, { &hf_led_number_of_repetition, @@ -780,7 +780,7 @@ proto_register_acr122(void) }, { &hf_timeout, { "Timeout", "acr122.timeout", - FT_UINT8, BASE_CUSTOM, timeout_base, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(timeout_base), 0x00, NULL, HFILL } }, { &hf_status_word_led_reserved, diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index 608e483920..b21c79f03c 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -475,7 +475,7 @@ proto_register_aim_generic(void) BASE_HEX, VALS(aim_snac_generic_motd_motdtypes), 0x0, NULL, HFILL }, }, { &hf_generic_family, - { "Family", "aim_generic.family", FT_UINT16, BASE_CUSTOM, aim_generic_family, 0x0, NULL, HFILL }, + { "Family", "aim_generic.family", FT_UINT16, BASE_CUSTOM, CF_FUNC(aim_generic_family), 0x0, NULL, HFILL }, }, { &hf_generic_version, { "Version", "aim_generic.version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index 2d6941d0ca..20659284a0 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -2753,7 +2753,7 @@ proto_register_AllJoyn(void) }, {&hf_alljoyn_mess_body_header_typeid, {"Type ID", "alljoyn.message.typeid", - FT_UINT8, BASE_CUSTOM, alljoyn_typeid, 0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(alljoyn_typeid), 0, NULL, HFILL} }, @@ -3045,4 +3045,3 @@ proto_reg_handoff_AllJoyn(void) * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 11aef05a8a..b5e8b67e6a 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -250,7 +250,7 @@ proto_register_erspan(void) 0x03ff, NULL, HFILL }}, { &hf_erspan_timestamp, - { "Timestamp", "erspan.timestamp", FT_UINT32, BASE_CUSTOM, erspan_fmt_timestamp, + { "Timestamp", "erspan.timestamp", FT_UINT32, BASE_CUSTOM, CF_FUNC(erspan_fmt_timestamp), 0, NULL, HFILL }}, { &hf_erspan_unknown4, diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index 4b2e82516c..d422213737 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -712,7 +712,7 @@ proto_register_epm (void) { &hf_epm_uuid, { "UUID", "epm.uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_epm_uuid_version, - { "Version", "epm.uuid_version", FT_UINT16, BASE_CUSTOM, epm_fmt_uuid_version, 0x0, NULL, HFILL }}, + { "Version", "epm.uuid_version", FT_UINT16, BASE_CUSTOM, CF_FUNC(epm_fmt_uuid_version), 0x0, NULL, HFILL }}, { &hf_epm_annotation, { "Annotation", "epm.annotation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_epm_proto_named_pipes, diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 8942ac3f22..7db92c00e7 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -2307,7 +2307,7 @@ proto_register_dhcpv6(void) { &hf_cablelabs_ipv6_server, { "IPv6 address", "dhcpv6.cablelabs.ipv6_server", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_cablelabs_docsis_version_number, - { "DOCSIS Version Number", "dhcpv6.cablelabs.docsis_version_number", FT_UINT16, BASE_CUSTOM, cablelabs_fmt_docsis_version, 0x0, NULL, HFILL}}, + { "DOCSIS Version Number", "dhcpv6.cablelabs.docsis_version_number", FT_UINT16, BASE_CUSTOM, CF_FUNC(cablelabs_fmt_docsis_version), 0x0, NULL, HFILL}}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-elasticsearch.c b/epan/dissectors/packet-elasticsearch.c index 89c0cf2852..256334ecd5 100644 --- a/epan/dissectors/packet-elasticsearch.c +++ b/epan/dissectors/packet-elasticsearch.c @@ -428,7 +428,7 @@ static int elasticsearch_dissect_valid_binary_packet(tvbuff_t *tvb, packet_info * * Token/Magic number that is at the start of all ES packets */ - proto_tree_add_item(tree, hf_elasticsearch_header_token, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_elasticsearch_header_token, tvb, offset, 2, ENC_ASCII|ENC_NA); offset += 2; /* Message length */ @@ -531,7 +531,7 @@ void proto_register_elasticsearch(void) { { &hf_elasticsearch_version, { "Version", "elasticsearch.version", FT_UINT32, BASE_CUSTOM, - elasticsearch_format_version, 0x0, + CF_FUNC(elasticsearch_format_version), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 405ce8cc24..c0dafc2a29 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -2693,7 +2693,7 @@ proto_register_enip(void) { &hf_enip_lir_revision, { "Revision", "enip.lir.revision", - FT_UINT16, BASE_CUSTOM, enip_fmt_lir_revision, 0, + FT_UINT16, BASE_CUSTOM, CF_FUNC(enip_fmt_lir_revision), 0, "ListIdentity Reply: Revision", HFILL }}, { &hf_enip_lir_status, diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index a56fc99129..fbe64000bb 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -3490,7 +3490,7 @@ proto_register_epl(void) }, { &hf_epl_preq_pdov, { "PDOVersion", "epl.preq.pdov", - FT_UINT8, BASE_CUSTOM, elp_version, 0x00, NULL, HFILL } + FT_UINT8, BASE_CUSTOM, CF_FUNC(elp_version), 0x00, NULL, HFILL } }, { &hf_epl_preq_size, { "Size", "epl.preq.size", @@ -3566,7 +3566,7 @@ proto_register_epl(void) }, { &hf_epl_soa_eplv, { "EPLVersion", "epl.soa.eplv", - FT_UINT8, BASE_CUSTOM, elp_version, 0x00, NULL, HFILL } + FT_UINT8, BASE_CUSTOM, CF_FUNC(elp_version), 0x00, NULL, HFILL } }, { &hf_epl_soa_sync, { "SyncControl", "epl.soa.sync", @@ -3672,7 +3672,7 @@ proto_register_epl(void) }, { &hf_epl_asnd_identresponse_ever, { "EPLVersion", "epl.asnd.ires.eplver", - FT_UINT8, BASE_CUSTOM, elp_version, 0x00, NULL, HFILL } + FT_UINT8, BASE_CUSTOM, CF_FUNC(elp_version), 0x00, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat, { "FeatureFlags", "epl.asnd.ires.features", diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index d2aacd60b8..8ee304e284 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.c @@ -1098,7 +1098,7 @@ proto_register_gmr1_bcch(void) }, { &hf_seg1a_syncinfo_sa_freq_offset, { "SA_FREQ_OFFSET", "gmr1.bcch.seg1a.syncinfo.sa_freq_offset", - FT_UINT8, BASE_CUSTOM, seg1a_syncinfo_sa_freq_offset_fmt, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(seg1a_syncinfo_sa_freq_offset_fmt), 0x00, NULL, HFILL } }, { &hf_seg1a_rachctrl_max_retrans, @@ -1193,7 +1193,7 @@ proto_register_gmr1_bcch(void) }, { &hf_seg1a_miscinfo_sb_reselection_hysteresis, { "SB_RESELECTION_HYSTERESIS", "gmr1.bcch.seg1a.miscinfo.sb_reselection_hysteresis", - FT_UINT8, BASE_CUSTOM, segx_half_db_value_fmt, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(segx_half_db_value_fmt), 0x00, NULL, HFILL } }, { &hf_seg1a_miscinfo_spare, @@ -1275,12 +1275,12 @@ proto_register_gmr1_bcch(void) }, { &hf_seg2a_selcrit_rxlev_select_min, { "RXLEV_SELECT_MIN", "gmr1.bcch.seg2a.selcrit.rxlev_select_min", - FT_UINT8, BASE_CUSTOM, segx_half_db_value_fmt, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(segx_half_db_value_fmt), 0x00, "Adjustment to threshold to camp-on system", HFILL } }, { &hf_seg2a_miscinfo_sb_selection_power, { "SB_SELECTION_POWER", "gmr1.bcch.seg2a.miscinfo.sb_selection_power", - FT_UINT8, BASE_CUSTOM, segx_half_db_value_fmt, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(segx_half_db_value_fmt), 0x00, NULL, HFILL } }, { &hf_seg2a_lainfo_sa_pch_config, @@ -1357,32 +1357,32 @@ proto_register_gmr1_bcch(void) }, { &hf_seg3a_satpos_latitude, { "Latitude", "gmr1.bcch.seg3a.satpos.latitude", - FT_INT8, BASE_CUSTOM, seg3a_latitude_fmt, 0x00, + FT_INT8, BASE_CUSTOM, CF_FUNC(seg3a_latitude_fmt), 0x00, NULL, HFILL } }, { &hf_seg3a_satpos_longitude, { "Longitude", "gmr1.bcch.seg3a.satpos.longitude", - FT_UINT16, BASE_CUSTOM, seg3a_longitude_fmt, 0x00, + FT_UINT16, BASE_CUSTOM, CF_FUNC(seg3a_longitude_fmt), 0x00, NULL, HFILL } }, { &hf_seg3a_satpos_radius, { "Radius", "gmr1.bcch.seg3a.satpos.radius", - FT_INT16, BASE_CUSTOM, seg3a_satpos_radius_fmt, 0x00, + FT_INT16, BASE_CUSTOM, CF_FUNC(seg3a_satpos_radius_fmt), 0x00, NULL, HFILL } }, { &hf_seg3a_beam_latitude, { "Latitude", "gmr1.bcch.seg3a.beam.latitude", - FT_INT16, BASE_CUSTOM, seg3a_latitude_fmt, 0x00, + FT_INT16, BASE_CUSTOM, CF_FUNC(seg3a_latitude_fmt), 0x00, NULL, HFILL } }, { &hf_seg3a_beam_longitude, { "Longitude", "gmr1.bcch.seg3a.beam.longitude", - FT_UINT16, BASE_CUSTOM, seg3a_longitude_fmt, 0x00, + FT_UINT16, BASE_CUSTOM, CF_FUNC(seg3a_longitude_fmt), 0x00, NULL, HFILL } }, { &hf_seg3a_miscinfo_sb_reselection_timer, { "SB_RESELECTION_TIMER", "gmr1.bcch.seg3a.sb_reselection_timer", - FT_UINT8, BASE_CUSTOM, seg3a_miscinfo_sb_reselection_timer_fmt, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(seg3a_miscinfo_sb_reselection_timer_fmt), 0x00, NULL, HFILL } }, { &hf_seg3a_spare, diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index 1f765547bb..7b49b6d158 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -991,12 +991,12 @@ proto_register_gmr1_rach(void) }, { &hf_rach_gps_pos_lat, { "Latitude", "gmr1.rach.gps_pos.latitude", - FT_INT24, BASE_CUSTOM, rach_gps_pos_lat_fmt, 0x7ffff0, + FT_INT24, BASE_CUSTOM, CF_FUNC(rach_gps_pos_lat_fmt), 0x7ffff0, NULL, HFILL } }, { &hf_rach_gps_pos_long, { "Longitude", "gmr1.rach.gps_pos.longitude", - FT_INT24, BASE_CUSTOM, rach_gps_pos_long_fmt, 0x0fffff, + FT_INT24, BASE_CUSTOM, CF_FUNC(rach_gps_pos_long_fmt), 0x0fffff, NULL, HFILL } }, { &hf_rach_mes_pwr_class, @@ -1006,7 +1006,7 @@ proto_register_gmr1_rach(void) }, { &hf_rach_sp_hplmn_id, { "SP/HPLMN ID", "gmr1.rach.sp_hplmn_id", - FT_UINT24, BASE_CUSTOM, rach_sp_hplmn_id_fmt, 0x0fffff, + FT_UINT24, BASE_CUSTOM, CF_FUNC(rach_sp_hplmn_id_fmt), 0x0fffff, NULL, HFILL } }, { &hf_rach_pd, @@ -1021,27 +1021,27 @@ proto_register_gmr1_rach(void) }, { &hf_rach_number_grp1, { "Group 1", "gmr1.rach.number.grp1", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0x3ff0, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0x3ff0, NULL, HFILL } }, { &hf_rach_number_grp2, { "Group 2", "gmr1.rach.number.grp2", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0x0ffc, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0x0ffc, NULL, HFILL } }, { &hf_rach_number_grp3, { "Group 3", "gmr1.rach.number.grp3", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0x03ff, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0x03ff, NULL, HFILL } }, { &hf_rach_number_grp4, { "Group 4", "gmr1.rach.number.grp4", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0xffc0, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0xffc0, NULL, HFILL } }, { &hf_rach_number_grp5, { "Group 5", "gmr1.rach.number.grp5", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp5_fmt, 0x3ff8, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp5_fmt), 0x3ff8, NULL, HFILL } }, { &hf_rach_msc_id, @@ -1051,7 +1051,7 @@ proto_register_gmr1_rach(void) }, { &hf_rach_gps_timestamp, { "GPS Timestamp", "gmr1.rach.gps_timestamp", - FT_UINT16, BASE_CUSTOM, rach_gps_timestamp_fmt, 0xffff, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_gps_timestamp_fmt), 0xffff, NULL, HFILL } }, { &hf_rach_software_version, diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index fbb2e770af..c4c1ab4213 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -2004,7 +2004,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_timing_ofs_value, { "Timing Offset value", "gmr1.rr.timing_offset.value", - FT_INT16, BASE_CUSTOM, rr_timing_ofs_value_fmt, 0x00, + FT_INT16, BASE_CUSTOM, CF_FUNC(rr_timing_ofs_value_fmt), 0x00, NULL, HFILL } }, { &hf_rr_tmsi_ptmsi, @@ -2014,7 +2014,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_wait_ind_timeout, { "T3122/T3142 timeout", "gmr1.rr.wait_ind.timeout", - FT_UINT8, BASE_CUSTOM, rr_gen_ie_seconds_fmt, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_gen_ie_seconds_fmt), 0x00, NULL, HFILL } }, { &hf_rr_mif_mes1_ab, @@ -2059,7 +2059,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_freq_ofs_value, { "Frequency Offset value", "gmr1.rr.frequency_offset.value", - FT_INT16, BASE_CUSTOM, rr_freq_ofs_value_fmt, 0x00, + FT_INT16, BASE_CUSTOM, CF_FUNC(rr_freq_ofs_value_fmt), 0x00, NULL, HFILL } }, { &hf_rr_freq_ofs_spare, @@ -2094,12 +2094,12 @@ proto_register_gmr1_rr(void) }, { &hf_rr_pos_upd_info_dist, { "GPS Update Distance", "gmr1.rr.pos_upd_info.distance", - FT_UINT8, BASE_CUSTOM, rr_pos_upd_info_dist_fmt, 0xfe, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_pos_upd_info_dist_fmt), 0xfe, NULL, HFILL } }, { &hf_rr_pos_upd_info_time, { "GPS Update Timer", "gmr1.rr.pos_upd_info.time", - FT_UINT8, BASE_CUSTOM, rr_pos_upd_info_time_fmt, 0xff, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_pos_upd_info_time_fmt), 0xff, NULL, HFILL } }, { &hf_rr_bcch_carrier_arfcn, @@ -2134,7 +2134,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_gps_timestamp, { "GPS timestamp", "gmr1.rr.gps_timestamp", - FT_UINT16, BASE_CUSTOM, rr_gps_timestamp_fmt, 0xffff, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rr_gps_timestamp_fmt), 0xffff, NULL, HFILL } }, { &hf_rr_gps_power_control_params, @@ -2164,7 +2164,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_gps_almanac_pn, { "Page Number", "gmr1.rr.gps_almanac.pn", - FT_UINT8, BASE_CUSTOM, rr_gps_almanac_pn_fmt, 0xf8, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_gps_almanac_pn_fmt), 0xf8, "See ICD-GPS-200", HFILL } }, { &hf_rr_gps_almanac_wn, @@ -2244,7 +2244,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_pkt_freq_prm_dl_bw, { "Downlink Bandwidth", "gmr1.rr.pkt_freq_prm.dl_bw", - FT_UINT8, BASE_CUSTOM, rr_pkt_freq_prm_xx_bw_fmt, 0x70, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_pkt_freq_prm_xx_bw_fmt), 0x70, NULL, HFILL } }, { &hf_rr_pkt_freq_prm_ul_freq_dist, @@ -2254,7 +2254,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_pkt_freq_prm_ul_bw, { "Uplink Bandwidth", "gmr1.rr.pkt_freq_prm.ul_bw", - FT_UINT8, BASE_CUSTOM, rr_pkt_freq_prm_xx_bw_fmt, 0x70, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_pkt_freq_prm_xx_bw_fmt), 0x70, NULL, HFILL } }, { &hf_rr_pkt_freq_prm_spare, @@ -2384,7 +2384,7 @@ proto_register_gmr1_rr(void) }, { &hf_rr_pkt_pwr_ctrl_prm_par, { "Power Attenuation Request (PAR)", "gmr1.rr.pkt_pwr_ctrl_prm.par", - FT_UINT8, BASE_CUSTOM, rr_pkt_pwr_ctrl_prm_par_fmt, 0x3f, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rr_pkt_pwr_ctrl_prm_par_fmt), 0x3f, NULL, HFILL } }, { &hf_rr_pkt_pwr_ctrl_prm_spare, diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index d26a26e5cb..2579640a79 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -8427,7 +8427,7 @@ proto_register_gsm_a_gm(void) }, { &hf_gsm_a_gm_rac_dlmc_max_nb_dl_ts, { "DLMC - Maximum Number of Downlink Timeslots", "gsm_a.gm.gmm.rac.dlmc.max_nb_dl_ts", - FT_UINT8, BASE_CUSTOM, &gsm_a_gm_dlmc_max_nb_dl_ts_fmt, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(gsm_a_gm_dlmc_max_nb_dl_ts_fmt), 0x0, NULL, HFILL } }, { &hf_gsm_a_gm_rac_dlmc_max_nb_dl_carriers, diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index 532f41f37a..7422bce999 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -1901,7 +1901,7 @@ proto_register_abis_oml(void) }, { &hf_oml_fom_msgtype, { "FOM Message Type", "gsm_abis_oml.fom.msg_type", - FT_UINT8, BASE_CUSTOM, &format_custom_msgtype, 0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_custom_msgtype), 0, NULL, HFILL } }, { &hf_oml_fom_objclass, @@ -1926,7 +1926,7 @@ proto_register_abis_oml(void) }, { &hf_oml_fom_attr_tag, { "FOM Attribute ID", "gsm_abis_oml.fom.attr_id", - FT_UINT8, BASE_CUSTOM, &format_custom_attr, 0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_custom_attr), 0, NULL, HFILL } }, { &hf_oml_fom_attr_len, diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index 395b74c013..3603264d7a 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -258,7 +258,7 @@ proto_register_hdmi(void) FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_hdmi_edid_version, { "EDID Version", "hdmi.edid.version", - FT_UINT16, BASE_CUSTOM, hdmi_fmt_edid_version, 0, NULL, HFILL } } + FT_UINT16, BASE_CUSTOM, CF_FUNC(hdmi_fmt_edid_version), 0, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 87a2fa9631..55cec5d2e4 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1914,7 +1914,7 @@ proto_register_homeplug(void) { &hf_homeplug_ns_mhz, { "Mhz", "homeplug.ns.mhz", - FT_UINT16, BASE_CUSTOM, homeplug_fmt_mhz, 0x0, NULL, HFILL } + FT_UINT16, BASE_CUSTOM, CF_FUNC(homeplug_fmt_mhz), 0x0, NULL, HFILL } }, { &hf_homeplug_ns_fails_robo, diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index e8c772008a..4c1bb62efc 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -545,7 +545,7 @@ static hf_register_info hf_prism[] = { NULL, HFILL }}, { &hf_ieee80211_prism_did_rate, - {"Data rate (Mb/s)", "prism.did.rate", FT_UINT32, BASE_CUSTOM, prism_rate_base_custom, 0x0, + {"Data rate (Mb/s)", "prism.did.rate", FT_UINT32, BASE_CUSTOM, CF_FUNC(prism_rate_base_custom), 0x0, "Speed this frame was sent/received at", HFILL }}, { &hf_ieee80211_prism_did_istx, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 884f5060fa..b0b6901b64 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -19478,7 +19478,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_alloc_duration, {"Response Offset", "wlan.dynamic_allocation.alloc_duration", - FT_UINT32, BASE_CUSTOM, allocation_duration_base_custom, 0x7fff80, + FT_UINT32, BASE_CUSTOM, CF_FUNC(allocation_duration_base_custom), 0x7fff80, NULL, HFILL }}, {&hf_ieee80211_ff_ssw, @@ -19853,7 +19853,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_tbtt_offset, {"TBTT Offset", "wlan.dmg_bss_param_change.tbtt_offset", - FT_UINT32, BASE_CUSTOM, allocation_duration_base_custom, 0xffffffff, + FT_UINT32, BASE_CUSTOM, CF_FUNC(allocation_duration_base_custom), 0xffffffff, NULL, HFILL }}, {&hf_ieee80211_tag_bi_duration, @@ -19893,7 +19893,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_rx_antenna, /* DMG STA capa, bits [4..5] */ {"Number of RX DMG Antennas", "wlan.dmg_capa.num_rx", - FT_UINT24, BASE_CUSTOM, extra_one_base_custom, GENMASK(5, 4), + FT_UINT24, BASE_CUSTOM, CF_FUNC(extra_one_base_custom), GENMASK(5, 4), NULL, HFILL }}, {&hf_ieee80211_tag_fast_link, /* DMG STA capa, bits [6] */ @@ -19903,12 +19903,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_num_sectors, /* DMG STA capa, bits [7..13] */ {"Total Number of Sectors", "wlan.dmg_capa.num_sectors", - FT_UINT24, BASE_CUSTOM, extra_one_base_custom, GENMASK(13, 7), + FT_UINT24, BASE_CUSTOM, CF_FUNC(extra_one_base_custom), GENMASK(13, 7), NULL, HFILL }}, {&hf_ieee80211_tag_rxss_length, /* DMG STA capa, bits [14..19] */ {"RXSS Length", "wlan.dmg_capa.rxss_len", - FT_UINT24, BASE_CUSTOM, extra_one_mul_two_base_custom, GENMASK(19, 14), + FT_UINT24, BASE_CUSTOM, CF_FUNC(extra_one_mul_two_base_custom), GENMASK(19, 14), NULL, HFILL }}, {&hf_ieee80211_tag_reciprocity, /* DMG STA capa, bits [20] */ @@ -20223,7 +20223,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_link_change_interval, {"Link Change Interval", "wlan.realy_trans_param.link_change_interval", - FT_UINT8, BASE_CUSTOM, allocation_duration_base_custom, 0xff, + FT_UINT8, BASE_CUSTOM, CF_FUNC(allocation_duration_base_custom), 0xff, NULL, HFILL }}, {&hf_ieee80211_tag_data_sensing_time, @@ -20851,7 +20851,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_beacon_interval, {"Beacon Interval", "wlan_mgt.fixed.beacon", - FT_UINT32, BASE_CUSTOM, beacon_interval_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(beacon_interval_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_fixed_parameters, @@ -22304,7 +22304,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_oui, {"OUI", "wlan_mgt.tag.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, "OUI of vendor specific IE", HFILL }}, {&hf_ieee80211_tag_oui_wfa_subtype, @@ -22622,12 +22622,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_rsn_gcs, {"Group Cipher Suite", "wlan_mgt.rsn.gcs", - FT_UINT32, BASE_CUSTOM, rsn_gcs_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_gcs_base_custom), 0, "Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }}, {&hf_ieee80211_rsn_gcs_oui, {"Group Cipher Suite OUI", "wlan_mgt.rsn.gcs.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_rsn_gcs_type, @@ -22652,12 +22652,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_rsn_pcs, {"Pairwise Cipher Suite", "wlan_mgt.rsn.pcs", - FT_UINT32, BASE_CUSTOM, rsn_pcs_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_pcs_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_rsn_pcs_oui, {"Pairwise Cipher Suite OUI", "wlan_mgt.rsn.pcs.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_rsn_pcs_type, @@ -22682,12 +22682,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_rsn_akms, {"Auth Key Management (AKM) Suite", "wlan_mgt.rsn.akms", - FT_UINT32, BASE_CUSTOM, rsn_akms_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_akms_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_rsn_akms_oui, {"Auth Key Management (AKM) OUI", "wlan_mgt.rsn.akms.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_rsn_akms_type, @@ -22762,12 +22762,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_rsn_gmcs, {"Group Management Cipher Suite", "wlan_mgt.rsn.gmcs", - FT_UINT32, BASE_CUSTOM, rsn_gmcs_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_gmcs_base_custom), 0, "Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }}, {&hf_ieee80211_rsn_gmcs_oui, {"Group Management Cipher Suite OUI", "wlan_mgt.rsn.gmcs.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_rsn_gmcs_type, @@ -23451,22 +23451,22 @@ proto_register_ieee80211 (void) {&hf_ieee80211_vht_tpe_pwr_constr_20, {"Local Max Tx Pwr Constraint 20MHz", "wlan_mgt.vht.tpe.pwr_constr_20", - FT_INT8, BASE_CUSTOM, vht_tpe_custom , 0, + FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0, NULL, HFILL }}, {&hf_ieee80211_vht_tpe_pwr_constr_40, {"Local Max Tx Pwr Constraint 40MHz", "wlan_mgt.vht.tpe.pwr_constr_40", - FT_INT8, BASE_CUSTOM, vht_tpe_custom , 0, + FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0, NULL, HFILL }}, {&hf_ieee80211_vht_tpe_pwr_constr_80, {"Local Max Tx Pwr Constraint 80MHz", "wlan_mgt.vht.tpe.pwr_constr_80", - FT_INT8, BASE_CUSTOM, vht_tpe_custom , 0, + FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0, NULL, HFILL }}, {&hf_ieee80211_vht_tpe_pwr_constr_160, {"Local Max Tx Pwr Constraint 160MHz/80+80 MHz", "wlan_mgt.vht.tpe.pwr_constr_160", - FT_INT8, BASE_CUSTOM, vht_tpe_custom , 0, + FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0, NULL, HFILL }}, {&hf_ieee80211_txbf_csi_num_bf_ant, @@ -23761,7 +23761,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_rsni, {"RSNI", "wlan_mgt.rsni", - FT_UINT8, BASE_CUSTOM, rsni_base_custom, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(rsni_base_custom), 0x0, NULL, HFILL }}, {&hf_ieee80211_tag_bss_avb_adm_cap_bitmask, @@ -24151,7 +24151,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_measure_request_channel_number, {"Measurement Channel Number", "wlan_mgt.measure.req.channelnumber", - FT_UINT8, BASE_CUSTOM, channel_number_custom, 0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(channel_number_custom), 0, NULL, HFILL }}, {&hf_ieee80211_tag_measure_request_start_time, @@ -24281,7 +24281,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_measure_report_channel_number, {"Measurement Channel Number", "wlan_mgt.measure.rep.channelnumber", - FT_UINT8, BASE_CUSTOM, channel_number_custom, 0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(channel_number_custom), 0, NULL, HFILL }}, {&hf_ieee80211_tag_measure_report_start_time, @@ -24954,7 +24954,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_neighbor_report_channel_number, {"Channel Number", "wlan_mgt.nreport.channumber", - FT_UINT8, BASE_CUSTOM, channel_number_custom, 0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(channel_number_custom), 0, NULL, HFILL }}, {&hf_ieee80211_tag_neighbor_report_phy_type, @@ -24994,12 +24994,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_wfa_ie_wpa_mcs, {"Multicast Cipher Suite", "wlan_mgt.wfa.ie.wpa.mcs", - FT_UINT32, BASE_CUSTOM, wpa_mcs_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(wpa_mcs_base_custom), 0, "Contains the cipher suite selector used by the BSS to protect broadcast/multicasttraffic", HFILL }}, {&hf_ieee80211_wfa_ie_wpa_mcs_oui, {"Multicast Cipher Suite OUI", "wlan_mgt.wfa.ie.wpa.mcs.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_wfa_ie_wpa_mcs_type, @@ -25024,12 +25024,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_wfa_ie_wpa_ucs, {"Unicast Cipher Suite", "wlan_mgt.wfa.ie.wpa.ucs", - FT_UINT32, BASE_CUSTOM, wpa_ucs_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(wpa_ucs_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_wfa_ie_wpa_ucs_oui, {"Unicast Cipher Suite OUI", "wlan_mgt.wfa.ie.wpau.cs.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_wfa_ie_wpa_ucs_type, @@ -25054,12 +25054,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_wfa_ie_wpa_akms, {"Auth Key Management (AKM) Suite", "wlan_mgt.wfa.ie.wpa.akms", - FT_UINT32, BASE_CUSTOM, wpa_akms_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(wpa_akms_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_wfa_ie_wpa_akms_oui, {"Auth Key Management (AKM) OUI", "wlan_mgt.wfa.ie.wpa.akms.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_wfa_ie_wpa_akms_type, @@ -25419,7 +25419,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_atheros_ie_xr_xr_beacon, {"XR Beacon Interval", "wlan_mgt.atheros.ie.xr.xr_beacon", - FT_UINT32, BASE_CUSTOM, beacon_interval_base_custom, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(beacon_interval_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_atheros_ie_xr_base_cap, @@ -26093,7 +26093,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_wapi_param_set_akm_suite_oui, {"AKM Suite OUI", "wlan_mgt.wapi.akm_suite.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_tag_wapi_param_set_akm_suite_type, @@ -26108,7 +26108,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_oui, {"Unicast Cipher Suite OUI", "wlan_mgt.wapi.unicast_cipher.suite.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_type, @@ -26118,7 +26118,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_oui, {"Multicast Cipher Suite OUI", "wlan_mgt.wapi.multicast_cipher.suite.oui", - FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, + FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0, NULL, HFILL }}, {&hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_type, diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index 2aec4d34d7..5070847f4f 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -1069,7 +1069,7 @@ proto_register_ipmi_app(void) "ipmi.app01.fw.minor", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_ipmi_app_01_ipmi_version, { "IPMI version", - "ipmi.app01.ipmi.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + "ipmi.app01.ipmi.version", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_ipmi_app_01_ipmi_ads_chassis, { "Chassis", "ipmi.app01.ads.chassis", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, @@ -1180,7 +1180,7 @@ proto_register_ipmi_app(void) "ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_timeout), 0x07, NULL, HFILL }}, { &hf_ipmi_app_24_pretimeout, { "Pre-timeout interval", - "ipmi.app24.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.app24.pretimeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_app_24_expiration_flags_oem, { "OEM", "ipmi.app24.exp_flags.oem", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x20, NULL, HFILL }}, @@ -1217,7 +1217,7 @@ proto_register_ipmi_app(void) "ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_timeout), 0x07, NULL, HFILL }}, { &hf_ipmi_app_25_pretimeout, { "Pre-timeout interval", - "ipmi.app25.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.app25.pretimeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_app_25_expiration_flags_oem, { "OEM", "ipmi.app25.exp_flags.oem", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x20, NULL, HFILL }}, @@ -1324,20 +1324,20 @@ proto_register_ipmi_app(void) { &hf_ipmi_app_32_rq_chno, { "Channel", - "ipmi.app32.rq_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.app32.rq_chno", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_32_rq_state, { "Channel State", "ipmi.app32.rq_state", FT_UINT8, BASE_HEX, VALS(vals_32_state), 0x03, NULL, HFILL }}, { &hf_ipmi_app_32_rs_chno, { "Channel", - "ipmi.app32.rs_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.app32.rs_chno", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_32_rs_state, { "Channel State", "ipmi.app32.rs_state", FT_BOOLEAN, 8, TFS(&tfs_32_state), 0x01, NULL, HFILL }}, { &hf_ipmi_app_33_rs_chan, { "Channel", - "ipmi.app33.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.app33.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_33_rs_priv, { "Inferred privilege level", "ipmi.app33.priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0xf0, NULL, HFILL }}, @@ -1356,7 +1356,7 @@ proto_register_ipmi_app(void) "ipmi.app34.auth", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_ipmi_app_34_chan, { "Channel", - "ipmi.app34.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.app34.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_34_msg, { "Embedded message", "ipmi.app34.msg", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1366,13 +1366,13 @@ proto_register_ipmi_app(void) "ipmi.app38.rq_ipmi20", FT_UINT8, BASE_DEC, VALS(vals_38_ipmi20), 0x80, NULL, HFILL }}, { &hf_ipmi_app_38_rq_chan, { "Channel", - "ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_38_rq_priv, { "Requested privilege level", "ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_38_rs_chan, { "Channel", - "ipmi.app38.rs_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.app38.rs_chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_app_38_rs_ipmi20, { "Version compatibility", "ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, VALS(vals_38_ipmi20), 0x80, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index 2f0884d0e0..547c8fd25b 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.c @@ -806,7 +806,7 @@ proto_register_ipmi_chassis(void) "ipmi.bootopt05.byte5", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_ipmi_chs_bo06_chan_num, { "Channel", - "ipmi.bootopt06.chan_num", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.bootopt06.chan_num", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_chs_bo06_session_id, { "Session ID", "ipmi.bootopt06.session_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -930,7 +930,7 @@ proto_register_ipmi_chassis(void) { &hf_ipmi_chs_04_ival, { "Identify Interval in seconds", - "ipmi.ch04.interval", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.ch04.interval", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_chs_04_perm_on, { "Turn on Identify indefinitely", "ipmi.ch04.perm_on", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, @@ -975,7 +975,7 @@ proto_register_ipmi_chassis(void) "ipmi.ch07.cause", FT_UINT8, BASE_HEX, VALS(vals_07_cause), 0x0f, NULL, HFILL }}, { &hf_ipmi_chs_07_chan, { "Channel", - "ipmi.ch07.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0, NULL, HFILL }}, + "ipmi.ch07.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0, NULL, HFILL }}, { &hf_ipmi_chs_08_valid, { "Validity", diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index 065f044fd8..56562cfa72 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -2790,7 +2790,7 @@ proto_register_ipmi_picmg(void) { &hf_ipmi_picmg_00_version, { "PICMG Extension Version", - "ipmi.picmg00.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + "ipmi.picmg00.version", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_ipmi_picmg_00_max_fruid, { "Max FRU Device ID", "ipmi.picmg00.max_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3128,7 +3128,7 @@ proto_register_ipmi_picmg(void) "ipmi.picmg1c.fan_enable_state", FT_UINT8, BASE_HEX, VALS(enable_vals), 0, NULL, HFILL }}, { &hf_ipmi_picmg_1c_fan_policy_timeout, { "Fan Policy Timeout", - "ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }}, + "ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }}, { &hf_ipmi_picmg_1c_site_number, { "Site Number", "ipmi.picmg1c.site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3214,7 +3214,7 @@ proto_register_ipmi_picmg(void) "ipmi.picmg21.site_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ipmi_picmg_21_max_unavail, { "Maximum Unavailable Time", - "ipmi.picmg21.max_unavail", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.picmg21.max_unavail", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_picmg_21_is_shm, { "Shelf Manager IP Address", "ipmi.picmg21.is_shm", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, @@ -3292,16 +3292,16 @@ proto_register_ipmi_picmg(void) "ipmi.picmg2e.self_test", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_ipmi_picmg_2e_upgrade_tout, { "Upgrade timeout", - "ipmi.picmg2e.upgrade_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }}, + "ipmi.picmg2e.upgrade_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }}, { &hf_ipmi_picmg_2e_selftest_tout, { "Self-test timeout", - "ipmi.picmg2e.selftest_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }}, + "ipmi.picmg2e.selftest_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }}, { &hf_ipmi_picmg_2e_rollback_tout, { "Rollback timeout", - "ipmi.picmg2e.rollback_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }}, + "ipmi.picmg2e.rollback_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }}, { &hf_ipmi_picmg_2e_inaccessibility_tout, { "Inaccessibility timeout", - "ipmi.picmg2e.inaccessibility_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }}, + "ipmi.picmg2e.inaccessibility_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }}, { &hf_ipmi_picmg_prop00_cold_reset, { "Payload cold reset required", @@ -3373,7 +3373,7 @@ proto_register_ipmi_picmg(void) "ipmi.picmg34.ccode", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_ipmi_picmg_34_percentage, { "Completion estimate", - "ipmi.picmg34.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, NULL, HFILL }}, + "ipmi.picmg34.percent", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_percent), 0x7f, NULL, HFILL }}, { &hf_ipmi_picmg_35_rollback_override, { "Rollback Override Policy", @@ -3412,7 +3412,7 @@ proto_register_ipmi_picmg(void) { &hf_ipmi_picmg_37_percent, { "Estimated percentage complete", - "ipmi.picmg37.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, NULL, HFILL }}, + "ipmi.picmg37.percent", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_percent), 0x7f, NULL, HFILL }}, { &hf_ipmi_picmg_hpm_id, { "HPM.x Identifier", @@ -3594,7 +3594,7 @@ proto_register_ipmi_picmg(void) "ipmi.picmg.pwr.control", FT_UINT8, BASE_DEC, VALS(picmg_24_controls), 0, NULL, HFILL }}, { &hf_ipmi_picmg_24_current, { "Power Channel Current Limit", - "ipmi.picmg.pwr.limit", FT_UINT8, BASE_CUSTOM, fmt_power_amps, 0, NULL, HFILL }}, + "ipmi.picmg.pwr.limit", FT_UINT8, BASE_CUSTOM, CF_FUNC(fmt_power_amps), 0, NULL, HFILL }}, { &hf_ipmi_picmg_24_primary_pm, { "Primary PM", "ipmi.picmg.primary.pm", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3662,7 +3662,7 @@ proto_register_ipmi_picmg(void) "ipmi.picmg26.pm.hly", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_ipmi_picmg_28_timeout, { "Time-out", - "ipmi.picmg28.timeout", FT_UINT8, BASE_CUSTOM, fmt_100ms, 0, NULL, HFILL }}, + "ipmi.picmg28.timeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(fmt_100ms), 0, NULL, HFILL }}, { &hf_ipmi_picmg_28_rq_byte3, { "Flags", "ipmi.picmg28.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index b2523b4808..b980567172 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -2945,10 +2945,10 @@ proto_register_ipmi_se(void) "ipmi.cp02.alert", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_ipmi_se_cp03_startup, { "PEF Startup delay", - "ipmi.cp03.startup", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.cp03.startup", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_se_cp04_alert_startup, { "PEF Alert Startup delay", - "ipmi.cp04.alert_startup", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.cp04.alert_startup", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_se_cp05_num_evfilters, { "Number of Event Filters", "ipmi.cp05.num_evfilters", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }}, @@ -3019,7 +3019,7 @@ proto_register_ipmi_se(void) "ipmi.cp15.delayed", FT_BOOLEAN, 8, TFS(&cp15_imm_delay_tfs), 0x10, NULL, HFILL }}, { &hf_ipmi_se_cp15_channel, { "Channel", - "ipmi.cp15.channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.cp15.channel", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_se_cp15_group, { "Group ID", "ipmi.cp15.group_id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3052,7 +3052,7 @@ proto_register_ipmi_se(void) { &hf_ipmi_se_10_pef_version, { "PEF Version", - "ipmi.se10.pef_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + "ipmi.se10.pef_version", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_ipmi_se_10_action_oem_filter, { "OEM Event Record Filtering supported", "ipmi.se10.action.oem_filter", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, @@ -3145,7 +3145,7 @@ proto_register_ipmi_se(void) { &hf_ipmi_se_16_chan, { "Channel", - "ipmi.se16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.se16.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_se_16_op, { "Operation", "ipmi.se16.op", FT_UINT8, BASE_HEX, VALS(vals_16_op), 0xc0, NULL, HFILL }}, @@ -3555,7 +3555,7 @@ proto_register_ipmi_se(void) { &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 }}, { &hf_ipmi_se_19_power_state, { "Power state at time of request", "ipmi.se19.power_state", FT_UINT8, BASE_HEX, VALS(ssoff_22), 0x0, NULL, HFILL }}, { &hf_ipmi_se_1d_restart_cause, { "Restart cause", "ipmi.se1d.restart_cause", FT_UINT8, BASE_HEX, VALS(ssi_1d_2_cause_vals), 0x0F, NULL, HFILL }}, - { &hf_ipmi_se_1d_channel, { "Channel", "ipmi.se1d.channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0, NULL, HFILL }}, + { &hf_ipmi_se_1d_channel, { "Channel", "ipmi.se1d.channel", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0, NULL, HFILL }}, { &hf_ipmi_se_21_slot_connector_type, { "Slot/connector type", "ipmi.se21.slot_connector_type", FT_UINT8, BASE_HEX, VALS(ssi_21_2_type_vals), 0x0, NULL, HFILL }}, { &hf_ipmi_se_21_slot_connector, { "Slot/connector #", "ipmi.se21.slot_connector", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &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 }}, @@ -3568,14 +3568,14 @@ proto_register_ipmi_se(void) { &hf_ipmi_se_28_i2c_slave_address, { "I2C Slave Address", "ipmi.se28.i2c_slave_address", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ipmi_se_2a_user_id, { "User ID", "ipmi.se2a.user_id", FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL }}, { &hf_ipmi_se_2a_session_deactivated_by, { "Session deactivated by", "ipmi.se2a.session_deactivated_by", FT_UINT8, BASE_HEX, VALS(ssi_2a_3_deact_vals), 0x30, NULL, HFILL }}, - { &hf_ipmi_se_2a_channel, { "Channel", "ipmi.se2a.channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0F, NULL, HFILL }}, + { &hf_ipmi_se_2a_channel, { "Channel", "ipmi.se2a.channel", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0F, NULL, HFILL }}, { &hf_ipmi_se_2b_version_change_type, { "Version change type", "ipmi.se2b.version_change_type", FT_UINT8, BASE_DEC, VALS(ssi_2b_2_vctype_vals), 0x0, NULL, HFILL }}, { &hf_ipmi_se_2c_cause, { "Cause", "ipmi.se2c.cause", FT_UINT8, BASE_HEX, VALS(ssi_2c_2_cause_vals), 0xF0, NULL, HFILL }}, { &hf_ipmi_se_2c_previous_state, { "Previous state", "ipmi.se2c.previous_state", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }}, { &hf_ipmi_se_f0_cause, { "Cause", "ipmi.sef0.cause", FT_UINT8, BASE_HEX, VALS(ssi_f0_2_cause_vals), 0xF0, NULL, HFILL }}, { &hf_ipmi_se_f0_previous_state, { "Previous state", "ipmi.sef0.previous_state", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }}, { &hf_ipmi_se_f0_fru_id, { "FRU Id", "ipmi.sef0.fru_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ipmi_se_f1_channel, { "Channel", "ipmi.sef1.channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0xF0, NULL, HFILL }}, + { &hf_ipmi_se_f1_channel, { "Channel", "ipmi.sef1.channel", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0xF0, NULL, HFILL }}, { &hf_ipmi_se_f1_ipmb_b_override_state, { "IPMB-B Override state", "ipmi.sef1.ipmb_b_override_state", FT_BOOLEAN, 8, TFS(&tfs_f1_3_override_state), 0x80, NULL, HFILL }}, { &hf_ipmi_se_f1_ipmb_b_local_status, { "IPMB-B Local status", "ipmi.sef1.ipmb_b_local_status", FT_UINT8, BASE_HEX, VALS(ssi_f1_3_status_vals), 0x70, NULL, HFILL }}, { &hf_ipmi_se_f1_ipmb_a_override_state, { "IPMB-A Override state", "ipmi.sef1.ipmb_a_override_state", FT_BOOLEAN, 8, TFS(&tfs_f1_3_override_state), 0x08, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index cf674c0f5f..9fb8eec432 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -789,7 +789,7 @@ proto_register_ipmi_storage(void) { &hf_ipmi_stor_20_sdr_version, { "SDR Version", - "ipmi.st20.sdr_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + "ipmi.st20.sdr_version", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_ipmi_stor_20_rec_count, { "Record Count", "ipmi.st20.rec_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -929,7 +929,7 @@ proto_register_ipmi_storage(void) { &hf_ipmi_stor_40_sel_version, { "SEL Version", - "ipmi.st40.sel_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + "ipmi.st40.sel_version", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_ipmi_stor_40_entries, { "Entries", "ipmi.st40.rec_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 8de6dce843..83268c0728 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -2225,11 +2225,11 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_lan08_rmcp_port, { "Primary RMCP Port Number", - "ipmi.lan08.rmcp_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }}, + "ipmi.lan08.rmcp_port", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipmi_fmt_udpport), 0, NULL, HFILL }}, { &hf_ipmi_trn_lan09_rmcp_port, { "Secondary RMCP Port Number", - "ipmi.lan09.rmcp_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }}, + "ipmi.lan09.rmcp_port", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipmi_fmt_udpport), 0, NULL, HFILL }}, { &hf_ipmi_trn_lan10_responses, { "ARP responses", @@ -2240,7 +2240,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_lan11_arp_interval, { "Gratuitous ARP interval", - "ipmi.lan10.arp_interval", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0, NULL, HFILL }}, + "ipmi.lan10.arp_interval", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_500ms_0based), 0, NULL, HFILL }}, { &hf_ipmi_trn_lan12_def_gw_ip, { "Default Gateway Address", @@ -2277,7 +2277,7 @@ proto_register_ipmi_transport(void) "ipmi.lan18.dst_type", FT_UINT8, BASE_HEX, VALS(lan18_dst_type_vals), 0x07, NULL, HFILL }}, { &hf_ipmi_trn_lan18_tout, { "Timeout/Retry Interval", - "ipmi.lan18.tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, NULL, HFILL }}, + "ipmi.lan18.tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_0based), 0, NULL, HFILL }}, { &hf_ipmi_trn_lan18_retries, { "Retries", "ipmi.lan18.retries", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL }}, @@ -2361,7 +2361,7 @@ proto_register_ipmi_transport(void) "ipmi.serial03.basic", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }}, { &hf_ipmi_trn_serial04_timeout, { "Session Inactivity Timeout", - "ipmi.serial04.timeout", FT_UINT8, BASE_CUSTOM, serial04_timeout_fmt, 0x0f, NULL, HFILL }}, + "ipmi.serial04.timeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(serial04_timeout_fmt), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_serial05_cbcp_callback, { "CBCP Callback", "ipmi.serial05.cbcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }}, @@ -2439,10 +2439,10 @@ proto_register_ipmi_transport(void) "ipmi.serial08.ping_retry", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }}, { &hf_ipmi_trn_serial09_ring_duration, { "Ring Duration", - "ipmi.serial09.ring_duration", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_1based, 0x3f, NULL, HFILL }}, + "ipmi.serial09.ring_duration", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_500ms_1based), 0x3f, NULL, HFILL }}, { &hf_ipmi_trn_serial09_ring_dead, { "Ring Dead Time", - "ipmi.serial09.ring_dead", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0x0f, NULL, HFILL }}, + "ipmi.serial09.ring_dead", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_500ms_0based), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_serial10_set_sel, { "Set selector (16-byte block #)", "ipmi.serial10.set_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2489,7 +2489,7 @@ proto_register_ipmi_transport(void) "ipmi.serial17.call_retries", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL }}, { &hf_ipmi_trn_serial17_alert_ack_timeout, { "Alert Acknowledge Timeout", - "ipmi.serial17.alert_ack_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, NULL, HFILL }}, + "ipmi.serial17.alert_ack_timeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_0based), 0, NULL, HFILL }}, { &hf_ipmi_trn_serial17_dialstr_sel, { "Dial String Selector", "ipmi.serial17.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }}, @@ -2588,22 +2588,22 @@ proto_register_ipmi_transport(void) "ipmi.serial28.ctrl_esc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_ipmi_trn_serial28_t2, { "TAP T2", - "ipmi.serial28.tap_t2", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0xf0, NULL, HFILL }}, + "ipmi.serial28.tap_t2", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_500ms_0based), 0xf0, NULL, HFILL }}, { &hf_ipmi_trn_serial28_t1, { "TAP T1", - "ipmi.serial28.tap_t1", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0x0f, NULL, HFILL }}, + "ipmi.serial28.tap_t1", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_0based), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_serial28_t4, { "TAP T4", - "ipmi.serial28.tap_t4", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0xf0, NULL, HFILL }}, + "ipmi.serial28.tap_t4", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_0based), 0xf0, NULL, HFILL }}, { &hf_ipmi_trn_serial28_t3, { "TAP T3", - "ipmi.serial28.tap_t3", FT_UINT8, BASE_CUSTOM, ipmi_fmt_2s_0based, 0x0f, NULL, HFILL }}, + "ipmi.serial28.tap_t3", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_2s_0based), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_serial28_t6, { "IPMI T6", - "ipmi.serial28.ipmi_t6", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0xf0, NULL, HFILL }}, + "ipmi.serial28.ipmi_t6", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_0based), 0xf0, NULL, HFILL }}, { &hf_ipmi_trn_serial28_t5, { "TAP T5", - "ipmi.serial28.tap_t5", FT_UINT8, BASE_CUSTOM, ipmi_fmt_2s_0based, 0x0f, NULL, HFILL }}, + "ipmi.serial28.tap_t5", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_2s_0based), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_serial28_n2, { "TAP N2", "ipmi.serial28.tap_n2", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }}, @@ -2669,10 +2669,10 @@ proto_register_ipmi_transport(void) "ipmi.serial30.proto_comp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }}, { &hf_ipmi_trn_serial31_port, { "Primary RMCP Port Number", - "ipmi.serial31.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }}, + "ipmi.serial31.port", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipmi_fmt_udpport), 0, NULL, HFILL }}, { &hf_ipmi_trn_serial32_port, { "Secondary RMCP Port Number", - "ipmi.serial32.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }}, + "ipmi.serial32.port", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipmi_fmt_udpport), 0, NULL, HFILL }}, { &hf_ipmi_trn_serial33_auth_proto, { "PPP Link Authentication Protocol", "ipmi.serial33.auth_proto", FT_UINT8, BASE_HEX, VALS(serialXX_proto_vals), 0x0f, NULL, HFILL }}, @@ -2732,7 +2732,7 @@ proto_register_ipmi_transport(void) "ipmi.serial44.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ipmi_trn_serial44_hold_time, { "Connection Hold Time", - "ipmi.serial44.hold_time", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }}, + "ipmi.serial44.hold_time", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }}, { &hf_ipmi_trn_serial45_src_ipaddr, { "Source IP Address", "ipmi.serial45.src_ipaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2774,7 +2774,7 @@ proto_register_ipmi_transport(void) "ipmi.serial51.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ipmi_trn_serial51_ipmi_channel, { "IPMI Channel", - "ipmi.serial51.ipmi_channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0xf0, NULL, HFILL }}, + "ipmi.serial51.ipmi_channel", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0xf0, NULL, HFILL }}, { &hf_ipmi_trn_serial51_conn_num, { "Connector number", "ipmi.serial51.conn_num", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }}, @@ -2802,7 +2802,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_01_chan, { "Channel", - "ipmi.tr01.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr01.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_01_param, { "Parameter Selector", "ipmi.tr01.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2815,7 +2815,7 @@ proto_register_ipmi_transport(void) "ipmi.tr02.getrev", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_ipmi_trn_02_chan, { "Channel", - "ipmi.tr02.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr02.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_02_param, { "Parameter selector", "ipmi.tr02.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2837,7 +2837,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_03_chan, { "Channel", - "ipmi.tr03.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr03.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_03_arp_resp, { "BMC-generated ARP responses", "ipmi.tr03.arp_resp", FT_BOOLEAN, 8, TFS(&tfs_03_suspend), 0x02, NULL, HFILL }}, @@ -2853,7 +2853,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_04_chan, { "Channel", - "ipmi.tr04.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr04.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_04_clear, { "Statistics", "ipmi.tr04.clear", FT_BOOLEAN, 8, TFS(&tfs_04_clear), 0x01, NULL, HFILL }}, @@ -2887,7 +2887,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_10_chan, { "Channel", - "ipmi.tr10.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr10.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_10_param, { "Parameter Selector", "ipmi.tr10.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2900,7 +2900,7 @@ proto_register_ipmi_transport(void) "ipmi.tr11.getrev", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_ipmi_trn_11_chan, { "Channel", - "ipmi.tr11.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr11.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_11_param, { "Parameter selector", "ipmi.tr11.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2922,7 +2922,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_12_chan, { "Channel", - "ipmi.tr12.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr12.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_12_mux_setting, { "Mux Setting", "ipmi.tr12.mux_setting", FT_UINT8, BASE_HEX, VALS(vals_12_mux), 0x0f, NULL, HFILL }}, @@ -2947,7 +2947,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_13_chan, { "Channel", - "ipmi.tr13.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr13.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_13_code1, { "Last code", "ipmi.tr13.code1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2966,7 +2966,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_14_chan, { "Channel", - "ipmi.tr14.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr14.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_14_block, { "Block number", "ipmi.tr14.block", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2976,7 +2976,7 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_15_chan, { "Channel", - "ipmi.tr15.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr15.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_15_block, { "Block number", "ipmi.tr15.block", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2986,13 +2986,13 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_16_chan, { "Channel", - "ipmi.tr16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr16.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_16_src_port, { "Source Port", - "ipmi.tr16.src_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }}, + "ipmi.tr16.src_port", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipmi_fmt_udpport), 0, NULL, HFILL }}, { &hf_ipmi_trn_16_dst_port, { "Destination Port", - "ipmi.tr16.dst_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }}, + "ipmi.tr16.dst_port", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipmi_fmt_udpport), 0, NULL, HFILL }}, { &hf_ipmi_trn_16_src_addr, { "Source IP Address", "ipmi.tr16.src_addr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3005,13 +3005,13 @@ proto_register_ipmi_transport(void) { &hf_ipmi_trn_17_chan, { "Channel", - "ipmi.tr17.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr17.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_17_clear, { "Clear buffer", "ipmi.tr17.clear", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_ipmi_trn_17_block_num, { "Block number", - "ipmi.tr17.block_num", FT_UINT8, BASE_CUSTOM, tr17_fmt_blockno, 0x7f, NULL, HFILL }}, + "ipmi.tr17.block_num", FT_UINT8, BASE_CUSTOM, CF_FUNC(tr17_fmt_blockno), 0x7f, NULL, HFILL }}, { &hf_ipmi_trn_17_size, { "Number of received bytes", "ipmi.tr17.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3024,11 +3024,11 @@ proto_register_ipmi_transport(void) "ipmi.tr18.state", FT_UINT8, BASE_HEX, VALS(vals_18_state), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_18_ipmi_ver, { "IPMI Version", - "ipmi.tr18.ipmi_ver", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + "ipmi.tr18.ipmi_ver", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_ipmi_trn_19_chan, { "Channel", - "ipmi.tr19.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr19.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_19_dest_sel, { "Destination selector", "ipmi.tr19.dest_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }}, @@ -3066,14 +3066,14 @@ proto_register_ipmi_transport(void) "ipmi.tr1a.user", FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL }}, { &hf_ipmi_trn_1a_chan, { "Channel", - "ipmi.tr1a.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr1a.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, { &hf_ipmi_trn_1b_user, { "User ID", "ipmi.tr1b.user", FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL }}, { &hf_ipmi_trn_1b_chan, { "Channel", - "ipmi.tr1b.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }}, + "ipmi.tr1b.chan", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_channel), 0x0f, NULL, HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-ipmi-vita.c b/epan/dissectors/packet-ipmi-vita.c index dad2a30d4b..8b127b47c1 100644 --- a/epan/dissectors/packet-ipmi-vita.c +++ b/epan/dissectors/packet-ipmi-vita.c @@ -455,7 +455,7 @@ static hf_register_info hf_ipmi_vita[] = { FT_UINT8, BASE_HEX, VALS(str_vita_vso_std), 0x3, NULL, HFILL }}, { &hf_vita_rev, { "VSO Specification Revision", "ipmi.vita.vso.rev", - FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }}, + FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }}, { &hf_vita_max_fruid, { "Max FRU Device ID", "ipmi.vita.max.fruid", FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 0236b60fcc..4ca6415b6d 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -684,7 +684,7 @@ proto_register_ipp(void) NULL, 0, NULL, HFILL }}, /* Generated from convert_proto_tree_add_text.pl */ - { &hf_ipp_version, { "Version", "ipp.version", FT_UINT16, BASE_CUSTOM, ipp_fmt_version, 0x0, NULL, HFILL }}, + { &hf_ipp_version, { "Version", "ipp.version", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipp_fmt_version), 0x0, NULL, HFILL }}, { &hf_ipp_operation_id, { "Operation-id", "ipp.operation_id", FT_UINT16, BASE_HEX, VALS(operation_vals), 0x0, NULL, HFILL }}, { &hf_ipp_status_code, { "Status-code", "ipp.status_code", FT_UINT16, BASE_HEX, VALS(status_vals), 0x0, NULL, HFILL }}, { &hf_ipp_request_id, { "Request ID", "ipp.request_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index 4fbe1017ae..10c8a7860c 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -319,11 +319,11 @@ void proto_register_j1939(void) }, { &hf_j1939_src_addr, {"Source Address", "j1939.src_addr", - FT_UINT32, BASE_CUSTOM, j1939_fmt_address, 0x000000FF, NULL, HFILL } + FT_UINT32, BASE_CUSTOM, CF_FUNC(j1939_fmt_address), 0x000000FF, NULL, HFILL } }, { &hf_j1939_dst_addr, {"Destination Address", "j1939.dst_addr", - FT_UINT32, BASE_CUSTOM, j1939_fmt_address, 0x0000FF00, NULL, HFILL } + FT_UINT32, BASE_CUSTOM, CF_FUNC(j1939_fmt_address), 0x0000FF00, NULL, HFILL } }, { &hf_j1939_group_extension, {"Group Extension", "j1939.group_extension", diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 76cbfee86d..39c37bf91b 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -875,7 +875,7 @@ proto_register_kink(void) { NULL, HFILL }}, { &hf_kink_version, { "Version", "kink.version", - FT_UINT8, BASE_CUSTOM, kink_fmt_version, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(kink_fmt_version), 0x0, NULL, HFILL }}, { &hf_kink_domain_of_interpretation, { "Domain Of Interpretation", "kink.domain_of_interpretation", @@ -883,7 +883,7 @@ proto_register_kink(void) { NULL, HFILL }}, { &hf_kink_qmversion, { "QMVersion", "kink.qmversion", - FT_UINT8, BASE_CUSTOM, kink_fmt_version, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(kink_fmt_version), 0x0, NULL, HFILL }}, { &hf_kink_error_code, { "ErrorCode", "kink.error_code", diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index a38ceb05e8..ebc9d24f0a 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -760,7 +760,7 @@ proto_register_llc(void) { &hf_llc_dsap_sap, { "SAP", "llc.dsap.sap", FT_UINT8, BASE_CUSTOM, - llc_sap_value, 0xFE, "Service Access Point", HFILL }}, + CF_FUNC(llc_sap_value), 0xFE, "Service Access Point", HFILL }}, { &hf_llc_dsap_ig, { "IG Bit", "llc.dsap.ig", FT_BOOLEAN, 8, @@ -772,7 +772,7 @@ proto_register_llc(void) { &hf_llc_ssap_sap, { "SAP", "llc.ssap.sap", FT_UINT8, BASE_CUSTOM, - llc_sap_value, 0xFE, "Service Access Point", HFILL }}, + CF_FUNC(llc_sap_value), 0xFE, "Service Access Point", HFILL }}, { &hf_llc_ssap_cr, { "CR Bit", "llc.ssap.cr", FT_BOOLEAN, 8, diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index a071191ffc..95c3f45ad4 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -4435,11 +4435,11 @@ proto_register_lldp(void) }, { &hf_ieee_802_3_mdi_requested_power, { "PD Requested Power Value", "lldp.ieee.802_3.mdi_pde_requested", FT_UINT16, BASE_CUSTOM, - mdi_power_base, 0, NULL, HFILL } + CF_FUNC(mdi_power_base), 0, NULL, HFILL } }, { &hf_ieee_802_3_mdi_allocated_power, { "PSE Allocated Power Value", "lldp.ieee.802_3.mdi_pse_allocated", FT_UINT16, BASE_CUSTOM, - mdi_power_base, 0, NULL, HFILL } + CF_FUNC(mdi_power_base), 0, NULL, HFILL } }, { &hf_ieee_802_3_aggregation_status, { "Aggregation Status", "lldp.ieee.802_3.aggregation_status", FT_UINT8, BASE_HEX, @@ -4595,7 +4595,7 @@ proto_register_lldp(void) }, { &hf_media_loc_lat, { "Latitude", "lldp.media.loc.latitude", FT_UINT64, BASE_CUSTOM, - latitude_base, 0x0, NULL, HFILL } + CF_FUNC(latitude_base), 0x0, NULL, HFILL } }, { &hf_media_loc_long_resolution, { "Longitude Resolution", "lldp.media.loc.long_resolution", FT_UINT8, BASE_DEC, @@ -4603,7 +4603,7 @@ proto_register_lldp(void) }, { &hf_media_loc_long, { "Longitude", "lldp.media.loc.longitude", FT_UINT64, BASE_CUSTOM, - longitude_base, 0x0, NULL, HFILL } + CF_FUNC(longitude_base), 0x0, NULL, HFILL } }, { &hf_media_loc_alt_type, { "Altitude Type", "lldp.media.loc.alt_type", FT_UINT8, BASE_DEC, @@ -4663,7 +4663,7 @@ proto_register_lldp(void) }, { &hf_media_power_value, { "Power Value", "lldp.media.power.value", FT_UINT16, BASE_CUSTOM, - media_power_base, 0x0, NULL, HFILL } + CF_FUNC(media_power_base), 0x0, NULL, HFILL } }, { &hf_media_hardware, { "Hardware Revision", "lldp.media.hardware", FT_STRINGZPAD, BASE_NONE, diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index a5a3c86605..dec06f0284 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -983,7 +983,7 @@ static int hf_lpp_T_requestedMeasurements_ueRxTxReq = -1; static int hf_lpp_T_ecid_MeasSupported_rsrpSup = -1; static int hf_lpp_T_ecid_MeasSupported_rsrqSup = -1; static int hf_lpp_T_ecid_MeasSupported_ueRxTxSup = -1; -static int hf_lpp_dummy_eag_field = -1; /* never registered */ +static int dummy_hf_lpp_eag_field = -1; /* never registered */ /*--- End of included file: packet-lpp-hf.c ---*/ #line 49 "../../asn1/lpp/packet-lpp-template.c" @@ -4056,7 +4056,7 @@ static const per_sequence_t GNSS_GenericAssistDataSupportElement_sequence[] = { { &hf_lpp_gnss_AlmanacSupport, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_AlmanacSupport }, { &hf_lpp_gnss_UTC_ModelSupport, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_UTC_ModelSupport }, { &hf_lpp_gnss_AuxiliaryInformationSupport, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_AuxiliaryInformationSupport }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_GenericAssistDataSupportElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_GenericAssistDataSupportElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -5112,7 +5112,7 @@ static const per_sequence_t GNSS_GenericAssistDataReqElement_sequence[] = { { &hf_lpp_gnss_AlmanacReq , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_AlmanacReq }, { &hf_lpp_gnss_UTCModelReq, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_UTC_ModelReq }, { &hf_lpp_gnss_AuxiliaryInformationReq, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_AuxiliaryInformationReq }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_GenericAssistDataReqElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_GenericAssistDataReqElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -5596,7 +5596,7 @@ static const per_sequence_t T_eUTRA_sequence[] = { { &hf_lpp_physCellId , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_0_503 }, { &hf_lpp_cellGlobalIdEUTRA, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_CellGlobalIdEUTRA_AndUTRA }, { &hf_lpp_earfcn , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_ARFCN_ValueEUTRA }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_T_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_T_eag_1 }, { NULL, 0, 0, NULL } }; @@ -7235,7 +7235,7 @@ static const per_sequence_t GNSS_NavModelSatelliteElement_sequence[] = { { &hf_lpp_iod , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_BIT_STRING_SIZE_11 }, { &hf_lpp_gnss_ClockModel , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_ClockModel }, { &hf_lpp_gnss_OrbitModel , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_OrbitModel }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_NavModelSatelliteElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_NavModelSatelliteElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -7993,7 +7993,7 @@ static const per_sequence_t GNSS_Almanac_sequence[] = { { &hf_lpp_ioda , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_INTEGER_0_3 }, { &hf_lpp_completeAlmanacProvided, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_BOOLEAN }, { &hf_lpp_gnss_AlmanacList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_AlmanacList }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_Almanac_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_Almanac_eag_1 }, { NULL, 0, 0, NULL } }; @@ -8712,7 +8712,7 @@ static const per_sequence_t GNSS_GenericAssistDataElement_sequence[] = { { &hf_lpp_gnss_Almanac , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_Almanac }, { &hf_lpp_gnss_UTC_Model , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_UTC_Model }, { &hf_lpp_gnss_AuxiliaryInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_GNSS_AuxiliaryInformation }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_GenericAssistDataElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_GNSS_GenericAssistDataElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -8987,7 +8987,7 @@ static const per_sequence_t OTDOA_ReferenceCellInfo_sequence[] = { { &hf_lpp_antennaPortConfig, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_T_antennaPortConfig }, { &hf_lpp_cpLength , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_T_cpLength }, { &hf_lpp_prsInfo , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_PRS_Info }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_ReferenceCellInfo_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_ReferenceCellInfo_eag_1 }, { NULL, 0, 0, NULL } }; @@ -9076,7 +9076,7 @@ static const per_sequence_t OTDOA_NeighbourCellInfoElement_sequence[] = { { &hf_lpp_prs_SubframeOffset, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_INTEGER_0_1279 }, { &hf_lpp_expectedRSTD , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_0_16383 }, { &hf_lpp_expectedRSTD_Uncertainty, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_0_1023 }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_NeighbourCellInfoElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_NeighbourCellInfoElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -9532,7 +9532,7 @@ dissect_lpp_ResponseTime_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static const per_sequence_t ResponseTime_sequence[] = { { &hf_lpp_time , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_T_time }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_ResponseTime_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_ResponseTime_eag_1 }, { NULL, 0, 0, NULL } }; @@ -10395,7 +10395,7 @@ static const per_sequence_t CommonIEsProvideLocationInformation_sequence[] = { { &hf_lpp_locationEstimate, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_LocationCoordinates }, { &hf_lpp_velocityEstimate, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_Velocity }, { &hf_lpp_locationError , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_LocationError }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_CommonIEsProvideLocationInformation_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_CommonIEsProvideLocationInformation_eag_1 }, { NULL, 0, 0, NULL } }; @@ -10932,7 +10932,7 @@ static const per_sequence_t NeighbourMeasurementElement_sequence[] = { { &hf_lpp_earfcnNeighbour , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_ARFCN_ValueEUTRA }, { &hf_lpp_rstd , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_INTEGER_0_12711 }, { &hf_lpp_rstd_Quality , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_MeasQuality }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_NeighbourMeasurementElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_NeighbourMeasurementElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -10979,7 +10979,7 @@ static const per_sequence_t OTDOA_SignalMeasurementInformation_sequence[] = { { &hf_lpp_earfcnRef , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_ARFCN_ValueEUTRA }, { &hf_lpp_referenceQuality, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_OTDOA_MeasQuality }, { &hf_lpp_neighbourMeasurementList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_NeighbourMeasurementList }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_SignalMeasurementInformation_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_OTDOA_SignalMeasurementInformation_eag_1 }, { NULL, 0, 0, NULL } }; @@ -11048,7 +11048,7 @@ static const per_sequence_t MeasuredResultsElement_sequence[] = { { &hf_lpp_rsrp_Result , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_INTEGER_0_97 }, { &hf_lpp_rsrq_Result , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_INTEGER_0_34 }, { &hf_lpp_ue_RxTxTimeDiff , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lpp_INTEGER_0_4095 }, - { &hf_lpp_dummy_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_MeasuredResultsElement_eag_1 }, + { &dummy_hf_lpp_eag_field , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lpp_MeasuredResultsElement_eag_1 }, { NULL, 0, 0, NULL } }; @@ -12167,11 +12167,11 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_degreesLatitude, { "degreesLatitude", "lpp.degreesLatitude", - FT_UINT32, BASE_CUSTOM, &lpp_degreesLatitude_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_degreesLatitude_fmt), 0, "INTEGER_0_8388607", HFILL }}, { &hf_lpp_degreesLongitude, { "degreesLongitude", "lpp.degreesLongitude", - FT_INT32, BASE_CUSTOM, &lpp_degreesLongitude_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_degreesLongitude_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_latitudeSign_01, { "latitudeSign", "lpp.latitudeSign", @@ -12179,7 +12179,7 @@ void proto_register_lpp(void) { "T_latitudeSign_01", HFILL }}, { &hf_lpp_uncertainty, { "uncertainty", "lpp.uncertainty", - FT_UINT32, BASE_CUSTOM, &lpp_uncertainty_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_uncertainty_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_latitudeSign_02, { "latitudeSign", "lpp.latitudeSign", @@ -12187,19 +12187,19 @@ void proto_register_lpp(void) { "T_latitudeSign_02", HFILL }}, { &hf_lpp_uncertaintySemiMajor, { "uncertaintySemiMajor", "lpp.uncertaintySemiMajor", - FT_UINT32, BASE_CUSTOM, &lpp_uncertainty_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_uncertainty_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_uncertaintySemiMinor, { "uncertaintySemiMinor", "lpp.uncertaintySemiMinor", - FT_UINT32, BASE_CUSTOM, &lpp_uncertainty_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_uncertainty_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_orientationMajorAxis, { "orientationMajorAxis", "lpp.orientationMajorAxis", - FT_UINT32, BASE_CUSTOM, &lpp_angle_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_angle_fmt), 0, "INTEGER_0_179", HFILL }}, { &hf_lpp_confidence, { "confidence", "lpp.confidence", - FT_UINT32, BASE_CUSTOM, &lpp_confidence_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_confidence_fmt), 0, "INTEGER_0_100", HFILL }}, { &hf_lpp_latitudeSign_03, { "latitudeSign", "lpp.latitudeSign", @@ -12211,7 +12211,7 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_altitude, { "altitude", "lpp.altitude", - FT_UINT32, BASE_CUSTOM, &lpp_altitude_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_altitude_fmt), 0, "INTEGER_0_32767", HFILL }}, { &hf_lpp_latitudeSign_04, { "latitudeSign", "lpp.latitudeSign", @@ -12223,7 +12223,7 @@ void proto_register_lpp(void) { "T_altitudeDirection_01", HFILL }}, { &hf_lpp_uncertaintyAltitude, { "uncertaintyAltitude", "lpp.uncertaintyAltitude", - FT_UINT32, BASE_CUSTOM, &lpp_uncertaintyAltitude_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_uncertaintyAltitude_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_latitudeSign_05, { "latitudeSign", "lpp.latitudeSign", @@ -12231,19 +12231,19 @@ void proto_register_lpp(void) { "T_latitudeSign_05", HFILL }}, { &hf_lpp_innerRadius, { "innerRadius", "lpp.innerRadius", - FT_UINT32, BASE_CUSTOM, &lpp_radius_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_radius_fmt), 0, "INTEGER_0_65535", HFILL }}, { &hf_lpp_uncertaintyRadius, { "uncertaintyRadius", "lpp.uncertaintyRadius", - FT_UINT32, BASE_CUSTOM, &lpp_uncertainty_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_uncertainty_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_offsetAngle, { "offsetAngle", "lpp.offsetAngle", - FT_UINT32, BASE_CUSTOM, &lpp_angle_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_angle_fmt), 0, "INTEGER_0_179", HFILL }}, { &hf_lpp_includedAngle, { "includedAngle", "lpp.includedAngle", - FT_UINT32, BASE_CUSTOM, &lpp_angle_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_angle_fmt), 0, "INTEGER_0_179", HFILL }}, { &hf_lpp_EPDU_Sequence_item, { "EPDU", "lpp.EPDU_element", @@ -12455,7 +12455,7 @@ void proto_register_lpp(void) { "BOOLEAN", HFILL }}, { &hf_lpp_accuracy, { "accuracy", "lpp.accuracy", - FT_UINT32, BASE_CUSTOM, &lpp_uncertainty_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_uncertainty_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_time, { "time", "lpp.time", @@ -12639,11 +12639,11 @@ void proto_register_lpp(void) { "INTEGER_0_1279", HFILL }}, { &hf_lpp_expectedRSTD, { "expectedRSTD", "lpp.expectedRSTD", - FT_UINT32, BASE_CUSTOM, &lpp_expectedRSTD_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_expectedRSTD_fmt), 0, "INTEGER_0_16383", HFILL }}, { &hf_lpp_expectedRSTD_Uncertainty, { "expectedRSTD-Uncertainty", "lpp.expectedRSTD_Uncertainty", - FT_UINT32, BASE_CUSTOM, &lpp_expectedRSTD_Uncertainty_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_expectedRSTD_Uncertainty_fmt), 0, "INTEGER_0_1023", HFILL }}, { &hf_lpp_earfcn_v9a0, { "earfcn-v9a0", "lpp.earfcn_v9a0", @@ -12691,7 +12691,7 @@ void proto_register_lpp(void) { "ARFCN_ValueEUTRA", HFILL }}, { &hf_lpp_rstd, { "rstd", "lpp.rstd", - FT_UINT32, BASE_CUSTOM, &lpp_rstd_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_rstd_fmt), 0, "INTEGER_0_12711", HFILL }}, { &hf_lpp_rstd_Quality, { "rstd-Quality", "lpp.rstd_Quality_element", @@ -12859,7 +12859,7 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_referenceTimeUnc, { "referenceTimeUnc", "lpp.referenceTimeUnc", - FT_UINT32, BASE_CUSTOM, &lpp_referenceTimeUnc_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_referenceTimeUnc_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_gnss_ReferenceTimeForCells, { "gnss-ReferenceTimeForCells", "lpp.gnss_ReferenceTimeForCells", @@ -12931,11 +12931,11 @@ void proto_register_lpp(void) { "INTEGER_0_12533", HFILL }}, { &hf_lpp_fractionalSecondsFromFrameStructureStart, { "fractionalSecondsFromFrameStructureStart", "lpp.fractionalSecondsFromFrameStructureStart", - FT_UINT32, BASE_CUSTOM, &lpp_fractionalSecondsFromFrameStructureStart_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_fractionalSecondsFromFrameStructureStart_fmt), 0, "INTEGER_0_3999999", HFILL }}, { &hf_lpp_frameDrift, { "frameDrift", "lpp.frameDrift", - FT_INT32, BASE_CUSTOM, &lpp_frameDrift_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_frameDrift_fmt), 0, "INTEGER_M64_63", HFILL }}, { &hf_lpp_cellID, { "cellID", "lpp.cellID", @@ -13015,47 +13015,47 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_alfa0, { "alfa0", "lpp.alfa0", - FT_INT32, BASE_CUSTOM, &lpp_alpha0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_alpha0_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_alfa1, { "alfa1", "lpp.alfa1", - FT_INT32, BASE_CUSTOM, &lpp_alpha1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_alpha1_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_alfa2, { "alfa2", "lpp.alfa2", - FT_INT32, BASE_CUSTOM, &lpp_alpha2_3_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_alpha2_3_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_alfa3, { "alfa3", "lpp.alfa3", - FT_INT32, BASE_CUSTOM, &lpp_alpha2_3_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_alpha2_3_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_beta0, { "beta0", "lpp.beta0", - FT_INT32, BASE_CUSTOM, &lpp_beta0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_beta0_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_beta1, { "beta1", "lpp.beta1", - FT_INT32, BASE_CUSTOM, &lpp_beta1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_beta1_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_beta2, { "beta2", "lpp.beta2", - FT_INT32, BASE_CUSTOM, &lpp_beta2_3_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_beta2_3_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_beta3, { "beta3", "lpp.beta3", - FT_INT32, BASE_CUSTOM, &lpp_beta2_3_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_beta2_3_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_ai0, { "ai0", "lpp.ai0", - FT_UINT32, BASE_CUSTOM, &lpp_ai0_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_ai0_fmt), 0, "INTEGER_0_2047", HFILL }}, { &hf_lpp_ai1, { "ai1", "lpp.ai1", - FT_INT32, BASE_CUSTOM, &lpp_ai1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_ai1_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_ai2, { "ai2", "lpp.ai2", - FT_INT32, BASE_CUSTOM, &lpp_ai2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_ai2_fmt), 0, "INTEGER_M8192_8191", HFILL }}, { &hf_lpp_ionoStormFlag1, { "ionoStormFlag1", "lpp.ionoStormFlag1", @@ -13079,31 +13079,31 @@ void proto_register_lpp(void) { "INTEGER_0_1", HFILL }}, { &hf_lpp_teop, { "teop", "lpp.teop", - FT_UINT32, BASE_CUSTOM, &lpp_teop_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_teop_fmt), 0, "INTEGER_0_65535", HFILL }}, { &hf_lpp_pmX, { "pmX", "lpp.pmX", - FT_INT32, BASE_CUSTOM, &lpp_pmX_Y_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_pmX_Y_fmt), 0, "INTEGER_M1048576_1048575", HFILL }}, { &hf_lpp_pmXdot, { "pmXdot", "lpp.pmXdot", - FT_INT32, BASE_CUSTOM, &lpp_pmX_Ydot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_pmX_Ydot_fmt), 0, "INTEGER_M16384_16383", HFILL }}, { &hf_lpp_pmY, { "pmY", "lpp.pmY", - FT_INT32, BASE_CUSTOM, &lpp_pmX_Y_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_pmX_Y_fmt), 0, "INTEGER_M1048576_1048575", HFILL }}, { &hf_lpp_pmYdot, { "pmYdot", "lpp.pmYdot", - FT_INT32, BASE_CUSTOM, &lpp_pmX_Ydot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_pmX_Ydot_fmt), 0, "INTEGER_M16384_16383", HFILL }}, { &hf_lpp_deltaUT1, { "deltaUT1", "lpp.deltaUT1", - FT_INT32, BASE_CUSTOM, &lpp_deltaUT1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_deltaUT1_fmt), 0, "INTEGER_M1073741824_1073741823", HFILL }}, { &hf_lpp_deltaUT1dot, { "deltaUT1dot", "lpp.deltaUT1dot", - FT_INT32, BASE_CUSTOM, &lpp_deltaUT1dot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_deltaUT1dot_fmt), 0, "INTEGER_M262144_262143", HFILL }}, { &hf_lpp_GNSS_TimeModelList_item, { "GNSS-TimeModelElement", "lpp.GNSS_TimeModelElement_element", @@ -13111,19 +13111,19 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_gnss_TimeModelRefTime, { "gnss-TimeModelRefTime", "lpp.gnss_TimeModelRefTime", - FT_UINT32, BASE_CUSTOM, &lpp_gnss_TimeModelRefTime_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_TimeModelRefTime_fmt), 0, "INTEGER_0_65535", HFILL }}, { &hf_lpp_tA0, { "tA0", "lpp.tA0", - FT_INT32, BASE_CUSTOM, &lpp_tA0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tA0_fmt), 0, "INTEGER_M67108864_67108863", HFILL }}, { &hf_lpp_tA1, { "tA1", "lpp.tA1", - FT_INT32, BASE_CUSTOM, &lpp_tA1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tA1_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_tA2, { "tA2", "lpp.tA2", - FT_INT32, BASE_CUSTOM, &lpp_tA2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tA2_fmt), 0, "INTEGER_M64_63", HFILL }}, { &hf_lpp_gnss_TO_ID, { "gnss-TO-ID", "lpp.gnss_TO_ID", @@ -13179,11 +13179,11 @@ void proto_register_lpp(void) { "INTEGER_0_3", HFILL }}, { &hf_lpp_pseudoRangeCor, { "pseudoRangeCor", "lpp.pseudoRangeCor", - FT_INT32, BASE_CUSTOM, &lpp_pseudoRangeCor_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_pseudoRangeCor_fmt), 0, "INTEGER_M2047_2047", HFILL }}, { &hf_lpp_rangeRateCor, { "rangeRateCor", "lpp.rangeRateCor", - FT_INT32, BASE_CUSTOM, &lpp_rangeRateCor_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_rangeRateCor_fmt), 0, "INTEGER_M127_127", HFILL }}, { &hf_lpp_udreGrowthRate, { "udreGrowthRate", "lpp.udreGrowthRate", @@ -13275,27 +13275,27 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_stanClockToc, { "stanClockToc", "lpp.stanClockToc", - FT_UINT32, BASE_CUSTOM, &lpp_stanClockToc_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_stanClockToc_fmt), 0, "INTEGER_0_16383", HFILL }}, { &hf_lpp_stanClockAF2, { "stanClockAF2", "lpp.stanClockAF2", - FT_INT32, BASE_CUSTOM, &lpp_stanClockAF2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_stanClockAF2_fmt), 0, "INTEGER_M32_31", HFILL }}, { &hf_lpp_stanClockAF1, { "stanClockAF1", "lpp.stanClockAF1", - FT_INT32, BASE_CUSTOM, &lpp_stanClockAF1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_stanClockAF1_fmt), 0, "INTEGER_M1048576_1048575", HFILL }}, { &hf_lpp_stanClockAF0, { "stanClockAF0", "lpp.stanClockAF0", - FT_INT32, BASE_CUSTOM, &lpp_stanClockAF0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_stanClockAF0_fmt), 0, "INTEGER_M1073741824_1073741823", HFILL }}, { &hf_lpp_stanClockTgd, { "stanClockTgd", "lpp.stanClockTgd", - FT_INT32, BASE_CUSTOM, &lpp_stanClockTgd_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_stanClockTgd_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_sisa, { "sisa", "lpp.sisa", - FT_UINT32, BASE_CUSTOM, &lpp_sisa_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_sisa_fmt), 0, "INTEGER_0_255", HFILL }}, { &hf_lpp_stanModelID, { "stanModelID", "lpp.stanModelID", @@ -13303,31 +13303,31 @@ void proto_register_lpp(void) { "INTEGER_0_1", HFILL }}, { &hf_lpp_navToc, { "navToc", "lpp.navToc", - FT_UINT32, BASE_CUSTOM, &lpp_navToc_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_navToc_fmt), 0, "INTEGER_0_37799", HFILL }}, { &hf_lpp_navaf2, { "navaf2", "lpp.navaf2", - FT_INT32, BASE_CUSTOM, &lpp_navaf2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navaf2_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_navaf1, { "navaf1", "lpp.navaf1", - FT_INT32, BASE_CUSTOM, &lpp_navaf1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navaf1_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navaf0, { "navaf0", "lpp.navaf0", - FT_INT32, BASE_CUSTOM, &lpp_navaf0_navTgd_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navaf0_navTgd_fmt), 0, "INTEGER_M2097152_2097151", HFILL }}, { &hf_lpp_navTgd, { "navTgd", "lpp.navTgd", - FT_INT32, BASE_CUSTOM, &lpp_navaf0_navTgd_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navaf0_navTgd_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_cnavToc, { "cnavToc", "lpp.cnavToc", - FT_UINT32, BASE_CUSTOM, &lpp_cnavToc_cnavTop_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_cnavToc_cnavTop_fmt), 0, "INTEGER_0_2015", HFILL }}, { &hf_lpp_cnavTop, { "cnavTop", "lpp.cnavTop", - FT_UINT32, BASE_CUSTOM, &lpp_cnavToc_cnavTop_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_cnavToc_cnavTop_fmt), 0, "INTEGER_0_2015", HFILL }}, { &hf_lpp_cnavURA0, { "cnavURA0", "lpp.cnavURA0", @@ -13343,155 +13343,155 @@ void proto_register_lpp(void) { "INTEGER_0_7", HFILL }}, { &hf_lpp_cnavAf2, { "cnavAf2", "lpp.cnavAf2", - FT_INT32, BASE_CUSTOM, &lpp_cnavAf2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavAf2_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_cnavAf1, { "cnavAf1", "lpp.cnavAf1", - FT_INT32, BASE_CUSTOM, &lpp_cnavAf1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavAf1_fmt), 0, "INTEGER_M524288_524287", HFILL }}, { &hf_lpp_cnavAf0, { "cnavAf0", "lpp.cnavAf0", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M33554432_33554431", HFILL }}, { &hf_lpp_cnavTgd, { "cnavTgd", "lpp.cnavTgd", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_cnavISCl1cp, { "cnavISCl1cp", "lpp.cnavISCl1cp", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_cnavISCl1cd, { "cnavISCl1cd", "lpp.cnavISCl1cd", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_cnavISCl1ca, { "cnavISCl1ca", "lpp.cnavISCl1ca", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_cnavISCl2c, { "cnavISCl2c", "lpp.cnavISCl2c", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_cnavISCl5i5, { "cnavISCl5i5", "lpp.cnavISCl5i5", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_cnavISCl5q5, { "cnavISCl5q5", "lpp.cnavISCl5q5", - FT_INT32, BASE_CUSTOM, &lpp_cnavX_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavX_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_gloTau, { "gloTau", "lpp.gloTau", - FT_INT32, BASE_CUSTOM, &lpp_gloTau_gloDeltaTau_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloTau_gloDeltaTau_fmt), 0, "INTEGER_M2097152_2097151", HFILL }}, { &hf_lpp_gloGamma, { "gloGamma", "lpp.gloGamma", - FT_INT32, BASE_CUSTOM, &lpp_gloGamma_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloGamma_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_gloDeltaTau, { "gloDeltaTau", "lpp.gloDeltaTau", - FT_INT32, BASE_CUSTOM, &lpp_gloTau_gloDeltaTau_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloTau_gloDeltaTau_fmt), 0, "INTEGER_M16_15", HFILL }}, { &hf_lpp_sbasTo, { "sbasTo", "lpp.sbasTo", - FT_UINT32, BASE_CUSTOM, &lpp_sbasTo_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_sbasTo_fmt), 0, "INTEGER_0_5399", HFILL }}, { &hf_lpp_sbasAgfo, { "sbasAgfo", "lpp.sbasAgfo", - FT_INT32, BASE_CUSTOM, &lpp_sbasAgfo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAgfo_fmt), 0, "INTEGER_M2048_2047", HFILL }}, { &hf_lpp_sbasAgf1, { "sbasAgf1", "lpp.sbasAgf1", - FT_INT32, BASE_CUSTOM, &lpp_sbasAgf1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAgf1_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_bdsAODC_r12, { "bdsAODC-r12", "lpp.bdsAODC_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsAODC_AODE_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAODC_AODE_r12_fmt), 0, "INTEGER_0_31", HFILL }}, { &hf_lpp_bdsToc_r12, { "bdsToc-r12", "lpp.bdsToc_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsToc_Toe_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsToc_Toe_r12_fmt), 0, "INTEGER_0_131071", HFILL }}, { &hf_lpp_bdsA0_r12, { "bdsA0-r12", "lpp.bdsA0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsA0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsA0_r12_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_bdsA1_r12, { "bdsA1-r12", "lpp.bdsA1_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsA1_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsA1_r12_fmt), 0, "INTEGER_M2097152_2097151", HFILL }}, { &hf_lpp_bdsA2_r12, { "bdsA2-r12", "lpp.bdsA2_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsA2_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsA2_r12_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_bdsTgd1_r12, { "bdsTgd1-r12", "lpp.bdsTgd1_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsTgd1_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsTgd1_r12_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_keplerToe, { "keplerToe", "lpp.keplerToe", - FT_UINT32, BASE_CUSTOM, &lpp_keplerToe_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_keplerToe_fmt), 0, "INTEGER_0_16383", HFILL }}, { &hf_lpp_keplerW, { "keplerW", "lpp.keplerW", - FT_INT32, BASE_CUSTOM, &lpp_keplerW_M0_I0_Omega0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerW_M0_I0_Omega0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_keplerDeltaN, { "keplerDeltaN", "lpp.keplerDeltaN", - FT_INT32, BASE_CUSTOM, &lpp_keplerDeltaN_OmegaDot_IDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerDeltaN_OmegaDot_IDot_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_keplerM0, { "keplerM0", "lpp.keplerM0", - FT_INT32, BASE_CUSTOM, &lpp_keplerW_M0_I0_Omega0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerW_M0_I0_Omega0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_keplerOmegaDot, { "keplerOmegaDot", "lpp.keplerOmegaDot", - FT_INT32, BASE_CUSTOM, &lpp_keplerDeltaN_OmegaDot_IDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerDeltaN_OmegaDot_IDot_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_keplerE, { "keplerE", "lpp.keplerE", - FT_UINT32, BASE_CUSTOM, &lpp_keplerE_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_keplerE_fmt), 0, "INTEGER_0_4294967295", HFILL }}, { &hf_lpp_keplerIDot, { "keplerIDot", "lpp.keplerIDot", - FT_INT32, BASE_CUSTOM, &lpp_keplerDeltaN_OmegaDot_IDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerDeltaN_OmegaDot_IDot_fmt), 0, "INTEGER_M8192_8191", HFILL }}, { &hf_lpp_keplerAPowerHalf, { "keplerAPowerHalf", "lpp.keplerAPowerHalf", - FT_UINT32, BASE_CUSTOM, &lpp_keplerAPowerHalf_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_keplerAPowerHalf_fmt), 0, "INTEGER_0_4294967295", HFILL }}, { &hf_lpp_keplerI0, { "keplerI0", "lpp.keplerI0", - FT_INT32, BASE_CUSTOM, &lpp_keplerW_M0_I0_Omega0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerW_M0_I0_Omega0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_keplerOmega0, { "keplerOmega0", "lpp.keplerOmega0", - FT_INT32, BASE_CUSTOM, &lpp_keplerW_M0_I0_Omega0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerW_M0_I0_Omega0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_keplerCrs, { "keplerCrs", "lpp.keplerCrs", - FT_INT32, BASE_CUSTOM, &lpp_keplerCrs_Crc_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerCrs_Crc_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_keplerCis, { "keplerCis", "lpp.keplerCis", - FT_INT32, BASE_CUSTOM, &lpp_keplerCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_keplerCus, { "keplerCus", "lpp.keplerCus", - FT_INT32, BASE_CUSTOM, &lpp_keplerCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_keplerCrc, { "keplerCrc", "lpp.keplerCrc", - FT_INT32, BASE_CUSTOM, &lpp_keplerCrs_Crc_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerCrs_Crc_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_keplerCic, { "keplerCic", "lpp.keplerCic", - FT_INT32, BASE_CUSTOM, &lpp_keplerCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_keplerCuc, { "keplerCuc", "lpp.keplerCuc", - FT_INT32, BASE_CUSTOM, &lpp_keplerCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_keplerCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navURA, { "navURA", "lpp.navURA", @@ -13503,67 +13503,67 @@ void proto_register_lpp(void) { "INTEGER_0_1", HFILL }}, { &hf_lpp_navToe, { "navToe", "lpp.navToe", - FT_UINT32, BASE_CUSTOM, &lpp_navToe_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_navToe_fmt), 0, "INTEGER_0_37799", HFILL }}, { &hf_lpp_navOmega, { "navOmega", "lpp.navOmega", - FT_INT32, BASE_CUSTOM, &lpp_navOmega_M0_I0_OmegaA0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navOmega_M0_I0_OmegaA0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_navDeltaN, { "navDeltaN", "lpp.navDeltaN", - FT_INT32, BASE_CUSTOM, &lpp_navDeltaN_OmegaADot_IDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navDeltaN_OmegaADot_IDot_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navM0, { "navM0", "lpp.navM0", - FT_INT32, BASE_CUSTOM, &lpp_navOmega_M0_I0_OmegaA0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navOmega_M0_I0_OmegaA0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_navOmegaADot, { "navOmegaADot", "lpp.navOmegaADot", - FT_INT32, BASE_CUSTOM, &lpp_navDeltaN_OmegaADot_IDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navDeltaN_OmegaADot_IDot_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_navE, { "navE", "lpp.navE", - FT_UINT32, BASE_CUSTOM, &lpp_navE_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_navE_fmt), 0, "INTEGER_0_4294967295", HFILL }}, { &hf_lpp_navIDot, { "navIDot", "lpp.navIDot", - FT_INT32, BASE_CUSTOM, &lpp_navDeltaN_OmegaADot_IDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navDeltaN_OmegaADot_IDot_fmt), 0, "INTEGER_M8192_8191", HFILL }}, { &hf_lpp_navAPowerHalf, { "navAPowerHalf", "lpp.navAPowerHalf", - FT_UINT32, BASE_CUSTOM, &lpp_navAPowerHalf_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_navAPowerHalf_fmt), 0, "INTEGER_0_4294967295", HFILL }}, { &hf_lpp_navI0, { "navI0", "lpp.navI0", - FT_INT32, BASE_CUSTOM, &lpp_navOmega_M0_I0_OmegaA0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navOmega_M0_I0_OmegaA0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_navOmegaA0, { "navOmegaA0", "lpp.navOmegaA0", - FT_INT32, BASE_CUSTOM, &lpp_navOmega_M0_I0_OmegaA0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navOmega_M0_I0_OmegaA0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_navCrs, { "navCrs", "lpp.navCrs", - FT_INT32, BASE_CUSTOM, &lpp_navCrs_Crc_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navCrs_Crc_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navCis, { "navCis", "lpp.navCis", - FT_INT32, BASE_CUSTOM, &lpp_navCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navCus, { "navCus", "lpp.navCus", - FT_INT32, BASE_CUSTOM, &lpp_navCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navCrc, { "navCrc", "lpp.navCrc", - FT_INT32, BASE_CUSTOM, &lpp_navCrs_Crc_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navCrs_Crc_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navCic, { "navCic", "lpp.navCic", - FT_INT32, BASE_CUSTOM, &lpp_navCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navCuc, { "navCuc", "lpp.navCuc", - FT_INT32, BASE_CUSTOM, &lpp_navCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_addNAVparam, { "addNAVparam", "lpp.addNAVparam_element", @@ -13607,19 +13607,19 @@ void proto_register_lpp(void) { "INTEGER_M16_15", HFILL }}, { &hf_lpp_cnavDeltaA, { "cnavDeltaA", "lpp.cnavDeltaA", - FT_INT32, BASE_CUSTOM, &lpp_cnavDeltaA_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavDeltaA_fmt), 0, "INTEGER_M33554432_33554431", HFILL }}, { &hf_lpp_cnavAdot, { "cnavAdot", "lpp.cnavAdot", - FT_INT32, BASE_CUSTOM, &lpp_cnavAdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavAdot_fmt), 0, "INTEGER_M16777216_16777215", HFILL }}, { &hf_lpp_cnavDeltaNo, { "cnavDeltaNo", "lpp.cnavDeltaNo", - FT_INT32, BASE_CUSTOM, &lpp_cnavDeltaNo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavDeltaNo_fmt), 0, "INTEGER_M65536_65535", HFILL }}, { &hf_lpp_cnavDeltaNoDot, { "cnavDeltaNoDot", "lpp.cnavDeltaNoDot", - FT_INT32, BASE_CUSTOM, &lpp_cnavDeltaNoDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavDeltaNoDot_fmt), 0, "INTEGER_M4194304_4194303", HFILL }}, { &hf_lpp_cnavMo, { "cnavMo", "lpp.cnavMo", @@ -13639,7 +13639,7 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_cnavDeltaOmegaDot, { "cnavDeltaOmegaDot", "lpp.cnavDeltaOmegaDot", - FT_INT32, BASE_CUSTOM, &lpp_cnavDeltaOmegaDot_IoDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavDeltaOmegaDot_IoDot_fmt), 0, "INTEGER_M65536_65535", HFILL }}, { &hf_lpp_cnavIo, { "cnavIo", "lpp.cnavIo", @@ -13647,31 +13647,31 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_cnavIoDot, { "cnavIoDot", "lpp.cnavIoDot", - FT_INT32, BASE_CUSTOM, &lpp_cnavDeltaOmegaDot_IoDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavDeltaOmegaDot_IoDot_fmt), 0, "INTEGER_M16384_16383", HFILL }}, { &hf_lpp_cnavCis, { "cnavCis", "lpp.cnavCis", - FT_INT32, BASE_CUSTOM, &lpp_cnavCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_cnavCic, { "cnavCic", "lpp.cnavCic", - FT_INT32, BASE_CUSTOM, &lpp_cnavCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavCx_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_cnavCrs, { "cnavCrs", "lpp.cnavCrs", - FT_INT32, BASE_CUSTOM, &lpp_cnavCrs_Crc_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavCrs_Crc_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_cnavCrc, { "cnavCrc", "lpp.cnavCrc", - FT_INT32, BASE_CUSTOM, &lpp_cnavCrs_Crc_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavCrs_Crc_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_cnavCus, { "cnavCus", "lpp.cnavCus", - FT_INT32, BASE_CUSTOM, &lpp_cnavCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavCx_fmt), 0, "INTEGER_M1048576_1048575", HFILL }}, { &hf_lpp_cnavCuc, { "cnavCuc", "lpp.cnavCuc", - FT_INT32, BASE_CUSTOM, &lpp_cnavCx_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_cnavCx_fmt), 0, "INTEGER_M1048576_1048575", HFILL }}, { &hf_lpp_gloEn, { "gloEn", "lpp.gloEn", @@ -13691,39 +13691,39 @@ void proto_register_lpp(void) { "INTEGER_0_3", HFILL }}, { &hf_lpp_gloX, { "gloX", "lpp.gloX", - FT_INT32, BASE_CUSTOM, &lpp_gloX_Y_Z_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloX_Y_Z_fmt), 0, "INTEGER_M67108864_67108863", HFILL }}, { &hf_lpp_gloXdot, { "gloXdot", "lpp.gloXdot", - FT_INT32, BASE_CUSTOM, &lpp_gloXdot_Ydot_Zdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloXdot_Ydot_Zdot_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_gloXdotdot, { "gloXdotdot", "lpp.gloXdotdot", - FT_INT32, BASE_CUSTOM, &lpp_gloXdotdot_Ydotdot_Zdotdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloXdotdot_Ydotdot_Zdotdot_fmt), 0, "INTEGER_M16_15", HFILL }}, { &hf_lpp_gloY, { "gloY", "lpp.gloY", - FT_INT32, BASE_CUSTOM, &lpp_gloX_Y_Z_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloX_Y_Z_fmt), 0, "INTEGER_M67108864_67108863", HFILL }}, { &hf_lpp_gloYdot, { "gloYdot", "lpp.gloYdot", - FT_INT32, BASE_CUSTOM, &lpp_gloXdot_Ydot_Zdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloXdot_Ydot_Zdot_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_gloYdotdot, { "gloYdotdot", "lpp.gloYdotdot", - FT_INT32, BASE_CUSTOM, &lpp_gloXdotdot_Ydotdot_Zdotdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloXdotdot_Ydotdot_Zdotdot_fmt), 0, "INTEGER_M16_15", HFILL }}, { &hf_lpp_gloZ, { "gloZ", "lpp.gloZ", - FT_INT32, BASE_CUSTOM, &lpp_gloX_Y_Z_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloX_Y_Z_fmt), 0, "INTEGER_M67108864_67108863", HFILL }}, { &hf_lpp_gloZdot, { "gloZdot", "lpp.gloZdot", - FT_INT32, BASE_CUSTOM, &lpp_gloXdot_Ydot_Zdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloXdot_Ydot_Zdot_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_gloZdotdot, { "gloZdotdot", "lpp.gloZdotdot", - FT_INT32, BASE_CUSTOM, &lpp_gloXdotdot_Ydotdot_Zdotdot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloXdotdot_Ydotdot_Zdotdot_fmt), 0, "INTEGER_M16_15", HFILL }}, { &hf_lpp_sbasAccuracy, { "sbasAccuracy", "lpp.sbasAccuracy", @@ -13731,31 +13731,31 @@ void proto_register_lpp(void) { "BIT_STRING_SIZE_4", HFILL }}, { &hf_lpp_sbasXg, { "sbasXg", "lpp.sbasXg", - FT_INT32, BASE_CUSTOM, &lpp_sbasXg_Yg_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasXg_Yg_fmt), 0, "INTEGER_M536870912_536870911", HFILL }}, { &hf_lpp_sbasYg, { "sbasYg", "lpp.sbasYg", - FT_INT32, BASE_CUSTOM, &lpp_sbasXg_Yg_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasXg_Yg_fmt), 0, "INTEGER_M536870912_536870911", HFILL }}, { &hf_lpp_sbasZg, { "sbasZg", "lpp.sbasZg", - FT_INT32, BASE_CUSTOM, &lpp_sbasZg_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasZg_fmt), 0, "INTEGER_M16777216_16777215", HFILL }}, { &hf_lpp_sbasXgDot, { "sbasXgDot", "lpp.sbasXgDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasXgDot_YgDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasXgDot_YgDot_fmt), 0, "INTEGER_M65536_65535", HFILL }}, { &hf_lpp_sbasYgDot, { "sbasYgDot", "lpp.sbasYgDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasXgDot_YgDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasXgDot_YgDot_fmt), 0, "INTEGER_M65536_65535", HFILL }}, { &hf_lpp_sbasZgDot, { "sbasZgDot", "lpp.sbasZgDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasZgDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasZgDot_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_sbasXgDotDot, { "sbasXgDotDot", "lpp.sbasXgDotDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasXgDotDot_YgDotDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasXgDotDot_YgDotDot_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_sbagYgDotDot, { "sbagYgDotDot", "lpp.sbagYgDotDot", @@ -13763,11 +13763,11 @@ void proto_register_lpp(void) { "INTEGER_M512_511", HFILL }}, { &hf_lpp_sbasZgDotDot, { "sbasZgDotDot", "lpp.sbasZgDotDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasZgDotDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasZgDotDot_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_bdsAODE_r12, { "bdsAODE-r12", "lpp.bdsAODE_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsAODC_AODE_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAODC_AODE_r12_fmt), 0, "INTEGER_0_31", HFILL }}, { &hf_lpp_bdsURAI_r12, { "bdsURAI-r12", "lpp.bdsURAI_r12", @@ -13775,67 +13775,67 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_bdsToe_r12, { "bdsToe-r12", "lpp.bdsToe_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsToc_Toe_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsToc_Toe_r12_fmt), 0, "INTEGER_0_131071", HFILL }}, { &hf_lpp_bdsAPowerHalf_r12, { "bdsAPowerHalf-r12", "lpp.bdsAPowerHalf_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsAPowerHalf_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAPowerHalf_r12_fmt), 0, "INTEGER_0_4294967295", HFILL }}, { &hf_lpp_bdsE_r12, { "bdsE-r12", "lpp.bdsE_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsE_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsE_r12_fmt), 0, "INTEGER_0_4294967295", HFILL }}, { &hf_lpp_bdsW_r12, { "bdsW-r12", "lpp.bdsW_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsW_M0_Omega0_I0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsW_M0_Omega0_I0_r12_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_bdsDeltaN_r12, { "bdsDeltaN-r12", "lpp.bdsDeltaN_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_bdsM0_r12, { "bdsM0-r12", "lpp.bdsM0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsW_M0_Omega0_I0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsW_M0_Omega0_I0_r12_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_bdsOmega0_r12, { "bdsOmega0-r12", "lpp.bdsOmega0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsW_M0_Omega0_I0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsW_M0_Omega0_I0_r12_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_bdsOmegaDot_r12, { "bdsOmegaDot-r12", "lpp.bdsOmegaDot_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_bdsI0_r12, { "bdsI0-r12", "lpp.bdsI0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsW_M0_Omega0_I0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsW_M0_Omega0_I0_r12_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_bdsIDot_r12, { "bdsIDot-r12", "lpp.bdsIDot_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsDeltaN_OmegaDot_IDot_r12_fmt), 0, "INTEGER_M8192_8191", HFILL }}, { &hf_lpp_bdsCuc_r12, { "bdsCuc-r12", "lpp.bdsCuc_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsCuc_Cus_Cic_Cis_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsCuc_Cus_Cic_Cis_r12_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_bdsCus_r12, { "bdsCus-r12", "lpp.bdsCus_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsCuc_Cus_Cic_Cis_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsCuc_Cus_Cic_Cis_r12_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_bdsCrc_r12, { "bdsCrc-r12", "lpp.bdsCrc_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsCrc_Crs_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsCrc_Crs_r12_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_bdsCrs_r12, { "bdsCrs-r12", "lpp.bdsCrs_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsCrc_Crs_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsCrc_Crs_r12_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_bdsCic_r12, { "bdsCic-r12", "lpp.bdsCic_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsCuc_Cus_Cic_Cis_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsCuc_Cus_Cic_Cis_r12_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_bdsCis_r12, { "bdsCis-r12", "lpp.bdsCis_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsCuc_Cus_Cic_Cis_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsCuc_Cus_Cic_Cis_r12_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_gnss_BadSignalList, { "gnss-BadSignalList", "lpp.gnss_BadSignalList", @@ -13899,11 +13899,11 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_doppler0, { "doppler0", "lpp.doppler0", - FT_INT32, BASE_CUSTOM, &lpp_doppler0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_doppler0_fmt), 0, "INTEGER_M2048_2047", HFILL }}, { &hf_lpp_doppler1, { "doppler1", "lpp.doppler1", - FT_UINT32, BASE_CUSTOM, &lpp_doppler1_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_doppler1_fmt), 0, "INTEGER_0_63", HFILL }}, { &hf_lpp_dopplerUncertainty, { "dopplerUncertainty", "lpp.dopplerUncertainty", @@ -13911,7 +13911,7 @@ void proto_register_lpp(void) { "INTEGER_0_4", HFILL }}, { &hf_lpp_codePhase, { "codePhase", "lpp.codePhase", - FT_UINT32, BASE_CUSTOM, &lpp_codePhase_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_codePhase_fmt), 0, "INTEGER_0_1022", HFILL }}, { &hf_lpp_intCodePhase, { "intCodePhase", "lpp.intCodePhase", @@ -13923,11 +13923,11 @@ void proto_register_lpp(void) { "INTEGER_0_31", HFILL }}, { &hf_lpp_azimuth, { "azimuth", "lpp.azimuth", - FT_UINT32, BASE_CUSTOM, &lpp_azimuth_elevation_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_azimuth_elevation_fmt), 0, "INTEGER_0_511", HFILL }}, { &hf_lpp_elevation, { "elevation", "lpp.elevation", - FT_UINT32, BASE_CUSTOM, &lpp_azimuth_elevation_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_azimuth_elevation_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_codePhase1023, { "codePhase1023", "lpp.codePhase1023", @@ -13999,15 +13999,15 @@ void proto_register_lpp(void) { "AlmanacBDS_AlmanacSet_r12", HFILL }}, { &hf_lpp_kepAlmanacE, { "kepAlmanacE", "lpp.kepAlmanacE", - FT_UINT32, BASE_CUSTOM, &lpp_kepAlmanacE_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacE_fmt), 0, "INTEGER_0_2047", HFILL }}, { &hf_lpp_kepAlmanacDeltaI, { "kepAlmanacDeltaI", "lpp.kepAlmanacDeltaI", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacDeltaI_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacDeltaI_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_kepAlmanacOmegaDot, { "kepAlmanacOmegaDot", "lpp.kepAlmanacOmegaDot", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacOmegaDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacOmegaDot_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_kepSV_StatusINAV, { "kepSV-StatusINAV", "lpp.kepSV_StatusINAV", @@ -14019,39 +14019,39 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_kepAlmanacAPowerHalf, { "kepAlmanacAPowerHalf", "lpp.kepAlmanacAPowerHalf", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacAPowerHalf_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacAPowerHalf_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_kepAlmanacOmega0, { "kepAlmanacOmega0", "lpp.kepAlmanacOmega0", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacOmega0_W_M0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacOmega0_W_M0_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_kepAlmanacW, { "kepAlmanacW", "lpp.kepAlmanacW", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacOmega0_W_M0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacOmega0_W_M0_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_kepAlmanacM0, { "kepAlmanacM0", "lpp.kepAlmanacM0", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacOmega0_W_M0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacOmega0_W_M0_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_kepAlmanacAF0, { "kepAlmanacAF0", "lpp.kepAlmanacAF0", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacAF0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacAF0_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_kepAlmanacAF1, { "kepAlmanacAF1", "lpp.kepAlmanacAF1", - FT_INT32, BASE_CUSTOM, &lpp_kepAlmanacAF1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_kepAlmanacAF1_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_navAlmE, { "navAlmE", "lpp.navAlmE", - FT_UINT32, BASE_CUSTOM, &lpp_navAlmE_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmE_fmt), 0, "INTEGER_0_65535", HFILL }}, { &hf_lpp_navAlmDeltaI, { "navAlmDeltaI", "lpp.navAlmDeltaI", - FT_INT32, BASE_CUSTOM, &lpp_navAlmDeltaI_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmDeltaI_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navAlmOMEGADOT, { "navAlmOMEGADOT", "lpp.navAlmOMEGADOT", - FT_INT32, BASE_CUSTOM, &lpp_navAlmOMEGADOT_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmOMEGADOT_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_navAlmSVHealth, { "navAlmSVHealth", "lpp.navAlmSVHealth", @@ -14059,35 +14059,35 @@ void proto_register_lpp(void) { "INTEGER_0_255", HFILL }}, { &hf_lpp_navAlmSqrtA, { "navAlmSqrtA", "lpp.navAlmSqrtA", - FT_UINT32, BASE_CUSTOM, &lpp_navAlmSqrtA_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmSqrtA_fmt), 0, "INTEGER_0_16777215", HFILL }}, { &hf_lpp_navAlmOMEGAo, { "navAlmOMEGAo", "lpp.navAlmOMEGAo", - FT_INT32, BASE_CUSTOM, &lpp_navAlmOMEGAo_Omega_Mo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmOMEGAo_Omega_Mo_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_navAlmOmega, { "navAlmOmega", "lpp.navAlmOmega", - FT_INT32, BASE_CUSTOM, &lpp_navAlmOMEGAo_Omega_Mo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmOMEGAo_Omega_Mo_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_navAlmMo, { "navAlmMo", "lpp.navAlmMo", - FT_INT32, BASE_CUSTOM, &lpp_navAlmOMEGAo_Omega_Mo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmOMEGAo_Omega_Mo_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_navAlmaf0, { "navAlmaf0", "lpp.navAlmaf0", - FT_INT32, BASE_CUSTOM, &lpp_navAlmaf0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmaf0_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_navAlmaf1, { "navAlmaf1", "lpp.navAlmaf1", - FT_INT32, BASE_CUSTOM, &lpp_navAlmaf1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_navAlmaf1_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_redAlmDeltaA, { "redAlmDeltaA", "lpp.redAlmDeltaA", - FT_INT32, BASE_CUSTOM, &lpp_redAlmDeltaA_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_redAlmDeltaA_fmt), 0, "INTEGER_M128_127", HFILL }}, { &hf_lpp_redAlmOmega0, { "redAlmOmega0", "lpp.redAlmOmega0", - FT_INT32, BASE_CUSTOM, &lpp_redAlmOmega0_Phi0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_redAlmOmega0_Phi0_fmt), 0, "INTEGER_M64_63", HFILL }}, { &hf_lpp_redAlmPhi0, { "redAlmPhi0", "lpp.redAlmPhi0", @@ -14107,39 +14107,39 @@ void proto_register_lpp(void) { "BOOLEAN", HFILL }}, { &hf_lpp_midiAlmE, { "midiAlmE", "lpp.midiAlmE", - FT_UINT32, BASE_CUSTOM, &lpp_midiAlmE_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmE_fmt), 0, "INTEGER_0_2047", HFILL }}, { &hf_lpp_midiAlmDeltaI, { "midiAlmDeltaI", "lpp.midiAlmDeltaI", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmDeltaI_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmDeltaI_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_midiAlmOmegaDot, { "midiAlmOmegaDot", "lpp.midiAlmOmegaDot", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmOmegaDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmOmegaDot_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_midiAlmSqrtA, { "midiAlmSqrtA", "lpp.midiAlmSqrtA", - FT_UINT32, BASE_CUSTOM, &lpp_midiAlmSqrtA_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmSqrtA_fmt), 0, "INTEGER_0_131071", HFILL }}, { &hf_lpp_midiAlmOmega0, { "midiAlmOmega0", "lpp.midiAlmOmega0", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmOmega0_Omega_Mo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmOmega0_Omega_Mo_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_midiAlmOmega, { "midiAlmOmega", "lpp.midiAlmOmega", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmOmega0_Omega_Mo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmOmega0_Omega_Mo_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_midiAlmMo, { "midiAlmMo", "lpp.midiAlmMo", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmOmega0_Omega_Mo_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmOmega0_Omega_Mo_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_midiAlmaf0, { "midiAlmaf0", "lpp.midiAlmaf0", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmaf0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmaf0_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_midiAlmaf1, { "midiAlmaf1", "lpp.midiAlmaf1", - FT_INT32, BASE_CUSTOM, &lpp_midiAlmaf1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_midiAlmaf1_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_midiAlmL1Health, { "midiAlmL1Health", "lpp.midiAlmL1Health", @@ -14167,35 +14167,35 @@ void proto_register_lpp(void) { "INTEGER_0_31", HFILL }}, { &hf_lpp_gloAlmLambdaA, { "gloAlmLambdaA", "lpp.gloAlmLambdaA", - FT_INT32, BASE_CUSTOM, &lpp_gloAlmLambdaA_DeltaIa_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmLambdaA_DeltaIa_fmt), 0, "INTEGER_M1048576_1048575", HFILL }}, { &hf_lpp_gloAlmtlambdaA, { "gloAlmtlambdaA", "lpp.gloAlmtlambdaA", - FT_UINT32, BASE_CUSTOM, &lpp_gloAlmtlambdaA_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmtlambdaA_fmt), 0, "INTEGER_0_2097151", HFILL }}, { &hf_lpp_gloAlmDeltaIa, { "gloAlmDeltaIa", "lpp.gloAlmDeltaIa", - FT_INT32, BASE_CUSTOM, &lpp_gloAlmLambdaA_DeltaIa_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmLambdaA_DeltaIa_fmt), 0, "INTEGER_M131072_131071", HFILL }}, { &hf_lpp_gloAlmDeltaTA, { "gloAlmDeltaTA", "lpp.gloAlmDeltaTA", - FT_INT32, BASE_CUSTOM, &lpp_gloAlmDeltaTA_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmDeltaTA_fmt), 0, "INTEGER_M2097152_2097151", HFILL }}, { &hf_lpp_gloAlmDeltaTdotA, { "gloAlmDeltaTdotA", "lpp.gloAlmDeltaTdotA", - FT_INT32, BASE_CUSTOM, &lpp_gloAlmDeltaTdotA_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmDeltaTdotA_fmt), 0, "INTEGER_M64_63", HFILL }}, { &hf_lpp_gloAlmEpsilonA, { "gloAlmEpsilonA", "lpp.gloAlmEpsilonA", - FT_UINT32, BASE_CUSTOM, &lpp_gloAlmEpsilonA_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmEpsilonA_fmt), 0, "INTEGER_0_32767", HFILL }}, { &hf_lpp_gloAlmOmegaA, { "gloAlmOmegaA", "lpp.gloAlmOmegaA", - FT_INT32, BASE_CUSTOM, &lpp_gloAlmOmegaA_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmOmegaA_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_gloAlmTauA, { "gloAlmTauA", "lpp.gloAlmTauA", - FT_INT32, BASE_CUSTOM, &lpp_gloAlmTauA_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gloAlmTauA_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_gloAlmCA, { "gloAlmCA", "lpp.gloAlmCA", @@ -14215,71 +14215,71 @@ void proto_register_lpp(void) { "BIT_STRING_SIZE_8", HFILL }}, { &hf_lpp_sbasAlmXg, { "sbasAlmXg", "lpp.sbasAlmXg", - FT_INT32, BASE_CUSTOM, &lpp_sbasAlmXg_Yg_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmXg_Yg_fmt), 0, "INTEGER_M16384_16383", HFILL }}, { &hf_lpp_sbasAlmYg, { "sbasAlmYg", "lpp.sbasAlmYg", - FT_INT32, BASE_CUSTOM, &lpp_sbasAlmXg_Yg_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmXg_Yg_fmt), 0, "INTEGER_M16384_16383", HFILL }}, { &hf_lpp_sbasAlmZg, { "sbasAlmZg", "lpp.sbasAlmZg", - FT_INT32, BASE_CUSTOM, &lpp_sbasAlmZg_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmZg_fmt), 0, "INTEGER_M256_255", HFILL }}, { &hf_lpp_sbasAlmXgdot, { "sbasAlmXgdot", "lpp.sbasAlmXgdot", - FT_INT32, BASE_CUSTOM, &lpp_sbasAlmXgdot_YgDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmXgdot_YgDot_fmt), 0, "INTEGER_M4_3", HFILL }}, { &hf_lpp_sbasAlmYgDot, { "sbasAlmYgDot", "lpp.sbasAlmYgDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasAlmXgdot_YgDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmXgdot_YgDot_fmt), 0, "INTEGER_M4_3", HFILL }}, { &hf_lpp_sbasAlmZgDot, { "sbasAlmZgDot", "lpp.sbasAlmZgDot", - FT_INT32, BASE_CUSTOM, &lpp_sbasAlmZgDot_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmZgDot_fmt), 0, "INTEGER_M8_7", HFILL }}, { &hf_lpp_sbasAlmTo, { "sbasAlmTo", "lpp.sbasAlmTo", - FT_UINT32, BASE_CUSTOM, &lpp_sbasAlmTo_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_sbasAlmTo_fmt), 0, "INTEGER_0_2047", HFILL }}, { &hf_lpp_bdsAlmToa_r12, { "bdsAlmToa-r12", "lpp.bdsAlmToa_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsAlmToa_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmToa_r12_fmt), 0, "INTEGER_0_255", HFILL }}, { &hf_lpp_bdsAlmSqrtA_r12, { "bdsAlmSqrtA-r12", "lpp.bdsAlmSqrtA_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsAlmSqrtA_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmSqrtA_r12_fmt), 0, "INTEGER_0_16777215", HFILL }}, { &hf_lpp_bdsAlmE_r12, { "bdsAlmE-r12", "lpp.bdsAlmE_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bdsAlmE_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmE_r12_fmt), 0, "INTEGER_0_131071", HFILL }}, { &hf_lpp_bdsAlmW_r12, { "bdsAlmW-r12", "lpp.bdsAlmW_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmW_M0_Omega0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmW_M0_Omega0_r12_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_bdsAlmM0_r12, { "bdsAlmM0-r12", "lpp.bdsAlmM0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmW_M0_Omega0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmW_M0_Omega0_r12_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_bdsAlmOmega0_r12, { "bdsAlmOmega0-r12", "lpp.bdsAlmOmega0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmW_M0_Omega0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmW_M0_Omega0_r12_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_bdsAlmOmegaDot_r12, { "bdsAlmOmegaDot-r12", "lpp.bdsAlmOmegaDot_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmOmegaDot_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmOmegaDot_r12_fmt), 0, "INTEGER_M65536_65535", HFILL }}, { &hf_lpp_bdsAlmDeltaI_r12, { "bdsAlmDeltaI-r12", "lpp.bdsAlmDeltaI_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmDeltaI_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmDeltaI_r12_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_bdsAlmA0_r12, { "bdsAlmA0-r12", "lpp.bdsAlmA0_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmA0_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmA0_r12_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_bdsAlmA1_r12, { "bdsAlmA1-r12", "lpp.bdsAlmA1_r12", - FT_INT32, BASE_CUSTOM, &lpp_bdsAlmA1_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bdsAlmA1_r12_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_bdsSvHealth_r12, { "bdsSvHealth-r12", "lpp.bdsSvHealth_r12", @@ -14307,15 +14307,15 @@ void proto_register_lpp(void) { "UTC_ModelSet5_r12", HFILL }}, { &hf_lpp_gnss_Utc_A1, { "gnss-Utc-A1", "lpp.gnss_Utc_A1", - FT_INT32, BASE_CUSTOM, &lpp_gnss_Utc_A1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_A1_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_gnss_Utc_A0, { "gnss-Utc-A0", "lpp.gnss_Utc_A0", - FT_INT32, BASE_CUSTOM, &lpp_gnss_Utc_A0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_A0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_gnss_Utc_Tot, { "gnss-Utc-Tot", "lpp.gnss_Utc_Tot", - FT_UINT32, BASE_CUSTOM, &lpp_gnss_Utc_Tot_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_Tot_fmt), 0, "INTEGER_0_255", HFILL }}, { &hf_lpp_gnss_Utc_WNt, { "gnss-Utc-WNt", "lpp.gnss_Utc_WNt", @@ -14339,15 +14339,15 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_utcA0, { "utcA0", "lpp.utcA0", - FT_INT32, BASE_CUSTOM, &lpp_tA0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tA0_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_utcA1, { "utcA1", "lpp.utcA1", - FT_INT32, BASE_CUSTOM, &lpp_tA1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tA1_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_utcA2, { "utcA2", "lpp.utcA2", - FT_INT32, BASE_CUSTOM, &lpp_tA2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tA2_fmt), 0, "INTEGER_M64_63", HFILL }}, { &hf_lpp_utcDeltaTls, { "utcDeltaTls", "lpp.utcDeltaTls", @@ -14355,7 +14355,7 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_utcTot, { "utcTot", "lpp.utcTot", - FT_UINT32, BASE_CUSTOM, &lpp_gnss_TimeModelRefTime_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_TimeModelRefTime_fmt), 0, "INTEGER_0_65535", HFILL }}, { &hf_lpp_utcWNot, { "utcWNot", "lpp.utcWNot", @@ -14379,15 +14379,15 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_tauC, { "tauC", "lpp.tauC", - FT_INT32, BASE_CUSTOM, &lpp_tauC_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_tauC_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_b1, { "b1", "lpp.b1", - FT_INT32, BASE_CUSTOM, &lpp_b1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_b1_fmt), 0, "INTEGER_M1024_1023", HFILL }}, { &hf_lpp_b2, { "b2", "lpp.b2", - FT_INT32, BASE_CUSTOM, &lpp_b2_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_b2_fmt), 0, "INTEGER_M512_511", HFILL }}, { &hf_lpp_kp, { "kp", "lpp.kp", @@ -14395,15 +14395,15 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_utcA1wnt, { "utcA1wnt", "lpp.utcA1wnt", - FT_INT32, BASE_CUSTOM, &lpp_gnss_Utc_A1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_A1_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_utcA0wnt, { "utcA0wnt", "lpp.utcA0wnt", - FT_INT32, BASE_CUSTOM, &lpp_gnss_Utc_A0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_A0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_utcTot_01, { "utcTot", "lpp.utcTot", - FT_UINT32, BASE_CUSTOM, &lpp_gnss_Utc_Tot_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_Tot_fmt), 0, "INTEGER_0_255", HFILL }}, { &hf_lpp_utcWNt, { "utcWNt", "lpp.utcWNt", @@ -14431,11 +14431,11 @@ void proto_register_lpp(void) { "INTEGER_0_7", HFILL }}, { &hf_lpp_utcA0_r12, { "utcA0-r12", "lpp.utcA0_r12", - FT_INT32, BASE_CUSTOM, &lpp_gnss_Utc_A0_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_A0_fmt), 0, "INTEGER_M2147483648_2147483647", HFILL }}, { &hf_lpp_utcA1_r12, { "utcA1-r12", "lpp.utcA1_r12", - FT_INT32, BASE_CUSTOM, &lpp_gnss_Utc_A1_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_gnss_Utc_A1_fmt), 0, "INTEGER_M8388608_8388607", HFILL }}, { &hf_lpp_utcDeltaTls_r12, { "utcDeltaTls-r12", "lpp.utcDeltaTls_r12", @@ -14507,7 +14507,7 @@ void proto_register_lpp(void) { "INTEGER_0_15", HFILL }}, { &hf_lpp_bds_ECC_DeltaT_r12, { "bds-ECC-DeltaT-r12", "lpp.bds_ECC_DeltaT_r12", - FT_INT32, BASE_CUSTOM, &lpp_bds_ECC_DeltaT_r12_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_bds_ECC_DeltaT_r12_fmt), 0, "INTEGER_M4096_4095", HFILL }}, { &hf_lpp_bds_RefTime_r12, { "bds-RefTime-r12", "lpp.bds_RefTime_r12", @@ -14527,7 +14527,7 @@ void proto_register_lpp(void) { "INTEGER_1_320", HFILL }}, { &hf_lpp_dt_r12, { "dt-r12", "lpp.dt_r12", - FT_UINT32, BASE_CUSTOM, &lpp_bds_GridIonElement_dt_r12_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_bds_GridIonElement_dt_r12_fmt), 0, "INTEGER_0_511", HFILL }}, { &hf_lpp_givei_r12, { "givei-r12", "lpp.givei_r12", @@ -14763,11 +14763,11 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_gnss_TOD_frac, { "gnss-TOD-frac", "lpp.gnss_TOD_frac", - FT_UINT32, BASE_CUSTOM, &lpp_fractionalSecondsFromFrameStructureStart_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_fractionalSecondsFromFrameStructureStart_fmt), 0, "INTEGER_0_3999", HFILL }}, { &hf_lpp_gnss_TOD_unc, { "gnss-TOD-unc", "lpp.gnss_TOD_unc", - FT_UINT32, BASE_CUSTOM, &lpp_referenceTimeUnc_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_referenceTimeUnc_fmt), 0, "INTEGER_0_127", HFILL }}, { &hf_lpp_networkTime_01, { "networkTime", "lpp.networkTime", @@ -14863,7 +14863,7 @@ void proto_register_lpp(void) { "INTEGER_0_3", HFILL }}, { &hf_lpp_codePhase_01, { "codePhase", "lpp.codePhase", - FT_UINT32, BASE_CUSTOM, &lpp_GNSS_SatMeas_codePhase_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_GNSS_SatMeas_codePhase_fmt), 0, "INTEGER_0_2097151", HFILL }}, { &hf_lpp_integerCodePhase, { "integerCodePhase", "lpp.integerCodePhase", @@ -14871,15 +14871,15 @@ void proto_register_lpp(void) { NULL, HFILL }}, { &hf_lpp_codePhaseRMSError, { "codePhaseRMSError", "lpp.codePhaseRMSError", - FT_UINT32, BASE_CUSTOM, &lpp_codePhaseRMSError_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_codePhaseRMSError_fmt), 0, "INTEGER_0_63", HFILL }}, { &hf_lpp_doppler, { "doppler", "lpp.doppler", - FT_INT32, BASE_CUSTOM, &lpp_doppler_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lpp_doppler_fmt), 0, "INTEGER_M32768_32767", HFILL }}, { &hf_lpp_adr, { "adr", "lpp.adr", - FT_UINT32, BASE_CUSTOM, &lpp_adr_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_adr_fmt), 0, "INTEGER_0_33554431", HFILL }}, { &hf_lpp_agnss_List, { "agnss-List", "lpp.agnss_List_element", @@ -15159,15 +15159,15 @@ void proto_register_lpp(void) { "ARFCN_ValueEUTRA", HFILL }}, { &hf_lpp_rsrp_Result, { "rsrp-Result", "lpp.rsrp_Result", - FT_UINT32, BASE_CUSTOM, &lpp_rsrp_Result_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_rsrp_Result_fmt), 0, "INTEGER_0_97", HFILL }}, { &hf_lpp_rsrq_Result, { "rsrq-Result", "lpp.rsrq_Result", - FT_UINT32, BASE_CUSTOM, &lpp_rsrq_Result_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_rsrq_Result_fmt), 0, "INTEGER_0_34", HFILL }}, { &hf_lpp_ue_RxTxTimeDiff, { "ue-RxTxTimeDiff", "lpp.ue_RxTxTimeDiff", - FT_UINT32, BASE_CUSTOM, &lpp_ue_RxTxTimeDiff_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lpp_ue_RxTxTimeDiff_fmt), 0, "INTEGER_0_4095", HFILL }}, { &hf_lpp_arfcnEUTRA_v9a0, { "arfcnEUTRA-v9a0", "lpp.arfcnEUTRA_v9a0", diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index c2bb57cc2e..ee4d12b53e 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -2837,7 +2837,7 @@ static int hf_lte_rrc_ue_InactiveTime = -1; /* T_ue_InactiveTime */ static int hf_lte_rrc_candidateCellInfoList_r10 = -1; /* CandidateCellInfoList_r10 */ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1; /* CandidateCellInfo_r10 */ static int hf_lte_rrc_rsrqResult_v12xy = -1; /* RSRQ_Range_v12xy */ -static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ +static int dummy_hf_lte_rrc_eag_field = -1; /* never registered */ /*--- End of included file: packet-lte-rrc-hf.c ---*/ #line 81 "../../asn1/lte-rrc/packet-lte-rrc-template.c" @@ -7965,8 +7965,8 @@ static const per_sequence_t RadioResourceConfigCommonSIB_sequence[] = { { &hf_lte_rrc_soundingRS_UL_ConfigCommon, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_SoundingRS_UL_ConfigCommon }, { &hf_lte_rrc_uplinkPowerControlCommon, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_UplinkPowerControlCommon }, { &hf_lte_rrc_ul_CyclicPrefixLength, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_UL_CyclicPrefixLength }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSIB_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSIB_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSIB_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSIB_eag_2 }, { NULL, 0, 0, NULL } }; @@ -8510,9 +8510,9 @@ static const per_sequence_t SystemInformationBlockType2_sequence[] = { { &hf_lte_rrc_mbsfn_SubframeConfigList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_MBSFN_SubframeConfigList }, { &hf_lte_rrc_timeAlignmentTimerCommon, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_TimeAlignmentTimer }, { &hf_lte_rrc_lateNonCriticalExtension_04, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lte_rrc_T_lateNonCriticalExtension_03 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2_eag_3 }, { NULL, 0, 0, NULL } }; @@ -9013,9 +9013,9 @@ static const per_sequence_t SystemInformationBlockType3_sequence[] = { { &hf_lte_rrc_cellReselectionServingFreqInfo, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_cellReselectionServingFreqInfo }, { &hf_lte_rrc_intraFreqCellReselectionInfo, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_intraFreqCellReselectionInfo }, { &hf_lte_rrc_lateNonCriticalExtension, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType3_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType3_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType3_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType3_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType3_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType3_eag_3 }, { NULL, 0, 0, NULL } }; @@ -9296,8 +9296,8 @@ static const per_sequence_t InterFreqCarrierFreqInfo_sequence[] = { { &hf_lte_rrc_q_OffsetFreq, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_Q_OffsetRange }, { &hf_lte_rrc_interFreqNeighCellList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_InterFreqNeighCellList }, { &hf_lte_rrc_interFreqBlackCellList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_InterFreqBlackCellList }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_InterFreqCarrierFreqInfo_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_InterFreqCarrierFreqInfo_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_InterFreqCarrierFreqInfo_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_InterFreqCarrierFreqInfo_eag_2 }, { NULL, 0, 0, NULL } }; @@ -9434,7 +9434,7 @@ static const per_sequence_t CarrierFreqUTRA_FDD_sequence[] = { { &hf_lte_rrc_q_RxLevMin_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_M60_M13 }, { &hf_lte_rrc_p_MaxUTRA , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_p_MaxUTRA }, { &hf_lte_rrc_q_QualMin , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_q_QualMin }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CarrierFreqUTRA_FDD_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CarrierFreqUTRA_FDD_eag_1 }, { NULL, 0, 0, NULL } }; @@ -10615,9 +10615,9 @@ static const per_sequence_t SystemInformationBlockType8_sequence[] = { { &hf_lte_rrc_parametersHRPD, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_parametersHRPD }, { &hf_lte_rrc_parameters1XRTT, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_parameters1XRTT }, { &hf_lte_rrc_lateNonCriticalExtension, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType8_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType8_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType8_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType8_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType8_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType8_eag_3 }, { NULL, 0, 0, NULL } }; @@ -11432,7 +11432,7 @@ static const per_sequence_t SystemInformationBlockType15_r11_sequence[] = { { &hf_lte_rrc_mbms_SAI_IntraFreq_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_MBMS_SAI_List_r11 }, { &hf_lte_rrc_mbms_SAI_InterFreqList_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_MBMS_SAI_InterFreqList_r11 }, { &hf_lte_rrc_lateNonCriticalExtension, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType15_r11_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType15_r11_eag_1 }, { NULL, 0, 0, NULL } }; @@ -14351,8 +14351,8 @@ dissect_lte_rrc_LogicalChannelConfig_eag_2(tvbuff_t *tvb _U_, int offset _U_, as static const per_sequence_t LogicalChannelConfig_sequence[] = { { &hf_lte_rrc_ul_SpecificParameters, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_ul_SpecificParameters }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogicalChannelConfig_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogicalChannelConfig_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogicalChannelConfig_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogicalChannelConfig_eag_2 }, { NULL, 0, 0, NULL } }; @@ -14723,9 +14723,9 @@ static const per_sequence_t PDCP_Config_sequence[] = { { &hf_lte_rrc_rlc_AM , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_rlc_AM }, { &hf_lte_rrc_rlc_UM , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_rlc_UM }, { &hf_lte_rrc_headerCompression, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_headerCompression }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PDCP_Config_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PDCP_Config_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PDCP_Config_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PDCP_Config_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PDCP_Config_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PDCP_Config_eag_3 }, { NULL, 0, 0, NULL } }; @@ -14839,7 +14839,7 @@ static const per_sequence_t DRB_ToAddMod_sequence[] = { { &hf_lte_rrc_rlc_Config_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RLC_Config }, { &hf_lte_rrc_logicalChannelIdentity, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_logicalChannelIdentity }, { &hf_lte_rrc_logicalChannelConfig_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_LogicalChannelConfig }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_DRB_ToAddMod_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_DRB_ToAddMod_eag_1 }, { NULL, 0, 0, NULL } }; @@ -16084,10 +16084,10 @@ static const per_sequence_t MAC_MainConfig_sequence[] = { { &hf_lte_rrc_drx_Config , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_DRX_Config }, { &hf_lte_rrc_timeAlignmentTimerDedicated, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_TimeAlignmentTimer }, { &hf_lte_rrc_phr_Config , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_phr_Config }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_3 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_4 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MAC_MainConfig_eag_4 }, { NULL, 0, 0, NULL } }; @@ -16252,7 +16252,7 @@ static const per_sequence_t T_setup_45_sequence[] = { { &hf_lte_rrc_semiPersistSchedIntervalDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_semiPersistSchedIntervalDL }, { &hf_lte_rrc_numberOfConfSPS_Processes, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_1_8 }, { &hf_lte_rrc_n1PUCCH_AN_PersistentList, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_N1PUCCH_AN_PersistentList }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1 }, { NULL, 0, 0, NULL } }; @@ -16450,7 +16450,7 @@ static const per_sequence_t T_setup_47_sequence[] = { { &hf_lte_rrc_implicitReleaseAfter, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_implicitReleaseAfter }, { &hf_lte_rrc_p0_Persistent, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_p0_Persistent }, { &hf_lte_rrc_twoIntervalsConfig, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_twoIntervalsConfig }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1_01 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1_01 }, { NULL, 0, 0, NULL } }; @@ -19136,7 +19136,7 @@ static const per_sequence_t EPDCCH_SetConfig_r11_sequence[] = { { &hf_lte_rrc_dmrs_ScramblingSequenceInt_r11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_0_503 }, { &hf_lte_rrc_pucch_ResourceStartOffset_r11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_0_2047 }, { &hf_lte_rrc_re_MappingQCL_ConfigId_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_PDSCH_RE_MappingQCL_ConfigId_r11 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_EPDCCH_SetConfig_r11_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_EPDCCH_SetConfig_r11_eag_1 }, { NULL, 0, 0, NULL } }; @@ -19865,7 +19865,7 @@ static const per_sequence_t CSI_Process_r11_sequence[] = { { &hf_lte_rrc_cqi_ReportBothProc_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_CQI_ReportBothProc_r11 }, { &hf_lte_rrc_cqi_ReportPeriodicProcId_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_INTEGER_0_maxCQI_ProcExt_r11 }, { &hf_lte_rrc_cqi_ReportAperiodicProc_r11, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_CQI_ReportAperiodicProc_r11 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CSI_Process_r11_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CSI_Process_r11_eag_1 }, { NULL, 0, 0, NULL } }; @@ -20917,11 +20917,11 @@ static const per_sequence_t PhysicalConfigDedicated_sequence[] = { { &hf_lte_rrc_soundingRS_UL_ConfigDedicated, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_SoundingRS_UL_ConfigDedicated }, { &hf_lte_rrc_antennaInfo , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_antennaInfo }, { &hf_lte_rrc_schedulingRequestConfig, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_SchedulingRequestConfig }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_3 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_4 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_5 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_4 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicated_eag_5 }, { NULL, 0, 0, NULL } }; @@ -21398,10 +21398,10 @@ static const per_sequence_t RadioResourceConfigDedicated_sequence[] = { { &hf_lte_rrc_mac_MainConfig, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_mac_MainConfig }, { &hf_lte_rrc_sps_Config , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_SPS_Config }, { &hf_lte_rrc_physicalConfigDedicated, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_PhysicalConfigDedicated }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_3 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_4 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicated_eag_4 }, { NULL, 0, 0, NULL } }; @@ -23697,10 +23697,10 @@ static const per_sequence_t MeasObjectEUTRA_sequence[] = { { &hf_lte_rrc_blackCellsToRemoveList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_CellIndexList }, { &hf_lte_rrc_blackCellsToAddModList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_BlackCellsToAddModList }, { &hf_lte_rrc_cellForWhichToReportCGI_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_PhysCellId }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_3 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_4 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectEUTRA_eag_4 }, { NULL, 0, 0, NULL } }; @@ -23933,8 +23933,8 @@ static const per_sequence_t MeasObjectUTRA_sequence[] = { { &hf_lte_rrc_cellsToRemoveList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_CellIndexList }, { &hf_lte_rrc_cellsToAddModList_02, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_cellsToAddModList }, { &hf_lte_rrc_cellForWhichToReportCGI_03, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_cellForWhichToReportCGI }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectUTRA_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectUTRA_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectUTRA_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasObjectUTRA_eag_2 }, { NULL, 0, 0, NULL } }; @@ -24715,9 +24715,9 @@ static const per_sequence_t ReportConfigEUTRA_sequence[] = { { &hf_lte_rrc_maxReportCells, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_1_maxCellReport }, { &hf_lte_rrc_reportInterval, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportInterval }, { &hf_lte_rrc_reportAmount, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_reportAmount }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigEUTRA_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigEUTRA_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigEUTRA_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigEUTRA_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigEUTRA_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigEUTRA_eag_3 }, { NULL, 0, 0, NULL } }; @@ -25069,10 +25069,10 @@ static const per_sequence_t ReportConfigInterRAT_sequence[] = { { &hf_lte_rrc_maxReportCells, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_1_maxCellReport }, { &hf_lte_rrc_reportInterval, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportInterval }, { &hf_lte_rrc_reportAmount_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_reportAmount_01 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_3 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_4 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ReportConfigInterRAT_eag_4 }, { NULL, 0, 0, NULL } }; @@ -25371,8 +25371,8 @@ static const per_sequence_t QuantityConfig_sequence[] = { { &hf_lte_rrc_quantityConfigUTRA, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_QuantityConfigUTRA }, { &hf_lte_rrc_quantityConfigGERAN, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_QuantityConfigGERAN }, { &hf_lte_rrc_quantityConfigCDMA2000, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_QuantityConfigCDMA2000 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_QuantityConfig_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_QuantityConfig_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_QuantityConfig_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_QuantityConfig_eag_2 }, { NULL, 0, 0, NULL } }; @@ -25687,9 +25687,9 @@ static const per_sequence_t MeasConfig_sequence[] = { { &hf_lte_rrc_s_Measure , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_S_Measure }, { &hf_lte_rrc_preRegistrationInfoHRPD, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_PreRegistrationInfoHRPD }, { &hf_lte_rrc_speedStatePars, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_speedStatePars }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasConfig_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasConfig_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasConfig_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasConfig_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasConfig_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasConfig_eag_3 }, { NULL, 0, 0, NULL } }; @@ -25900,8 +25900,8 @@ static const per_sequence_t RadioResourceConfigCommon_sequence[] = { { &hf_lte_rrc_p_Max , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_P_Max }, { &hf_lte_rrc_tdd_Config , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_TDD_Config }, { &hf_lte_rrc_ul_CyclicPrefixLength, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_UL_CyclicPrefixLength }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommon_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommon_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommon_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommon_eag_2 }, { NULL, 0, 0, NULL } }; @@ -25994,8 +25994,8 @@ static const per_sequence_t MobilityControlInfo_sequence[] = { { &hf_lte_rrc_newUE_Identity, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_C_RNTI }, { &hf_lte_rrc_radioResourceConfigCommon_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommon }, { &hf_lte_rrc_rach_ConfigDedicated, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RACH_ConfigDedicated }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MobilityControlInfo_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MobilityControlInfo_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MobilityControlInfo_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MobilityControlInfo_eag_2 }, { NULL, 0, 0, NULL } }; @@ -26443,7 +26443,7 @@ dissect_lte_rrc_OtherConfig_r9_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static const per_sequence_t OtherConfig_r9_sequence[] = { { &hf_lte_rrc_reportProximityConfig_r9, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_ReportProximityConfig_r9 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_OtherConfig_r9_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_OtherConfig_r9_eag_1 }, { NULL, 0, 0, NULL } }; @@ -26744,8 +26744,8 @@ dissect_lte_rrc_RadioResourceConfigCommonSCell_r10_eag_2(tvbuff_t *tvb _U_, int static const per_sequence_t RadioResourceConfigCommonSCell_r10_sequence[] = { { &hf_lte_rrc_nonUL_Configuration_r10_01, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_nonUL_Configuration_r10_01 }, { &hf_lte_rrc_ul_Configuration_r10_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_ul_Configuration_r10_01 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSCell_r10_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSCell_r10_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSCell_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigCommonSCell_r10_eag_2 }, { NULL, 0, 0, NULL } }; @@ -27053,8 +27053,8 @@ dissect_lte_rrc_PhysicalConfigDedicatedSCell_r10_eag_2(tvbuff_t *tvb _U_, int of static const per_sequence_t PhysicalConfigDedicatedSCell_r10_sequence[] = { { &hf_lte_rrc_nonUL_Configuration_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_nonUL_Configuration_r10 }, { &hf_lte_rrc_ul_Configuration_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_ul_Configuration_r10 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicatedSCell_r10_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicatedSCell_r10_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicatedSCell_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_PhysicalConfigDedicatedSCell_r10_eag_2 }, { NULL, 0, 0, NULL } }; @@ -27109,8 +27109,8 @@ dissect_lte_rrc_RadioResourceConfigDedicatedSCell_r10_eag_2(tvbuff_t *tvb _U_, i static const per_sequence_t RadioResourceConfigDedicatedSCell_r10_sequence[] = { { &hf_lte_rrc_physicalConfigDedicatedSCell_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_PhysicalConfigDedicatedSCell_r10 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicatedSCell_r10_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicatedSCell_r10_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicatedSCell_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RadioResourceConfigDedicatedSCell_r10_eag_2 }, { NULL, 0, 0, NULL } }; @@ -27141,7 +27141,7 @@ static const per_sequence_t SCellToAddMod_r10_sequence[] = { { &hf_lte_rrc_cellIdentification_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_cellIdentification_r10 }, { &hf_lte_rrc_radioResourceConfigCommonSCell_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RadioResourceConfigCommonSCell_r10 }, { &hf_lte_rrc_radioResourceConfigDedicatedSCell_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RadioResourceConfigDedicatedSCell_r10 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SCellToAddMod_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_SCellToAddMod_r10_eag_1 }, { NULL, 0, 0, NULL } }; @@ -28219,7 +28219,7 @@ static const per_sequence_t IdleModeMobilityControlInfo_sequence[] = { { &hf_lte_rrc_bandClassPriorityListHRPD, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_BandClassPriorityListHRPD }, { &hf_lte_rrc_bandClassPriorityList1XRTT, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_BandClassPriorityList1XRTT }, { &hf_lte_rrc_t320 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_t320 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_IdleModeMobilityControlInfo_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_IdleModeMobilityControlInfo_eag_1 }, { NULL, 0, 0, NULL } }; @@ -30859,8 +30859,8 @@ dissect_lte_rrc_T_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static const per_sequence_t T_measResult_sequence[] = { { &hf_lte_rrc_rsrpResult , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RSRP_Range }, { &hf_lte_rrc_rsrqResult , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RSRQ_Range }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1_02 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1_02 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_2 }, { NULL, 0, 0, NULL } }; @@ -31031,8 +31031,8 @@ dissect_lte_rrc_T_eag_2_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const per_sequence_t T_measResult_01_sequence[] = { { &hf_lte_rrc_utra_RSCP , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_INTEGER_M5_91 }, { &hf_lte_rrc_utra_EcN0 , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_INTEGER_0_49 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1_03 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_2_01 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_1_03 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_eag_2_01 }, { NULL, 0, 0, NULL } }; @@ -31570,7 +31570,7 @@ static const per_sequence_t MeasResultServFreq_r10_sequence[] = { { &hf_lte_rrc_servFreqId_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ServCellIndex_r10 }, { &hf_lte_rrc_measResultSCell_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultSCell_r10 }, { &hf_lte_rrc_measResultBestNeighCell_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultBestNeighCell_r10 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResultServFreq_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResultServFreq_r10_eag_1 }, { NULL, 0, 0, NULL } }; @@ -31659,9 +31659,9 @@ static const per_sequence_t MeasResults_sequence[] = { { &hf_lte_rrc_measId , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasId }, { &hf_lte_rrc_measResultPCell, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_measResultPCell }, { &hf_lte_rrc_measResultNeighCells, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultNeighCells }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResults_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResults_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResults_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResults_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResults_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_MeasResults_eag_3 }, { NULL, 0, 0, NULL } }; @@ -33875,10 +33875,10 @@ dissect_lte_rrc_RLF_Report_r9_eag_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t RLF_Report_r9_sequence[] = { { &hf_lte_rrc_measResultLastServCell_r9, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_measResultLastServCell_r9 }, { &hf_lte_rrc_measResultNeighCells_r9, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultNeighCells_r9 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_3 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_4 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RLF_Report_r9_eag_4 }, { NULL, 0, 0, NULL } }; @@ -34144,8 +34144,8 @@ static const per_sequence_t LogMeasInfo_r10_sequence[] = { { &hf_lte_rrc_servCellIdentity_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_CellGlobalIdEUTRA }, { &hf_lte_rrc_measResultServCell_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_T_measResultServCell_r10 }, { &hf_lte_rrc_measResultNeighCells_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_measResultNeighCells_r10 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_LogMeasInfo_r10_eag_2 }, { NULL, 0, 0, NULL } }; @@ -34263,7 +34263,7 @@ static const per_sequence_t ConnEstFailReport_r11_sequence[] = { { &hf_lte_rrc_maxTxPowerReached_r11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_BOOLEAN }, { &hf_lte_rrc_timeSinceFailure_r11, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_TimeSinceFailure_r11 }, { &hf_lte_rrc_measResultListEUTRA_v1130, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_MeasResultList2EUTRA_v9e0 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ConnEstFailReport_r11_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_ConnEstFailReport_r11_eag_1 }, { NULL, 0, 0, NULL } }; @@ -34973,7 +34973,7 @@ dissect_lte_rrc_RSTD_InterFreqInfo_r10_eag_1(tvbuff_t *tvb _U_, int offset _U_, static const per_sequence_t RSTD_InterFreqInfo_r10_sequence[] = { { &hf_lte_rrc_carrierFreq_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueEUTRA }, { &hf_lte_rrc_measPRS_Offset_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_INTEGER_0_39 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RSTD_InterFreqInfo_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RSTD_InterFreqInfo_r10_eag_1 }, { NULL, 0, 0, NULL } }; @@ -38527,7 +38527,7 @@ static const per_sequence_t UE_EUTRA_CapabilityAddXDD_Mode_v1060_sequence[] = { { &hf_lte_rrc_featureGroupIndRel10_v1060, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_featureGroupIndRel10_v1060 }, { &hf_lte_rrc_interRAT_ParametersCDMA2000_v1060, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_IRAT_ParametersCDMA2000_1XRTT_v1020 }, { &hf_lte_rrc_interRAT_ParametersUTRA_TDD_v1060, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_IRAT_ParametersUTRA_TDD_v1020 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_UE_EUTRA_CapabilityAddXDD_Mode_v1060_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_UE_EUTRA_CapabilityAddXDD_Mode_v1060_eag_1 }, { NULL, 0, 0, NULL } }; @@ -41177,9 +41177,9 @@ static const per_sequence_t AS_Config_sequence[] = { { &hf_lte_rrc_sourceSystemInformationBlockType2, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_SystemInformationBlockType2 }, { &hf_lte_rrc_antennaInfoCommon, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_AntennaInfoCommon }, { &hf_lte_rrc_sourceDl_CarrierFreq, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueEUTRA }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_AS_Config_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_AS_Config_eag_2 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_AS_Config_eag_3 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_AS_Config_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_AS_Config_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_AS_Config_eag_3 }, { NULL, 0, 0, NULL } }; @@ -41303,8 +41303,8 @@ static const per_sequence_t CandidateCellInfo_r10_sequence[] = { { &hf_lte_rrc_dl_CarrierFreq_r10, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lte_rrc_ARFCN_ValueEUTRA }, { &hf_lte_rrc_rsrpResult_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RSRP_Range }, { &hf_lte_rrc_rsrqResult_r10, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_RSRQ_Range }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CandidateCellInfo_r10_eag_1 }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CandidateCellInfo_r10_eag_2 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CandidateCellInfo_r10_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_CandidateCellInfo_r10_eag_2 }, { NULL, 0, 0, NULL } }; @@ -41346,7 +41346,7 @@ dissect_lte_rrc_RRM_Config_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static const per_sequence_t RRM_Config_sequence[] = { { &hf_lte_rrc_ue_InactiveTime, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_lte_rrc_T_ue_InactiveTime }, - { &hf_lte_rrc_dummy_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RRM_Config_eag_1 }, + { &dummy_hf_lte_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_lte_rrc_RRM_Config_eag_1 }, { NULL, 0, 0, NULL } }; @@ -45103,7 +45103,7 @@ void proto_register_lte_rrc(void) { "CellGlobalIdEUTRA", HFILL }}, { &hf_lte_rrc_timeConnFailure_r10, { "timeConnFailure-r10", "lte-rrc.timeConnFailure_r10", - FT_UINT32, BASE_CUSTOM, <e_rrc_timeConnFailure_r10_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lte_rrc_timeConnFailure_r10_fmt), 0, "INTEGER_0_1023", HFILL }}, { &hf_lte_rrc_connectionFailureType_r10, { "connectionFailureType-r10", "lte-rrc.connectionFailureType_r10", @@ -46567,7 +46567,7 @@ void proto_register_lte_rrc(void) { NULL, HFILL }}, { &hf_lte_rrc_localTimeOffset_r11, { "localTimeOffset-r11", "lte-rrc.localTimeOffset_r11", - FT_INT32, BASE_CUSTOM, <e_rrc_localTimeOffset_fmt, 0, + FT_INT32, BASE_CUSTOM, CF_FUNC(lte_rrc_localTimeOffset_fmt), 0, "INTEGER_M63_64", HFILL }}, { &hf_lte_rrc_wlan_OffloadPerPLMN_List_r12, { "wlan-OffloadPerPLMN-List-r12", "lte-rrc.wlan_OffloadPerPLMN_List_r12", @@ -50563,7 +50563,7 @@ void proto_register_lte_rrc(void) { "INTEGER_0_63", HFILL }}, { &hf_lte_rrc_ue_RxTxTimeDiffResult_r9, { "ue-RxTxTimeDiffResult-r9", "lte-rrc.ue_RxTxTimeDiffResult_r9", - FT_UINT32, BASE_CUSTOM, <e_rrc_ue_RxTxTimeDiffResult_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(lte_rrc_ue_RxTxTimeDiffResult_fmt), 0, "INTEGER_0_4095", HFILL }}, { &hf_lte_rrc_currentSFN_r9, { "currentSFN-r9", "lte-rrc.currentSFN_r9", diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index ebc693eb18..4afd165cdf 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -5684,7 +5684,7 @@ proto_register_mbim(void) }, { &hf_mbim_provider_rssi, { "RSSI", "mbim.control.provider.rssi", - FT_UINT32, BASE_CUSTOM, mbim_rssi_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(mbim_rssi_fmt), 0, NULL, HFILL } }, { &hf_mbim_provider_error_rate, @@ -5879,7 +5879,7 @@ proto_register_mbim(void) }, { &hf_mbim_signal_state_info_rssi, { "RSSI", "mbim.control.signal_state_info.rssi", - FT_UINT32, BASE_CUSTOM, mbim_rssi_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(mbim_rssi_fmt), 0, NULL, HFILL } }, { &hf_mbim_signal_state_info_error_rate, diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 2a9f599153..0a7077e298 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -4901,13 +4901,13 @@ proto_register_mip6(void) { &hf_mip6_opt_acc_net_id_sub_opt_geo_latitude_degrees, { "Latitude Degrees", "mip6.acc_net_id.geo.latitude_degrees", - FT_INT24, BASE_CUSTOM, degrees_base_custom, 0x0, + FT_INT24, BASE_CUSTOM, CF_FUNC(degrees_base_custom), 0x0, NULL, HFILL } }, { &hf_mip6_opt_acc_net_id_sub_opt_geo_longitude_degrees, { "Longitude Degrees", "mip6.acc_net_id.geo.longitude_degrees", - FT_INT24, BASE_CUSTOM, degrees_base_custom, 0x0, + FT_INT24, BASE_CUSTOM, CF_FUNC(degrees_base_custom), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index fc36688af2..d96838f335 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -348,7 +348,7 @@ proto_register_msnlb(void) { &hf_msnlb_version, { "Version", "msnlb.version", FT_UINT32, BASE_CUSTOM, - version_base_custom, 0, + CF_FUNC(version_base_custom), 0, NULL, HFILL } }, { &hf_msnlb_uniquehostid, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 7c68550ba8..bf8ed32f20 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -7145,7 +7145,7 @@ proto_register_netflow(void) }, {&hf_cflow_nbar_appl_id, {"ApplicationID", "cflow.appl_id", - FT_UINT32, BASE_CUSTOM, nbar_fmt_id, 0x0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(nbar_fmt_id), 0x0, "Application ID (NBAR)", HFILL} }, {&hf_cflow_nbar_appl_name, diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index 66545bb8a2..b83d5af347 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -358,7 +358,7 @@ hfi_netlink_route_ifi_flags_label(char *label, guint32 value) static header_field_info hfi_netlink_route_ifi_flags NETLINK_ROUTE_HFI_INIT = { "Device flags", "netlink-route.ifi_flags", FT_UINT32, BASE_CUSTOM, - &hfi_netlink_route_ifi_flags_label, 0x00, NULL, HFILL }; + CF_FUNC(hfi_netlink_route_ifi_flags_label), 0x00, NULL, HFILL }; static const true_false_string hfi_netlink_route_ifi_flags_iff_up_tfs = { "Up", "Down" }; @@ -495,7 +495,7 @@ hfi_netlink_route_ifa_flags_label(char *label, guint32 value) static header_field_info hfi_netlink_route_ifa_flags NETLINK_ROUTE_HFI_INIT = { "Address flags", "netlink-route.ifa_flags", FT_UINT8, BASE_CUSTOM, - &hfi_netlink_route_ifa_flags_label, 0x00, NULL, HFILL }; + CF_FUNC(hfi_netlink_route_ifa_flags_label), 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifa_scope NETLINK_ROUTE_HFI_INIT = { "Address scope", "netlink-route.ifa_scope", FT_UINT8, BASE_DEC, @@ -765,7 +765,7 @@ hfi_netlink_route_nd_states_label(char *label, guint32 value) static header_field_info hfi_netlink_route_nd_state NETLINK_ROUTE_HFI_INIT = { "State", "netlink-route.nd_state", FT_UINT16, BASE_CUSTOM, - &hfi_netlink_route_nd_states_label, 0x00, NULL, HFILL }; + CF_FUNC(hfi_netlink_route_nd_states_label), 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_nd_flags NETLINK_ROUTE_HFI_INIT = { "Flags", "netlink-route.nd_flags", FT_UINT8, BASE_HEX, diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index b0ea42e572..2ed50e59ad 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -1393,37 +1393,37 @@ proto_register_ouch(void) { &hf_ouch_bbo_weight_indicator, { "BBO Weight Indicator", "ouch.bbo_weight_indicator", - FT_UINT8, BASE_CUSTOM, format_bbo_weight_indicator, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_bbo_weight_indicator), 0x0, NULL, HFILL }}, { &hf_ouch_broken_trade_reason, { "Broken Trade Reason", "ouch.broken_trade_reason", - FT_UINT8, BASE_CUSTOM, format_broken_trade_reason, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_broken_trade_reason), 0x0, NULL, HFILL }}, { &hf_ouch_buy_sell_indicator, { "Buy/Sell Indicator", "ouch.buy_sell_indicator", - FT_UINT8, BASE_CUSTOM, format_buy_sell_indicator, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_buy_sell_indicator), 0x0, NULL, HFILL }}, { &hf_ouch_cancel_reason, { "Cancel Reason", "ouch.cancel_reason", - FT_UINT8, BASE_CUSTOM, format_cancel_reason, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_cancel_reason), 0x0, NULL, HFILL }}, { &hf_ouch_capacity, { "Capacity", "ouch.capacity", - FT_UINT8, BASE_CUSTOM, format_capacity, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_capacity), 0x0, NULL, HFILL }}, { &hf_ouch_cross_type, { "Cross Type", "ouch.cross_type", - FT_UINT8, BASE_CUSTOM, format_cross_type, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_cross_type), 0x0, NULL, HFILL }}, { &hf_ouch_customer_type, { "Customer Type", "ouch.customer_type", - FT_UINT8, BASE_CUSTOM, format_customer_type, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_customer_type), 0x0, NULL, HFILL }}, { &hf_ouch_decrement_shares, @@ -1433,12 +1433,12 @@ proto_register_ouch(void) { &hf_ouch_display, { "Display", "ouch.display", - FT_UINT8, BASE_CUSTOM, format_display, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_display), 0x0, NULL, HFILL }}, { &hf_ouch_event_code, { "Event Code", "ouch.event_code", - FT_UINT8, BASE_CUSTOM, format_event_code, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_event_code), 0x0, NULL, HFILL }}, { &hf_ouch_executed_shares, @@ -1448,7 +1448,7 @@ proto_register_ouch(void) { &hf_ouch_execution_price, { "Execution Price", "ouch.execution_price", - FT_UINT32, BASE_CUSTOM, format_price, 0x0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(format_price), 0x0, NULL, HFILL }}, { &hf_ouch_existing_order_token, @@ -1463,12 +1463,12 @@ proto_register_ouch(void) { &hf_ouch_iso_eligible, { "Intermarket Sweep Eligibility", "ouch.iso_eligible", - FT_UINT8, BASE_CUSTOM, format_iso_eligibility, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_iso_eligibility), 0x0, NULL, HFILL }}, { &hf_ouch_liquidity_flag, { "Liquidity Flag", "ouch.liquidity_flag", - FT_UINT8, BASE_CUSTOM, format_liquidity_flag, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_liquidity_flag), 0x0, NULL, HFILL }}, { &hf_ouch_match_number, @@ -1488,7 +1488,7 @@ proto_register_ouch(void) { &hf_ouch_new_execution_price, { "New Execution Price", "ouch.new_execution_price", - FT_UINT32, BASE_CUSTOM, format_price, 0x0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(format_price), 0x0, NULL, HFILL }}, { &hf_ouch_order_reference_number, @@ -1498,7 +1498,7 @@ proto_register_ouch(void) { &hf_ouch_order_state, { "Order State", "ouch.order_state", - FT_UINT8, BASE_CUSTOM, format_order_state, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_order_state), 0x0, NULL, HFILL }}, { &hf_ouch_order_token, @@ -1508,7 +1508,7 @@ proto_register_ouch(void) { &hf_ouch_packet_type, { "Packet Type", "ouch.packet_type", - FT_UINT8, BASE_CUSTOM, format_packet_type, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_packet_type), 0x0, NULL, HFILL }}, { &hf_ouch_previous_order_token, @@ -1518,12 +1518,12 @@ proto_register_ouch(void) { &hf_ouch_price, { "Price", "ouch.price", - FT_UINT32, BASE_CUSTOM, format_price, 0x0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(format_price), 0x0, NULL, HFILL }}, { &hf_ouch_price_correction_reason, { "Price Correction Reason", "ouch.price_correction_reason", - FT_UINT8, BASE_CUSTOM, format_price_correction_reason, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_price_correction_reason), 0x0, NULL, HFILL }}, { &hf_ouch_quantity_prevented_from_trading, @@ -1534,7 +1534,7 @@ proto_register_ouch(void) { &hf_ouch_reject_reason, { "Reject Reason", "ouch.reject_reason", - FT_UINT8, BASE_CUSTOM, format_reject_reason, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_reject_reason), 0x0, NULL, HFILL }}, { &hf_ouch_replacement_order_token, @@ -1554,7 +1554,7 @@ proto_register_ouch(void) { &hf_ouch_tif, { "Time In Force", "ouch.tif", - FT_UINT32, BASE_CUSTOM, format_tif, 0x0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(format_tif), 0x0, NULL, HFILL }}, { &hf_ouch_timestamp, diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index 556b7ef242..0b557b18a2 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -1816,7 +1816,7 @@ void proto_register_pn532(void) VALS(pn532_sam_modes), 0x0, NULL, HFILL}}, {&hf_pn532_sam_timeout, {"SAM Timeout", "pn532.sam.timeout", FT_UINT8, BASE_CUSTOM, - sam_timeout_base, 0x0, NULL, HFILL}}, + CF_FUNC(sam_timeout_base), 0x0, NULL, HFILL}}, {&hf_pn532_sam_irq, {"SAM IRQ", "pn532.sam.irq", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, @@ -2257,7 +2257,7 @@ void proto_register_pn532(void) VALS(pn532_diagnose_baudrate_vals), 0x00, NULL, HFILL}}, {&hf_pn532_reply_delay, {"Reply Delay", "pn532.sam.reply_delay", FT_UINT8, BASE_CUSTOM, - replay_delay_base, 0x0, NULL, HFILL}}, + CF_FUNC(replay_delay_base), 0x0, NULL, HFILL}}, {&hf_pn532_ciu_tx_mode, {"CIU Tx Mode", "pn532.ciu_tx_mode", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c index 2484b548e6..d99d9b9568 100644 --- a/epan/dissectors/packet-s5066dts.c +++ b/epan/dissectors/packet-s5066dts.c @@ -979,10 +979,10 @@ void proto_register_s5066dts (void) { "C_PDU Segment", "s5066dts.segmented_cpdu", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_s5066dts_dest_addr, - { "Destination Address", "s5066dts.dest_addr", FT_UINT32, BASE_CUSTOM, s5066dts_address_format, 0x0, NULL, HFILL } + { "Destination Address", "s5066dts.dest_addr", FT_UINT32, BASE_CUSTOM, CF_FUNC(s5066dts_address_format), 0x0, NULL, HFILL } }, { &hf_s5066dts_src_addr, - { "Source Address", "s5066dts.src_addr", FT_UINT32, BASE_CUSTOM, s5066dts_address_format, 0x0, NULL, HFILL } + { "Source Address", "s5066dts.src_addr", FT_UINT32, BASE_CUSTOM, CF_FUNC(s5066dts_address_format), 0x0, NULL, HFILL } }, { &hf_s5066dts_header_crc, { "CRC on header", "s5066dts.header_crc", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 50c75bc2b4..490d3a1232 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -514,13 +514,13 @@ proto_register_soupbintcp(void) { &hf_soupbintcp_packet_type, { "Packet Type", "soupbintcp.packet_type", - FT_UINT8, BASE_CUSTOM, format_packet_type, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_packet_type), 0x0, "Message type code", HFILL }}, { &hf_soupbintcp_reject_code, { "Login Reject Code", "soupbintcp.reject_code", - FT_UINT8, BASE_CUSTOM, format_reject_code, 0x0, + FT_UINT8, BASE_CUSTOM, CF_FUNC(format_reject_code), 0x0, "Login reject reason code", HFILL }}, diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 0898558201..7c58abe9d6 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -1045,38 +1045,38 @@ proto_register_stanag4607(void) { &hf_4607_dwell_time, { "Dwell Time", "s4607.dwell.time", FT_UINT32, BASE_CUSTOM, - prt_millisec, 0x0, + CF_FUNC(prt_millisec), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_lat, { "Sensor Position Latitude", "s4607.dwell.sensor.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_lon, { "Sensor Position Longitude", "s4607.dwell.sensor.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_alt, { "Sensor Position Altitude", "s4607.dwell.sensor.alt", FT_INT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, /* D10 */ { &hf_4607_dwell_scale_lat, { "Scale Factor, Latitude", "s4607.dwell.scale.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_scale_lon, { "Scale Factor, Longitude", "s4607.dwell.scale.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, @@ -1084,19 +1084,19 @@ proto_register_stanag4607(void) { &hf_4607_dwell_unc_along, { "Sensor Position Uncertainty Along Track", "s4607.dwell.unc.along", FT_UINT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_unc_cross, { "Sensor Position Uncertainty Cross Track", "s4607.dwell.unc.cross", FT_UINT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_unc_alt, { "Sensor Position Uncertainty Altitude", "s4607.dwell.unc.alt", FT_UINT16, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, @@ -1104,19 +1104,19 @@ proto_register_stanag4607(void) { &hf_4607_dwell_track, { "Sensor Track", "s4607.dwell.track", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_speed, { "Sensor Speed", "s4607.dwell.speed", FT_UINT32, BASE_CUSTOM, - prt_speed, 0x0, + CF_FUNC(prt_speed), 0x0, NULL, HFILL } }, { &hf_4607_dwell_vert_velocity, { "Sensor Vertical Velocity", "s4607.dwell.vvel", FT_INT8, BASE_CUSTOM, - prt_speed_deci, 0x0, + CF_FUNC(prt_speed_deci), 0x0, NULL, HFILL } }, { &hf_4607_dwell_track_unc, @@ -1128,13 +1128,13 @@ proto_register_stanag4607(void) { &hf_4607_dwell_speed_unc, { "Sensor Speed Uncertainty", "s4607.dwell.speed.unc", FT_UINT16, BASE_CUSTOM, - prt_speed, 0x0, + CF_FUNC(prt_speed), 0x0, NULL, HFILL } }, { &hf_4607_dwell_vv_unc, { "Sensor Vertical Velocity Uncertainty", "s4607.dwell.vvel.unc", FT_UINT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, @@ -1142,19 +1142,19 @@ proto_register_stanag4607(void) { &hf_4607_dwell_plat_heading, { "Platform Orientation Heading", "s4607.dwell.plat.heading", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_plat_pitch, { "Platform Orientation Pitch", "s4607.dwell.plat.pitch", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_plat_roll, { "Platform Orientation Roll (Bank Angle)", "s4607.dwell.plat.roll", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, @@ -1162,25 +1162,25 @@ proto_register_stanag4607(void) { &hf_4607_dwell_da_lat, { "Dwell Area Center Latitude", "s4607.dwell.da.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_da_lon, { "Dwell Area Center Longitude", "s4607.dwell.da.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_da_range, { "Dwell Area Range Half Extent", "s4607.dwell.da.range", FT_UINT16, BASE_CUSTOM, - prt_kilo, 0x0, + CF_FUNC(prt_kilo), 0x0, NULL, HFILL } }, { &hf_4607_dwell_da_angle, { "Dwell Area Dwell Angle Half Extent", "s4607.dwell.da.angle", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, @@ -1188,25 +1188,25 @@ proto_register_stanag4607(void) { &hf_4607_dwell_sensor_heading, { "Sensor Orientation Heading", "s4607.dwell.sensor.heading", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_pitch, { "Sensor Orientation Pitch", "s4607.dwell.sensor.pitch", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_roll, { "Sensor Orientation Roll (Bank Angle)", "s4607.dwell.sensor.roll", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_mdv, { "Minimum Detectable Velocity (MDV)", "s4607.dwell.mdv", FT_UINT8, BASE_CUSTOM, - prt_speed_deci, 0x0, + CF_FUNC(prt_speed_deci), 0x0, NULL, HFILL } }, @@ -1223,13 +1223,13 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_lat, { "Target Location Hi-Res Latitude", "s4607.dwell.rpt.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_lon, { "Target Location Hi-Res Longitude", "s4607.dwell.rpt.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, @@ -1251,7 +1251,7 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_height, { "Target Location Geodetic Height", "s4607.dwell.rpt.height", FT_INT16, BASE_CUSTOM, - prt_meters, 0x0, + CF_FUNC(prt_meters), 0x0, NULL, HFILL } }, @@ -1259,13 +1259,13 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_radial, { "Target Velocity Line of Sight Component", "s4607.dwell.rpt.radial", FT_INT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_wrap, { "Target Wrap Velocity", "s4607.dwell.rpt.wrap", FT_UINT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_snr, @@ -1291,25 +1291,25 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_unc_slant, { "Target Measurement Uncertainty Slant Range", "s4607.dwell.rpt.unc.slant", FT_UINT16, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_unc_cross, { "Target Measurement Uncertainty Cross Range", "s4607.dwell.rpt.unc.cross", FT_UINT16, BASE_CUSTOM, - prt_decimeters, 0x0, + CF_FUNC(prt_decimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_unc_height, { "Target Measurement Uncertainty Height", "s4607.dwell.rpt.unc.height", FT_UINT8, BASE_CUSTOM, - prt_meters, 0x0, + CF_FUNC(prt_meters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_unc_radial, { "Target Measurement Uncertainty Radial Velocity", "s4607.dwell.rpt.unc.radial", FT_UINT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, @@ -1370,50 +1370,50 @@ proto_register_stanag4607(void) { &hf_4607_jobdef_ba_lat_a, { "Bounding Area Point A Latitude", "s4607.job.ba.lat.a", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_a, { "Bounding Area Point A Longitude", "s4607.job.ba.lon.a", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lat_b, { "Bounding Area Point B Latitude", "s4607.job.ba.lat.b", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_b, { "Bounding Area Point B Longitude", "s4607.job.ba.lon.b", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lat_c, { "Bounding Area Point C Latitude", "s4607.job.ba.lat.c", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_c, { "Bounding Area Point C Longitude", "s4607.job.ba.lon.c", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lat_d, { "Bounding Area Point D Latitude", "s4607.job.ba.lat.d", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_d, { "Bounding Area Point D Longitude", "s4607.job.ba.lon.d", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, @@ -1433,68 +1433,68 @@ proto_register_stanag4607(void) { &hf_4607_jobdef_unc_along, { "Nominal Sensor Position Uncertainty Along Track", "s4607.job.unc.track", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_cross, { "Nominal Sensor Position Uncertainty Cross Track", "s4607.job.unc.cross", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_alt, { "Nominal Sensor Position Uncertainty Altitude", "s4607.job.unc.alt", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_heading, { "Nominal Sensor Position Uncertainty Track Heading", "s4607.job.unc.heading", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_speed, { "Nominal Sensor Position Uncertainty Speed", "s4607.job.unc.speed", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_slant, { "Nominal Sensor Slant Range Standard Deviation", "s4607.job.sense.slant", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_cross, { "Nominal Sensor Cross Range Standard Deviation", "s4607.job.sense.cross", FT_UINT16, BASE_CUSTOM, - prt_ba16_none, 0x0, + CF_FUNC(prt_ba16_none), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_vlos, { "Nominal Sensor Velocity Line-Of-Sight Std. Dev", "s4607.job.sense.vlos", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_mdv, { "Nominal Sensor Minimum Dectectable Velocity (MDV)", "s4607.job.sense.mdv", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_prob, { "Nominal Sensor Detection Probability", "s4607.job.sense.prob", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_alarm, { "Nominal Sensor False Alarm Density", "s4607.job.sense.alarm", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_terrain_model, @@ -1559,43 +1559,43 @@ proto_register_stanag4607(void) { &hf_4607_platloc_time, { "Platform Location Time", "s4607.ploc.time", FT_UINT32, BASE_CUSTOM, - prt_millisec, 0x0, + CF_FUNC(prt_millisec), 0x0, NULL, HFILL } }, { &hf_4607_platloc_latitude, { "Platform Position Latitude", "s4607.ploc.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_platloc_longitude, { "Platform Position Longitude", "s4607.ploc.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_platloc_altitude, { "Platform Position Altitude", "s4607.ploc.alt", FT_INT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_platloc_track, { "Platform Track", "s4607.ploc.track", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_platloc_speed, { "Platform Speed", "s4607.ploc.speed", FT_UINT32, BASE_CUSTOM, - prt_speed, 0x0, + CF_FUNC(prt_speed), 0x0, NULL, HFILL } }, { &hf_4607_platloc_vertical_velocity, { "Platform Vertical Velocity", "s4607.ploc.velocity", FT_INT8, BASE_CUSTOM, - prt_speed_deci, 0x0, + CF_FUNC(prt_speed_deci), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 30d0fa3bdf..014cd38477 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -4329,7 +4329,7 @@ proto_register_ua3g(void) { &hf_ua3g_ua_dwl_protocol_cause, { "Cause", "ua3g.ua_dwl_protocol.cause", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ua_dwl_protocol_force_mode, { "Force Mode", "ua3g.ua_dwl_protocol.force_mode", FT_UINT8, BASE_DEC, VALS(str_download_req_force_mode), 0x0, NULL, HFILL }}, { &hf_ua3g_ua_dwl_protocol_item_version, { "Item Version", "ua3g.ua_dwl_protocol.item_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ua3g_ua_dwl_protocol_item_version_nc, { "Item Version", "ua3g.ua_dwl_protocol.item_version", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, + { &hf_ua3g_ua_dwl_protocol_item_version_nc, { "Item Version", "ua3g.ua_dwl_protocol.item_version", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, { &hf_ua3g_ua_dwl_protocol_binary_length, { "Binary Length", "ua3g.ua_dwl_protocol.binary_length", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ua_dwl_protocol_packet_number, { "Packet Number", "ua3g.ua_dwl_protocol.packet_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ua_dwl_protocol_download_ack_status, { "Status", "ua3g.ua_dwl_protocol.download_ack_status", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &str_download_ack_status_ext, 0x0, NULL, HFILL }}, @@ -4355,11 +4355,11 @@ proto_register_ua3g(void) { &hf_ua3g_unsolicited_msg_other_information_1, { "Other Information 1", "ua3g.unsolicited_msg.other_information_1", FT_UINT8, BASE_DEC, VALS(str_unsolicited_msg_other_info_1), 0x0, NULL, HFILL }}, { &hf_ua3g_unsolicited_msg_hardware_version, { "Hardware Version", "ua3g.unsolicited_msg.hardware_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_unsolicited_msg_other_information_2, { "Other Information 2", "ua3g.unsolicited_msg.other_information_2", FT_UINT8, BASE_DEC, VALS(str_unsolicited_msg_other_info_2), 0x0, NULL, HFILL }}, - { &hf_ua3g_unsolicited_msg_firmware_datas_patch_version, { "Firmware Datas Patch Version", "ua3g.unsolicited_msg.firmware_datas_patch_version", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, - { &hf_ua3g_unsolicited_msg_firmware_version_loader, { "Firmware Version (Loader)", "ua3g.unsolicited_msg.firmware_version_loader", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, - { &hf_ua3g_unsolicited_msg_firmware_version, { "Firmware Version", "ua3g.unsolicited_msg.firmware_version", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, - { &hf_ua3g_unsolicited_msg_datas_version, { "Datas Version", "ua3g.unsolicited_msg.datas_version", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, - { &hf_ua3g_unsolicited_msg_firmware_version_bootloader, { "Firmware Version (Bootloader)", "ua3g.unsolicited_msg.firmware_version_bootloader", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, + { &hf_ua3g_unsolicited_msg_firmware_datas_patch_version, { "Firmware Datas Patch Version", "ua3g.unsolicited_msg.firmware_datas_patch_version", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, + { &hf_ua3g_unsolicited_msg_firmware_version_loader, { "Firmware Version (Loader)", "ua3g.unsolicited_msg.firmware_version_loader", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, + { &hf_ua3g_unsolicited_msg_firmware_version, { "Firmware Version", "ua3g.unsolicited_msg.firmware_version", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, + { &hf_ua3g_unsolicited_msg_datas_version, { "Datas Version", "ua3g.unsolicited_msg.datas_version", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, + { &hf_ua3g_unsolicited_msg_firmware_version_bootloader, { "Firmware Version (Bootloader)", "ua3g.unsolicited_msg.firmware_version_bootloader", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, { &hf_ua3g_unsolicited_msg_opcode_of_bad_command, { "Opcode Of Bad Command", "ua3g.unsolicited_msg.opcode_of_bad_command", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_unsolicited_msg_next_byte_of_bad_command, { "Next Byte Of Bad Command", "ua3g.unsolicited_msg.next_byte_of_bad_command", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_unsolicited_msg_subdevice_address, { "Subdevice Address", "ua3g.unsolicited_msg.subdevice_address", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -4479,7 +4479,7 @@ proto_register_ua3g(void) { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_uint, { "Value", "ua3g.ip.cs.cmd02.parameter.uint", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_default_codec_bytes, { "Default Codec", "ua3g.ip.cs.cmd02.parameter.default_codec.bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_default_codec_uint, { "Default Codec", "ua3g.ip.cs.cmd02.parameter.default_codec.uint", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_firmware_version, { "Firmware Version", "ua3g.ip.cs.cmd02.parameter.firmware_version", FT_UINT16, BASE_CUSTOM, version_number_computer, 0x0, NULL, HFILL }}, + { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_firmware_version, { "Firmware Version", "ua3g.ip.cs.cmd02.parameter.firmware_version", FT_UINT16, BASE_CUSTOM, CF_FUNC(version_number_computer), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed, { "Port Lan Speed", "ua3g.ip.cs.cmd02.parameter.eth_driver_config.port_lan_speed", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex, { "Port Lan Duplex", "ua3g.ip.cs.cmd02.parameter.eth_driver_config.port_lan_duplex", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_speed, { "Port PC Speed", "ua3g.ip.cs.cmd02.parameter.eth_driver_config.port_pc_speed", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 6986dfb3ce..1cc9e35c38 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -2881,7 +2881,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_command_element_shutdown_ip, - {"Command Extension Length", "wccp.command_element_shudown_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + {"Command Extension Length", "wccp.command_element_shudown_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_service_info_type, @@ -2961,7 +2961,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_router_identity_ip, - { "IP Address", "wccp.router_identity.ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "IP Address", "wccp.router_identity.ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_identity_receive_id, @@ -2969,7 +2969,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_router_identity_send_to_ip, - { "Sent To IP Address", "wccp.router_identity.send_to_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Sent To IP Address", "wccp.router_identity.send_to_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_identity_received_from_num, @@ -2977,7 +2977,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_web_cache_identity_ip, - { "Web-Cache IP Address", "wccp.web_cache_identity.ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Web-Cache IP Address", "wccp.web_cache_identity.ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_web_cache_identity_hash_rev, @@ -3016,7 +3016,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_assignment_key_ip, - { "Assignment Key IP Address", "wccp.assignment_key.ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Assignment Key IP Address", "wccp.assignment_key.ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_assignment_key_change_num, @@ -3032,11 +3032,11 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_router_identity_router_ip, - { "Router IP Address", "wccp.router_identity.router_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Router IP Address", "wccp.router_identity.router_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_identity_received_from_ip, - { "Received From IP Address/Target Web Cache IP", "wccp.router_identity.received_from_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Received From IP Address/Target Web Cache IP", "wccp.router_identity.received_from_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_wc_view_info_change_num, @@ -3044,11 +3044,11 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_wc_view_info_router_ip, - { "Router IP", "wccp.wc_view_info.router_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Router IP", "wccp.wc_view_info.router_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_wc_view_info_wc_ip, - { "Web Cache IP", "wccp.wc_view_info.wc_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Web Cache IP", "wccp.wc_view_info.wc_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_wc_view_router_num, @@ -3060,7 +3060,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_wc_identity_ip_address, - { "Web Cache Identity", "wccp.hf_wc_identity_ip_address", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Web Cache Identity", "wccp.hf_wc_identity_ip_address", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, "The IP identifying the Web Cache", HFILL } }, { &hf_router_assignment_element_change_num, @@ -3072,7 +3072,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_assignment_info_router_ip, - { "Router IP", "wccp.assignment_info.router_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Router IP", "wccp.assignment_info.router_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_hash_buckets_assignment_wc_num, @@ -3080,23 +3080,23 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_hash_buckets_assignment_wc_ip, - { "WC IP", "wccp.hash_buckets_assignment.wc_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "WC IP", "wccp.hash_buckets_assignment.wc_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_view_ip, - { "Router IP Address", "wccp.router_view.ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Router IP Address", "wccp.router_view.ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_query_info_ip, - { "Web-Cache Identity Element IP address", "wccp.router_query_info.ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Web-Cache Identity Element IP address", "wccp.router_query_info.ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_query_info_send_to_ip, - { "Sent To IP Address", "wccp.router_query_info.send_to_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Sent To IP Address", "wccp.router_query_info.send_to_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_router_query_info_target_ip, - { "Target IP Address", "wccp.router_query_info.target_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Target IP Address", "wccp.router_query_info.target_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_capability_element_type, @@ -3172,11 +3172,11 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_value_element_src_ip, - { "Source Address", "wccp.value_element.src_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Source Address", "wccp.value_element.src_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_value_element_dest_ip, - { "Destination Address", "wccp.value_element.dest_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Destination Address", "wccp.value_element.dest_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_value_element_src_port, @@ -3188,7 +3188,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_value_element_web_cache_ip, - { "Web Cache Address", "wccp.value_element.web_cache_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Web Cache Address", "wccp.value_element.web_cache_ip", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_mask_value_set_list_num_elements, @@ -3244,7 +3244,7 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_web_cache_value_element_wc_address, - { "Web-Cache Address", "wccp.web_cache_value_element.wc_address", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Web-Cache Address", "wccp.web_cache_value_element.wc_address", FT_UINT32, BASE_CUSTOM, CF_FUNC(wccp_fmt_ipadddress), 0x0, NULL, HFILL } }, { &hf_web_cache_value_element_num_values, @@ -3386,4 +3386,3 @@ proto_reg_handoff_wccp(void) * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index e998022685..ed5d9b7864 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -680,11 +680,11 @@ proto_register_zbee_zcl_identify(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_identify_identify_time, - { "Identify Time", "zbee_zcl_general.identify.attr.identify_time", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_seconds, + { "Identify Time", "zbee_zcl_general.identify.attr.identify_time", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_seconds), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_identify_identify_timeout, - { "Identify Timeout", "zbee_zcl_general.identify.identify_timeout", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_seconds, + { "Identify Timeout", "zbee_zcl_general.identify.identify_timeout", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_seconds), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_identify_srv_rx_cmd_id, @@ -2579,7 +2579,7 @@ void proto_register_zbee_zcl_ota(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_query_jitter, - { "Query Jitter", "zbee_zcl_general.ota.query_jitter", FT_UINT8, BASE_CUSTOM, decode_zcl_time_in_seconds, + { "Query Jitter", "zbee_zcl_general.ota.query_jitter", FT_UINT8, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_seconds), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_manufacturer_code, @@ -2637,7 +2637,7 @@ void proto_register_zbee_zcl_ota(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_image_size, - { "Image Size", "zbee_zcl_general.ota.image.size", FT_UINT32, BASE_CUSTOM, decode_zcl_ota_size_in_bytes, + { "Image Size", "zbee_zcl_general.ota.image.size", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_zcl_ota_size_in_bytes), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_file_offset, @@ -2653,7 +2653,7 @@ void proto_register_zbee_zcl_ota(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_page_size, - { "Page Size", "zbee_zcl_general.ota.page.size", FT_UINT16, BASE_CUSTOM, decode_zcl_ota_size_in_bytes, + { "Page Size", "zbee_zcl_general.ota.page.size", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_ota_size_in_bytes), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_rsp_spacing, @@ -2661,15 +2661,15 @@ void proto_register_zbee_zcl_ota(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_ota_current_time, - { "Current Time", "zbee_zcl_general.ota.current_time", FT_UINT32, BASE_CUSTOM, decode_zcl_ota_curr_time, + { "Current Time", "zbee_zcl_general.ota.current_time", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_zcl_ota_curr_time), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_ota_request_time, - { "Request Time", "zbee_zcl_general.ota.request_time", FT_UINT32, BASE_CUSTOM, decode_zcl_ota_req_time, + { "Request Time", "zbee_zcl_general.ota.request_time", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_zcl_ota_req_time), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_ota_upgrade_time, - { "Upgrade Time", "zbee_zcl_general.ota.upgrade_time", FT_UINT32, BASE_CUSTOM, decode_zcl_ota_upgr_time, + { "Upgrade Time", "zbee_zcl_general.ota.upgrade_time", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_zcl_ota_upgr_time), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_ota_data_size, @@ -3719,7 +3719,7 @@ proto_register_zbee_zcl_pwr_prof(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_pwr_prof_id, - { "Power Profile ID", "zbee_zcl_general.pwrprof.pwrprofid", FT_UINT8, BASE_CUSTOM, decode_power_profile_id, 0x00, + { "Power Profile ID", "zbee_zcl_general.pwrprof.pwrprofid", FT_UINT8, BASE_CUSTOM, CF_FUNC(decode_power_profile_id), 0x00, "Identifier of the specific profile", HFILL } }, { &hf_zbee_zcl_pwr_prof_currency, @@ -3727,7 +3727,7 @@ proto_register_zbee_zcl_pwr_prof(void) "Local unit of currency (ISO 4217) used in the price field.", HFILL } }, { &hf_zbee_zcl_pwr_prof_price, - { "Price", "zbee_zcl_general.pwrprof.price", FT_UINT32, BASE_CUSTOM, decode_price_in_cents, 0x0, + { "Price", "zbee_zcl_general.pwrprof.price", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_price_in_cents), 0x0, "Price of the energy of a specific Power Profile.", HFILL } }, { &hf_zbee_zcl_pwr_prof_price_trailing_digit, @@ -3743,7 +3743,7 @@ proto_register_zbee_zcl_pwr_prof(void) "Identifier of the specific phase.", HFILL } }, { &hf_zbee_zcl_pwr_prof_scheduled_time, - { "Scheduled Time", "zbee_zcl_general.pwrprof.scheduledtime", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_minutes, 0x0, + { "Scheduled Time", "zbee_zcl_general.pwrprof.scheduledtime", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_minutes), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_macro_phase_id, @@ -3751,7 +3751,7 @@ proto_register_zbee_zcl_pwr_prof(void) "Identifier of the specific energy phase.", HFILL } }, { &hf_zbee_zcl_pwr_prof_expect_duration, - { "Expected Duration", "zbee_zcl_general.pwrprof.expecduration", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_minutes, 0x0, + { "Expected Duration", "zbee_zcl_general.pwrprof.expecduration", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_minutes), 0x0, "The estimated duration of the specific phase.", HFILL } }, { &hf_zbee_zcl_pwr_prof_num_of_trans_phases, @@ -3759,15 +3759,15 @@ proto_register_zbee_zcl_pwr_prof(void) NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_peak_power, - { "Peak Power", "zbee_zcl_general.pwrprof.peakpower", FT_UINT16, BASE_CUSTOM, decode_power_in_watt, 0x0, + { "Peak Power", "zbee_zcl_general.pwrprof.peakpower", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_power_in_watt), 0x0, "The estimated power for the specific phase.", HFILL } }, { &hf_zbee_zcl_pwr_prof_energy, - { "Energy", "zbee_zcl_general.pwrprof.energy", FT_UINT16, BASE_CUSTOM, decode_energy, 0x0, + { "Energy", "zbee_zcl_general.pwrprof.energy", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_energy), 0x0, "The estimated energy consumption for the accounted phase.", HFILL } }, { &hf_zbee_zcl_pwr_prof_max_active_delay, - { "Max Activation Delay", "zbee_zcl_general.pwrprof.maxactivdelay", FT_UINT16, BASE_CUSTOM, func_decode_delayinminute, 0x0, + { "Max Activation Delay", "zbee_zcl_general.pwrprof.maxactivdelay", FT_UINT16, BASE_CUSTOM, CF_FUNC(func_decode_delayinminute), 0x0, "The maximum interruption time between the end of the previous phase and the beginning of the specific phase.", HFILL } }, { &hf_zbee_zcl_pwr_prof_pwr_prof_count, @@ -3783,11 +3783,11 @@ proto_register_zbee_zcl_pwr_prof(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_start_after, - { "Start After", "zbee_zcl_general.pwrprof.startafter", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_minutes, 0x0, + { "Start After", "zbee_zcl_general.pwrprof.startafter", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_minutes), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_pwr_prof_stop_before, - { "Stop Before", "zbee_zcl_general.pwrprof.stopbefore", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_minutes, 0x0, + { "Stop Before", "zbee_zcl_general.pwrprof.stopbefore", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_minutes), 0x0, NULL, HFILL } }, /* Begin Options fields */ @@ -3805,7 +3805,7 @@ proto_register_zbee_zcl_pwr_prof(void) /* End Options fields */ { &hf_zbee_zcl_pwr_prof_pwr_prof_stime, - { "Power Profile Start Time", "zbee_zcl_general.pwrprof.pwrprofstime", FT_UINT16, BASE_CUSTOM, decode_zcl_time_in_minutes, 0x0, + { "Power Profile Start Time", "zbee_zcl_general.pwrprof.pwrprofstime", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_time_in_minutes), 0x0, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index a32fbaf4a8..78022eb3f4 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -1366,7 +1366,7 @@ proto_register_zbee_zcl_appl_stats(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_appl_stats_utc_time, - { "UTC Time", "zbee_zcl_ha.applstats.utc_time", FT_UINT32, BASE_CUSTOM, decode_zcl_appl_stats_utc_time, + { "UTC Time", "zbee_zcl_ha.applstats.utc_time", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_zcl_appl_stats_utc_time), 0x0, NULL, HFILL }}, { &hf_zbee_zcl_appl_stats_log_length, diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index 34b27341b1..7e8afd8aee 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -313,19 +313,19 @@ proto_register_zbee_zcl_illum_meas(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_illum_meas_measured_value, - { "Measured Value", "zbee_zcl_meas_sensing.illummeas.attr.value", FT_UINT16, BASE_CUSTOM, decode_illum_meas_value, + { "Measured Value", "zbee_zcl_meas_sensing.illummeas.attr.value", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_illum_meas_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_illum_meas_min_measured_value, - { "Min Measured Value", "zbee_zcl_meas_sensing.illummeas.attr.value.min", FT_UINT16, BASE_CUSTOM, decode_illum_meas_min_value, + { "Min Measured Value", "zbee_zcl_meas_sensing.illummeas.attr.value.min", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_illum_meas_min_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_illum_meas_max_measured_value, - { "Max Measured Value", "zbee_zcl_meas_sensing.illummeas.attr.value.max", FT_UINT16, BASE_CUSTOM, decode_illum_meas_max_value, + { "Max Measured Value", "zbee_zcl_meas_sensing.illummeas.attr.value.max", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_illum_meas_max_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_illum_meas_tolerance, - { "Tolerance", "zbee_zcl_meas_sensing.illummeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, decode_illum_meas_tolerance, + { "Tolerance", "zbee_zcl_meas_sensing.illummeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_illum_meas_tolerance), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_illum_meas_sensor_type, @@ -628,19 +628,19 @@ proto_register_zbee_zcl_temp_meas(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_temp_meas_measured_value, - { "Measured Value", "zbee_zcl_meas_sensing.tempmeas.attr.value", FT_INT16, BASE_CUSTOM, decode_temp_meas_value, + { "Measured Value", "zbee_zcl_meas_sensing.tempmeas.attr.value", FT_INT16, BASE_CUSTOM, CF_FUNC(decode_temp_meas_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_temp_meas_min_measured_value, - { "Min Measured Value", "zbee_zcl_meas_sensing.tempmeas.attr.value.min", FT_INT16, BASE_CUSTOM, decode_temp_meas_min_value, + { "Min Measured Value", "zbee_zcl_meas_sensing.tempmeas.attr.value.min", FT_INT16, BASE_CUSTOM, CF_FUNC(decode_temp_meas_min_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_temp_meas_max_measured_value, - { "Max Measured Value", "zbee_zcl_meas_sensing.tempmeas.attr.value.max", FT_INT16, BASE_CUSTOM, decode_temp_meas_max_value, + { "Max Measured Value", "zbee_zcl_meas_sensing.tempmeas.attr.value.max", FT_INT16, BASE_CUSTOM, CF_FUNC(decode_temp_meas_max_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_temp_meas_tolerance, - { "Tolerance", "zbee_zcl_meas_sensing.tempmeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, decode_temp_meas_tolerance, + { "Tolerance", "zbee_zcl_meas_sensing.tempmeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_temp_meas_tolerance), 0x00, NULL, HFILL } } }; @@ -980,19 +980,19 @@ proto_register_zbee_zcl_press_meas(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_press_meas_measured_value, - { "Measured Value", "zbee_zcl_meas_sensing.pressmeas.attr.value", FT_INT16, BASE_CUSTOM, decode_press_meas_value, + { "Measured Value", "zbee_zcl_meas_sensing.pressmeas.attr.value", FT_INT16, BASE_CUSTOM, CF_FUNC(decode_press_meas_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_press_meas_min_measured_value, - { "Min Measured Value", "zbee_zcl_meas_sensing.pressmeas.attr.value.min", FT_INT16, BASE_CUSTOM, decode_press_meas_min_value, + { "Min Measured Value", "zbee_zcl_meas_sensing.pressmeas.attr.value.min", FT_INT16, BASE_CUSTOM, CF_FUNC(decode_press_meas_min_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_press_meas_max_measured_value, - { "Max Measured Value", "zbee_zcl_meas_sensing.pressmeas.attr.value.max", FT_INT16, BASE_CUSTOM, decode_press_meas_max_value, + { "Max Measured Value", "zbee_zcl_meas_sensing.pressmeas.attr.value.max", FT_INT16, BASE_CUSTOM, CF_FUNC(decode_press_meas_max_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_press_meas_tolerance, - { "Tolerance", "zbee_zcl_meas_sensing.pressmeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, decode_press_meas_tolerance, + { "Tolerance", "zbee_zcl_meas_sensing.pressmeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_press_meas_tolerance), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_press_meas_scaled_value, @@ -1308,19 +1308,19 @@ proto_register_zbee_zcl_relhum_meas(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_relhum_meas_measured_value, - { "Measured Value", "zbee_zcl_meas_sensing.relhummeas.attr.value", FT_UINT16, BASE_CUSTOM, decode_relhum_meas_value, + { "Measured Value", "zbee_zcl_meas_sensing.relhummeas.attr.value", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_relhum_meas_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_relhum_meas_min_measured_value, - { "Min Measured Value", "zbee_zcl_meas_sensing.relhummeas.attr.value.min", FT_UINT16, BASE_CUSTOM, decode_relhum_meas_min_value, + { "Min Measured Value", "zbee_zcl_meas_sensing.relhummeas.attr.value.min", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_relhum_meas_min_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_relhum_meas_max_measured_value, - { "Max Measured Value", "zbee_zcl_meas_sensing.relhummeas.attr.value.max", FT_UINT16, BASE_CUSTOM, decode_relhum_meas_max_value, + { "Max Measured Value", "zbee_zcl_meas_sensing.relhummeas.attr.value.max", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_relhum_meas_max_value), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_relhum_meas_tolerance, - { "Tolerance", "zbee_zcl_meas_sensing.relhummeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, decode_relhum_meas_tolerance, + { "Tolerance", "zbee_zcl_meas_sensing.relhummeas.attr.tolerance", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_relhum_meas_tolerance), 0x00, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index 59e2d621c6..46fe2f5f15 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -660,11 +660,11 @@ proto_register_zbee_zcl_msg(void) /* End of 'Extended Message Control' fields */ { &hf_zbee_zcl_msg_start_time, - { "Start Time", "zbee_zcl_se.msg.message.start_time", FT_UINT32, BASE_CUSTOM, decode_zcl_msg_start_time, + { "Start Time", "zbee_zcl_se.msg.message.start_time", FT_UINT32, BASE_CUSTOM, CF_FUNC(decode_zcl_msg_start_time), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_msg_duration, - { "Duration", "zbee_zcl_se.msg.message.duration", FT_UINT16, BASE_CUSTOM, decode_zcl_msg_duration, + { "Duration", "zbee_zcl_se.msg.message.duration", FT_UINT16, BASE_CUSTOM, CF_FUNC(decode_zcl_msg_duration), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_msg_message_length, |