diff options
Diffstat (limited to 'epan/dissectors/packet-gsm_a_dtap.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 2197 |
1 files changed, 1097 insertions, 1100 deletions
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index ca71835d..25d58791 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -7,8 +7,8 @@ * In association with Telos Technology Inc. * * - * Added the GPRS Mobility Managment Protocol and - * the GPRS Session Managment Protocol + * Added the GPRS Mobility Management Protocol and + * the GPRS Session Management Protocol * Copyright 2004, Rene Pilz <rene.pilz [AT] ftw.com> * In association with Telecommunications Research Center * Vienna (ftw.)Betriebs-GmbH within the Project Metawin. @@ -105,12 +105,15 @@ #include <epan/expert.h> #include <epan/tap.h> #include <epan/strutil.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> + +#include <wsutil/array.h> #include "packet-bssap.h" #include "packet-ber.h" #include "packet-q931.h" #include "packet-gsm_a_common.h" -#include "packet-ppp.h" #include "packet-isup.h" void proto_register_gsm_a_dtap(void); @@ -379,7 +382,7 @@ static const value_string gsm_dtap_elem_strings[] = { }; value_string_ext gsm_dtap_elem_strings_ext = VALUE_STRING_EXT_INIT(gsm_dtap_elem_strings); -const gchar *gsm_a_pd_str[] = { +const char *gsm_a_pd_str[] = { "Group Call Control", "Broadcast Call Control", "EPS session management messages", @@ -456,309 +459,309 @@ static const true_false_string tfs_acceptable_not_acceptable = { "Acceptable", " #define DTAP_TP_IEI_MASK 0xff /* Initialize the protocol and registered fields */ -static int proto_a_dtap = -1; - -static int hf_gsm_a_dtap_msg_gcc_type = -1; -static int hf_gsm_a_dtap_msg_bcc_type = -1; -static int hf_gsm_a_dtap_msg_mm_type = -1; -static int hf_gsm_a_dtap_msg_cc_type = -1; -static int hf_gsm_a_seq_no = -1; -static int hf_gsm_a_dtap_msg_sms_type = -1; -static int hf_gsm_a_dtap_msg_ss_type = -1; -static int hf_gsm_a_dtap_msg_tp_type = -1; -int hf_gsm_a_dtap_elem_id = -1; -static int hf_gsm_a_dtap_cld_party_bcd_num = -1; -static int hf_gsm_a_dtap_clg_party_bcd_num = -1; -static int hf_gsm_a_dtap_conn_num = -1; -static int hf_gsm_a_dtap_red_party_bcd_num = -1; -static int hf_gsm_a_dtap_present_ind = -1; -static int hf_gsm_a_dtap_screening_ind = -1; -static int hf_gsm_a_dtap_type_of_sub_addr = -1; -static int hf_gsm_a_dtap_odd_even_ind = -1; - -static int hf_gsm_a_dtap_cause = -1; -static int hf_gsm_a_dtap_cause_ss_diagnostics = -1; -static int hf_gsm_a_dtap_emergency_bcd_num = -1; -static int hf_gsm_a_dtap_emerg_num_info_length = -1; - -static int hf_gsm_a_dtap_type_of_number = -1; -static int hf_gsm_a_dtap_numbering_plan_id = -1; - -static int hf_gsm_a_dtap_lsa_id = -1; -static int hf_gsm_a_dtap_speech_vers_ind = -1; -static int hf_gsm_a_dtap_itc = -1; -static int hf_gsm_a_dtap_sysid = -1; -static int hf_gsm_a_dtap_bitmap_length = -1; -static int hf_gsm_a_dtap_serv_cat_b7 = -1; -static int hf_gsm_a_dtap_serv_cat_b6 = -1; -static int hf_gsm_a_dtap_serv_cat_b5 = -1; -static int hf_gsm_a_dtap_serv_cat_b4 = -1; -static int hf_gsm_a_dtap_serv_cat_b3 = -1; -static int hf_gsm_a_dtap_serv_cat_b2 = -1; -static int hf_gsm_a_dtap_serv_cat_b1 = -1; -static int hf_gsm_a_dtap_drvcc = -1; -static int hf_gsm_a_dtap_csmo = -1; -static int hf_gsm_a_dtap_csmt = -1; -static int hf_gsm_a_dtap_mm_timer_unit = -1; -static int hf_gsm_a_dtap_mm_timer_value = -1; -static int hf_gsm_a_dtap_alerting_pattern = -1; -static int hf_gsm_a_dtap_ccbs_activation = -1; -static int hf_gsm_a_dtap_stream_identifier = -1; -static int hf_gsm_a_dtap_mcs = -1; -static int hf_gsm_a_dtap_cause_of_no_cli = -1; -static int hf_gsm_a_dtap_signal_value = -1; - -static int hf_gsm_a_dtap_codec_tdma_efr = -1; -static int hf_gsm_a_dtap_codec_umts_amr_2 = -1; -static int hf_gsm_a_dtap_codec_umts_amr = -1; -static int hf_gsm_a_dtap_codec_hr_amr = -1; -static int hf_gsm_a_dtap_codec_fr_amr = -1; -static int hf_gsm_a_dtap_codec_gsm_efr = -1; -static int hf_gsm_a_dtap_codec_gsm_hr = -1; -static int hf_gsm_a_dtap_codec_gsm_fr = -1; -static int hf_gsm_a_dtap_codec_umts_evs = -1; -static int hf_gsm_a_dtap_codec_ohr_amr_wb = -1; -static int hf_gsm_a_dtap_codec_ofr_amr_wb = -1; -static int hf_gsm_a_dtap_codec_ohr_amr = -1; -static int hf_gsm_a_dtap_codec_umts_amr_wb = -1; -static int hf_gsm_a_dtap_codec_fr_amr_wb = -1; -static int hf_gsm_a_dtap_codec_pdc_efr = -1; - -static int hf_gsm_a_dtap_notification_description = -1; -static int hf_gsm_a_dtap_recall_type = -1; -static int hf_gsm_a_dtap_coding_standard = -1; -static int hf_gsm_a_dtap_call_state = -1; -static int hf_gsm_a_dtap_prog_coding_standard = -1; -static int hf_gsm_a_dtap_location = -1; -static int hf_gsm_a_dtap_progress_description = -1; -static int hf_gsm_a_dtap_afi = -1; -static int hf_gsm_a_dtap_rej_cause = -1; -static int hf_gsm_a_dtap_timezone = -1; -static int hf_gsm_a_dtap_u2u_prot_discr = -1; -static int hf_gsm_a_dtap_mcat = -1; -static int hf_gsm_a_dtap_enicm = -1; -static int hf_gsm_a_dtap_rand = -1; -static int hf_gsm_a_dtap_autn = -1; -static int hf_gsm_a_dtap_xres = -1; -static int hf_gsm_a_dtap_sres = -1; -static int hf_gsm_a_dtap_auts = -1; -static int hf_gsm_a_dtap_autn_sqn_xor_ak = -1; -static int hf_gsm_a_dtap_autn_amf = -1; -static int hf_gsm_a_dtap_autn_mac = -1; -static int hf_gsm_a_dtap_auts_sqn_ms_xor_ak = -1; -static int hf_gsm_a_dtap_auts_mac_s = -1; - -static int hf_gsm_a_dtap_epc_ue_tl_mode = -1; -static int hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size = -1; -static int hf_gsm_a_dtap_epc_ue_tl_a_drb = -1; -static int hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay = -1; -static int hf_gsm_a_dtap_epc_ue_tl_c_mbsfn_area_id = -1; -static int hf_gsm_a_dtap_epc_ue_tl_c_mch_id = -1; -static int hf_gsm_a_dtap_epc_ue_tl_c_lcid = -1; -static int hf_gsm_a_dtap_epc_ue_tl_d_discovery = -1; -static int hf_gsm_a_dtap_epc_ue_tl_d_prose_app_code = -1; -static int hf_gsm_a_dtap_epc_ue_tl_e_communication = -1; -static int hf_gsm_a_dtap_epc_ue_tl_e_group_destination_id = -1; -static int hf_gsm_a_dtap_epc_ue_tl_f_sc_mtch_id = -1; -static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_loopback_op_mode = -1; -static int hf_gsm_a_dtap_epc_ue_tl_gh_repetitions = -1; -static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_data_delay = -1; -static int hf_gsm_a_dtap_epc_ue_positioning_technology = -1; -static int hf_gsm_a_dtap_epc_mbms_packet_counter_value = -1; -static int hf_gsm_a_dtap_epc_latitude_sign = -1; -static int hf_gsm_a_dtap_epc_degrees_latitude = -1; -static int hf_gsm_a_dtap_epc_degrees_longitude = -1; -static int hf_gsm_a_dtap_epc_altitude_dir = -1; -static int hf_gsm_a_dtap_epc_altitude = -1; -static int hf_gsm_a_dtap_epc_bearing = -1; -static int hf_gsm_a_dtap_epc_horizontal_speed = -1; -static int hf_gsm_a_dtap_epc_gnss_tod_msec = -1; +static int proto_a_dtap; + +static int hf_gsm_a_dtap_msg_gcc_type; +static int hf_gsm_a_dtap_msg_bcc_type; +static int hf_gsm_a_dtap_msg_mm_type; +static int hf_gsm_a_dtap_msg_cc_type; +static int hf_gsm_a_seq_no; +static int hf_gsm_a_dtap_msg_sms_type; +static int hf_gsm_a_dtap_msg_ss_type; +static int hf_gsm_a_dtap_msg_tp_type; +int hf_gsm_a_dtap_elem_id; +static int hf_gsm_a_dtap_cld_party_bcd_num; +static int hf_gsm_a_dtap_clg_party_bcd_num; +static int hf_gsm_a_dtap_conn_num; +static int hf_gsm_a_dtap_red_party_bcd_num; +static int hf_gsm_a_dtap_present_ind; +static int hf_gsm_a_dtap_screening_ind; +static int hf_gsm_a_dtap_type_of_sub_addr; +static int hf_gsm_a_dtap_odd_even_ind; + +static int hf_gsm_a_dtap_cause; +static int hf_gsm_a_dtap_cause_ss_diagnostics; +static int hf_gsm_a_dtap_emergency_bcd_num; +static int hf_gsm_a_dtap_emerg_num_info_length; + +static int hf_gsm_a_dtap_type_of_number; +static int hf_gsm_a_dtap_numbering_plan_id; + +static int hf_gsm_a_dtap_lsa_id; +static int hf_gsm_a_dtap_speech_vers_ind; +static int hf_gsm_a_dtap_itc; +static int hf_gsm_a_dtap_sysid; +static int hf_gsm_a_dtap_bitmap_length; +static int hf_gsm_a_dtap_serv_cat_b7; +static int hf_gsm_a_dtap_serv_cat_b6; +static int hf_gsm_a_dtap_serv_cat_b5; +static int hf_gsm_a_dtap_serv_cat_b4; +static int hf_gsm_a_dtap_serv_cat_b3; +static int hf_gsm_a_dtap_serv_cat_b2; +static int hf_gsm_a_dtap_serv_cat_b1; +static int hf_gsm_a_dtap_drvcc; +static int hf_gsm_a_dtap_csmo; +static int hf_gsm_a_dtap_csmt; +static int hf_gsm_a_dtap_mm_timer_unit; +static int hf_gsm_a_dtap_mm_timer_value; +static int hf_gsm_a_dtap_alerting_pattern; +static int hf_gsm_a_dtap_ccbs_activation; +static int hf_gsm_a_dtap_stream_identifier; +static int hf_gsm_a_dtap_mcs; +static int hf_gsm_a_dtap_cause_of_no_cli; +static int hf_gsm_a_dtap_signal_value; + +static int hf_gsm_a_dtap_codec_tdma_efr; +static int hf_gsm_a_dtap_codec_umts_amr_2; +static int hf_gsm_a_dtap_codec_umts_amr; +static int hf_gsm_a_dtap_codec_hr_amr; +static int hf_gsm_a_dtap_codec_fr_amr; +static int hf_gsm_a_dtap_codec_gsm_efr; +static int hf_gsm_a_dtap_codec_gsm_hr; +static int hf_gsm_a_dtap_codec_gsm_fr; +static int hf_gsm_a_dtap_codec_umts_evs; +static int hf_gsm_a_dtap_codec_ohr_amr_wb; +static int hf_gsm_a_dtap_codec_ofr_amr_wb; +static int hf_gsm_a_dtap_codec_ohr_amr; +static int hf_gsm_a_dtap_codec_umts_amr_wb; +static int hf_gsm_a_dtap_codec_fr_amr_wb; +static int hf_gsm_a_dtap_codec_pdc_efr; + +static int hf_gsm_a_dtap_notification_description; +static int hf_gsm_a_dtap_recall_type; +static int hf_gsm_a_dtap_coding_standard; +static int hf_gsm_a_dtap_call_state; +static int hf_gsm_a_dtap_prog_coding_standard; +static int hf_gsm_a_dtap_location; +static int hf_gsm_a_dtap_progress_description; +static int hf_gsm_a_dtap_afi; +static int hf_gsm_a_dtap_rej_cause; +static int hf_gsm_a_dtap_timezone; +static int hf_gsm_a_dtap_u2u_prot_discr; +static int hf_gsm_a_dtap_mcat; +static int hf_gsm_a_dtap_enicm; +static int hf_gsm_a_dtap_rand; +static int hf_gsm_a_dtap_autn; +static int hf_gsm_a_dtap_xres; +static int hf_gsm_a_dtap_sres; +static int hf_gsm_a_dtap_auts; +static int hf_gsm_a_dtap_autn_sqn_xor_ak; +static int hf_gsm_a_dtap_autn_amf; +static int hf_gsm_a_dtap_autn_mac; +static int hf_gsm_a_dtap_auts_sqn_ms_xor_ak; +static int hf_gsm_a_dtap_auts_mac_s; + +static int hf_gsm_a_dtap_epc_ue_tl_mode; +static int hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size; +static int hf_gsm_a_dtap_epc_ue_tl_a_drb; +static int hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay; +static int hf_gsm_a_dtap_epc_ue_tl_c_mbsfn_area_id; +static int hf_gsm_a_dtap_epc_ue_tl_c_mch_id; +static int hf_gsm_a_dtap_epc_ue_tl_c_lcid; +static int hf_gsm_a_dtap_epc_ue_tl_d_discovery; +static int hf_gsm_a_dtap_epc_ue_tl_d_prose_app_code; +static int hf_gsm_a_dtap_epc_ue_tl_e_communication; +static int hf_gsm_a_dtap_epc_ue_tl_e_group_destination_id; +static int hf_gsm_a_dtap_epc_ue_tl_f_sc_mtch_id; +static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_loopback_op_mode; +static int hf_gsm_a_dtap_epc_ue_tl_gh_repetitions; +static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_data_delay; +static int hf_gsm_a_dtap_epc_ue_positioning_technology; +static int hf_gsm_a_dtap_epc_mbms_packet_counter_value; +static int hf_gsm_a_dtap_epc_latitude_sign; +static int hf_gsm_a_dtap_epc_degrees_latitude; +static int hf_gsm_a_dtap_epc_degrees_longitude; +static int hf_gsm_a_dtap_epc_altitude_dir; +static int hf_gsm_a_dtap_epc_altitude; +static int hf_gsm_a_dtap_epc_bearing; +static int hf_gsm_a_dtap_epc_horizontal_speed; +static int hf_gsm_a_dtap_epc_gnss_tod_msec; /* Generated from convert_proto_tree_add_text.pl */ -static int hf_gsm_a_dtap_maximum_number_of_supported_bearers = -1; -static int hf_gsm_a_dtap_edge_channel_codings = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F9_6 = -1; -static int hf_gsm_a_dtap_assignor_assignee = -1; -static int hf_gsm_a_dtap_configuration = -1; -static int hf_gsm_a_dtap_de_cause_coding_standard = -1; -static int hf_gsm_a_dtap_ss_version_indicator = -1; -static int hf_gsm_a_dtap_mode_of_operation = -1; -static int hf_gsm_a_dtap_bearer_cap_coding_standard = -1; -static int hf_gsm_a_dtap_nirr = -1; -static int hf_gsm_a_dtap_other_rate_adaption = -1; -static int hf_gsm_a_dtap_connection_element = -1; -static int hf_gsm_a_dtap_nic_on_tx = -1; -static int hf_gsm_a_dtap_user_rate = -1; -static int hf_gsm_a_dtap_protocol_discriminator = -1; -static int hf_gsm_a_dtap_cp_cause = -1; -static int hf_gsm_a_dtap_rate_adaption_header = -1; -static int hf_gsm_a_dtap_synchronous = -1; -static int hf_gsm_a_dtap_logical_link_identifier_negotiation = -1; -static int hf_gsm_a_dtap_multi_party_auxiliary_state = -1; -static int hf_gsm_a_dtap_parity_information = -1; -static int hf_gsm_a_dtap_channel_coding03 = -1; -static int hf_gsm_a_dtap_channel_coding30 = -1; -static int hf_gsm_a_dtap_loop_mechanism0E = -1; -static int hf_gsm_a_dtap_loop_mechanism1C = -1; -static int hf_gsm_a_dtap_multislot_tch = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F43_2 = -1; -static int hf_gsm_a_dtap_ue_positioning_technology = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F4_8 = -1; -static int hf_gsm_a_dtap_number_of_spare_bits = -1; -static int hf_gsm_a_dtap_tie = -1; -static int hf_gsm_a_dtap_updating_type = -1; -static int hf_gsm_a_dtap_multiple_frame_establishment_support = -1; -static int hf_gsm_a_dtap_maximum_number_of_traffic_channels = -1; -static int hf_gsm_a_dtap_compression = -1; -static int hf_gsm_a_dtap_compression_up = -1; -static int hf_gsm_a_dtap_downlink_timeslot_offset = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F32_0 = -1; -static int hf_gsm_a_dtap_tio = -1; -static int hf_gsm_a_dtap_other_modem_type = -1; -static int hf_gsm_a_dtap_other_itc = -1; -static int hf_gsm_a_dtap_negotiation = -1; -static int hf_gsm_a_dtap_rate_adaption = -1; -static int hf_gsm_a_dtap_ms_positioning_technology = -1; -static int hf_gsm_a_dtap_ue_test_loop_mode = -1; -static int hf_gsm_a_dtap_number_of_data_bits = -1; -static int hf_gsm_a_dtap_follow_on_request = -1; -static int hf_gsm_a_dtap_repeat_indicator = -1; -static int hf_gsm_a_dtap_dst_adjustment = -1; -static int hf_gsm_a_dtap_pcp = -1; -static int hf_gsm_a_dtap_user_information_layer_2_protocol = -1; -static int hf_gsm_a_dtap_structure = -1; -static int hf_gsm_a_dtap_congestion_level = -1; -static int hf_gsm_a_dtap_access_identity = -1; -static int hf_gsm_a_dtap_modem_type = -1; -static int hf_gsm_a_dtap_test_loop = -1; -static int hf_gsm_a_dtap_subchannel = -1; -static int hf_gsm_a_dtap_ack_element = -1; -static int hf_gsm_a_dtap_layer_1_identity = -1; -static int hf_gsm_a_dtap_ciphering_key_sequence_number70 = -1; -static int hf_gsm_a_dtap_tp_pdu_description = -1; -static int hf_gsm_a_dtap_mode_flag = -1; -static int hf_gsm_a_dtap_egprs_mode_flag = -1; -static int hf_gsm_a_dtap_dtmf = -1; -static int hf_gsm_a_dtap_coding = -1; -static int hf_gsm_a_dtap_nic_on_rx = -1; -static int hf_gsm_a_dtap_emergency_number_information = -1; -static int hf_gsm_a_dtap_uimi = -1; -static int hf_gsm_a_dtap_number_of_stop_bits = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_spare78 = -1; -static int hf_gsm_a_dtap_type_of_identity = -1; -static int hf_gsm_a_dtap_ciphering_key_sequence_number = -1; -static int hf_gsm_a_dtap_recommendation = -1; -static int hf_gsm_a_dtap_max_num_of_speech_bearers = -1; -static int hf_gsm_a_dtap_keypad_information = -1; -static int hf_gsm_a_dtap_signalling_access_protocol = -1; -static int hf_gsm_a_dtap_user_information_layer_1_protocol = -1; -static int hf_gsm_a_dtap_wanted_air_interface_user_rate = -1; -static int hf_gsm_a_dtap_hold_auxiliary_state = -1; -static int hf_gsm_a_dtap_radio_channel_requirement = -1; -static int hf_gsm_a_dtap_channel_coding_asymmetry_indication = -1; -static int hf_gsm_a_dtap_service_type = -1; -static int hf_gsm_a_dtap_text_string = -1; -static int hf_gsm_a_dtap_tp_tested_device = -1; -static int hf_gsm_a_dtap_fixed_network_user_rate = -1; -static int hf_gsm_a_dtap_coding_scheme = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F28_8 = -1; -static int hf_gsm_a_dtap_v110_x30_rate_adaptation = -1; -static int hf_gsm_a_dtap_transfer_mode = -1; -static int hf_gsm_a_dtap_layer_2_identity = -1; -static int hf_gsm_a_dtap_add_ci = -1; -static int hf_gsm_a_dtap_mm_timer = -1; -static int hf_gsm_a_dtap_in_out_band = -1; -static int hf_gsm_a_dtap_data = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F14_4 = -1; -static int hf_gsm_a_dtap_ti_flag = -1; -static int hf_gsm_a_dtap_time_zone_time = -1; -static int hf_gsm_a_dtap_acceptable_channel_codings_spare20 = -1; -static int hf_gsm_a_dtap_establishment = -1; -static int hf_gsm_a_dtap_duplex_mode = -1; -static int hf_gsm_a_dtap_subaddress = -1; -static int hf_gsm_a_dtap_subaddress_information = -1; -static int hf_gsm_a_dtap_message_elements = -1; -static int hf_gsm_a_dtap_rpdu = -1; -static int hf_gsm_a_dtap_timeslot_number = -1; -static int hf_gsm_a_dtap_uplink_rlc_sdu_size = -1; -static int hf_gsm_a_dtap_radio_bearer = -1; -static int hf_gsm_a_dtap_mbms_short_transmission_identity = -1; -static int hf_gsm_a_dtap_ue_received_rlc_sdu_counter_value = -1; -static int hf_gsm_a_dtap_num_lb_entities = -1; - - -static int hf_gsm_a_dtap_gcc_call_ref = -1; -static int hf_gsm_a_dtap_gcc_call_ref_has_priority = -1; -static int hf_gsm_a_dtap_gcc_call_priority = -1; -static int hf_gsm_a_dtap_gcc_call_state = -1; -static int hf_gsm_a_dtap_gcc_cause = -1; -static int hf_gsm_a_dtap_gcc_cause_structure = -1; -static int hf_gsm_a_dtap_gcc_orig_ind = -1; -static int hf_gsm_a_dtap_gcc_state_attr = -1; -static int hf_gsm_a_dtap_gcc_state_attr_da = -1; -static int hf_gsm_a_dtap_gcc_state_attr_ua = -1; -static int hf_gsm_a_dtap_gcc_state_attr_comm = -1; -static int hf_gsm_a_dtap_gcc_state_attr_oi = -1; - -static int hf_gsm_a_dtap_gcc_spare_1 = -1; -static int hf_gsm_a_dtap_gcc_spare_3 = -1; -static int hf_gsm_a_dtap_gcc_spare_4 = -1; - -static int hf_gsm_a_dtap_bcc_call_ref = -1; -static int hf_gsm_a_dtap_bcc_call_ref_has_priority = -1; -static int hf_gsm_a_dtap_bcc_call_priority = -1; -static int hf_gsm_a_dtap_bcc_call_state = -1; -static int hf_gsm_a_dtap_bcc_cause = -1; -static int hf_gsm_a_dtap_bcc_cause_structure = -1; -static int hf_gsm_a_dtap_bcc_orig_ind = -1; -static int hf_gsm_a_dtap_bcc_state_attr = -1; -static int hf_gsm_a_dtap_bcc_state_attr_da = -1; -static int hf_gsm_a_dtap_bcc_state_attr_ua = -1; -static int hf_gsm_a_dtap_bcc_state_attr_comm = -1; -static int hf_gsm_a_dtap_bcc_state_attr_oi = -1; -static int hf_gsm_a_dtap_bcc_compr_otdi = -1; - -static int hf_gsm_a_dtap_bcc_spare_1 = -1; -static int hf_gsm_a_dtap_bcc_spare_3 = -1; -static int hf_gsm_a_dtap_bcc_spare_4 = -1; +static int hf_gsm_a_dtap_maximum_number_of_supported_bearers; +static int hf_gsm_a_dtap_edge_channel_codings; +static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F9_6; +static int hf_gsm_a_dtap_assignor_assignee; +static int hf_gsm_a_dtap_configuration; +static int hf_gsm_a_dtap_de_cause_coding_standard; +static int hf_gsm_a_dtap_ss_version_indicator; +static int hf_gsm_a_dtap_mode_of_operation; +static int hf_gsm_a_dtap_bearer_cap_coding_standard; +static int hf_gsm_a_dtap_nirr; +static int hf_gsm_a_dtap_other_rate_adaption; +static int hf_gsm_a_dtap_connection_element; +static int hf_gsm_a_dtap_nic_on_tx; +static int hf_gsm_a_dtap_user_rate; +static int hf_gsm_a_dtap_protocol_discriminator; +static int hf_gsm_a_dtap_cp_cause; +static int hf_gsm_a_dtap_rate_adaption_header; +static int hf_gsm_a_dtap_synchronous; +static int hf_gsm_a_dtap_logical_link_identifier_negotiation; +static int hf_gsm_a_dtap_multi_party_auxiliary_state; +static int hf_gsm_a_dtap_parity_information; +static int hf_gsm_a_dtap_channel_coding03; +static int hf_gsm_a_dtap_channel_coding30; +static int hf_gsm_a_dtap_loop_mechanism0E; +static int hf_gsm_a_dtap_loop_mechanism1C; +static int hf_gsm_a_dtap_multislot_tch; +static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F43_2; +static int hf_gsm_a_dtap_ue_positioning_technology; +static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F4_8; +static int hf_gsm_a_dtap_number_of_spare_bits; +static int hf_gsm_a_dtap_tie; +static int hf_gsm_a_dtap_updating_type; +static int hf_gsm_a_dtap_multiple_frame_establishment_support; +static int hf_gsm_a_dtap_maximum_number_of_traffic_channels; +static int hf_gsm_a_dtap_compression; +static int hf_gsm_a_dtap_compression_up; +static int hf_gsm_a_dtap_downlink_timeslot_offset; +static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F32_0; +static int hf_gsm_a_dtap_tio; +static int hf_gsm_a_dtap_other_modem_type; +static int hf_gsm_a_dtap_other_itc; +static int hf_gsm_a_dtap_negotiation; +static int hf_gsm_a_dtap_rate_adaption; +static int hf_gsm_a_dtap_ms_positioning_technology; +static int hf_gsm_a_dtap_ue_test_loop_mode; +static int hf_gsm_a_dtap_number_of_data_bits; +static int hf_gsm_a_dtap_follow_on_request; +static int hf_gsm_a_dtap_repeat_indicator; +static int hf_gsm_a_dtap_dst_adjustment; +static int hf_gsm_a_dtap_pcp; +static int hf_gsm_a_dtap_user_information_layer_2_protocol; +static int hf_gsm_a_dtap_structure; +static int hf_gsm_a_dtap_congestion_level; +static int hf_gsm_a_dtap_access_identity; +static int hf_gsm_a_dtap_modem_type; +static int hf_gsm_a_dtap_test_loop; +static int hf_gsm_a_dtap_subchannel; +static int hf_gsm_a_dtap_ack_element; +static int hf_gsm_a_dtap_layer_1_identity; +static int hf_gsm_a_dtap_ciphering_key_sequence_number70; +static int hf_gsm_a_dtap_tp_pdu_description; +static int hf_gsm_a_dtap_mode_flag; +static int hf_gsm_a_dtap_egprs_mode_flag; +static int hf_gsm_a_dtap_dtmf; +static int hf_gsm_a_dtap_coding; +static int hf_gsm_a_dtap_nic_on_rx; +static int hf_gsm_a_dtap_emergency_number_information; +static int hf_gsm_a_dtap_uimi; +static int hf_gsm_a_dtap_number_of_stop_bits; +static int hf_gsm_a_dtap_acceptable_channel_codings_spare78; +static int hf_gsm_a_dtap_type_of_identity; +static int hf_gsm_a_dtap_ciphering_key_sequence_number; +static int hf_gsm_a_dtap_recommendation; +static int hf_gsm_a_dtap_max_num_of_speech_bearers; +static int hf_gsm_a_dtap_keypad_information; +static int hf_gsm_a_dtap_signalling_access_protocol; +static int hf_gsm_a_dtap_user_information_layer_1_protocol; +static int hf_gsm_a_dtap_wanted_air_interface_user_rate; +static int hf_gsm_a_dtap_hold_auxiliary_state; +static int hf_gsm_a_dtap_radio_channel_requirement; +static int hf_gsm_a_dtap_channel_coding_asymmetry_indication; +static int hf_gsm_a_dtap_service_type; +static int hf_gsm_a_dtap_text_string; +static int hf_gsm_a_dtap_tp_tested_device; +static int hf_gsm_a_dtap_fixed_network_user_rate; +static int hf_gsm_a_dtap_coding_scheme; +static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F28_8; +static int hf_gsm_a_dtap_v110_x30_rate_adaptation; +static int hf_gsm_a_dtap_transfer_mode; +static int hf_gsm_a_dtap_layer_2_identity; +static int hf_gsm_a_dtap_add_ci; +static int hf_gsm_a_dtap_mm_timer; +static int hf_gsm_a_dtap_in_out_band; +static int hf_gsm_a_dtap_data; +static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F14_4; +static int hf_gsm_a_dtap_ti_flag; +static int hf_gsm_a_dtap_time_zone_time; +static int hf_gsm_a_dtap_acceptable_channel_codings_spare20; +static int hf_gsm_a_dtap_establishment; +static int hf_gsm_a_dtap_duplex_mode; +static int hf_gsm_a_dtap_subaddress; +static int hf_gsm_a_dtap_subaddress_information; +static int hf_gsm_a_dtap_message_elements; +static int hf_gsm_a_dtap_rpdu; +static int hf_gsm_a_dtap_timeslot_number; +static int hf_gsm_a_dtap_uplink_rlc_sdu_size; +static int hf_gsm_a_dtap_radio_bearer; +static int hf_gsm_a_dtap_mbms_short_transmission_identity; +static int hf_gsm_a_dtap_ue_received_rlc_sdu_counter_value; +static int hf_gsm_a_dtap_num_lb_entities; + + +static int hf_gsm_a_dtap_gcc_call_ref; +static int hf_gsm_a_dtap_gcc_call_ref_has_priority; +static int hf_gsm_a_dtap_gcc_call_priority; +static int hf_gsm_a_dtap_gcc_call_state; +static int hf_gsm_a_dtap_gcc_cause; +static int hf_gsm_a_dtap_gcc_cause_structure; +static int hf_gsm_a_dtap_gcc_orig_ind; +static int hf_gsm_a_dtap_gcc_state_attr; +static int hf_gsm_a_dtap_gcc_state_attr_da; +static int hf_gsm_a_dtap_gcc_state_attr_ua; +static int hf_gsm_a_dtap_gcc_state_attr_comm; +static int hf_gsm_a_dtap_gcc_state_attr_oi; + +static int hf_gsm_a_dtap_gcc_spare_1; +static int hf_gsm_a_dtap_gcc_spare_3; +static int hf_gsm_a_dtap_gcc_spare_4; + +static int hf_gsm_a_dtap_bcc_call_ref; +static int hf_gsm_a_dtap_bcc_call_ref_has_priority; +static int hf_gsm_a_dtap_bcc_call_priority; +static int hf_gsm_a_dtap_bcc_call_state; +static int hf_gsm_a_dtap_bcc_cause; +static int hf_gsm_a_dtap_bcc_cause_structure; +static int hf_gsm_a_dtap_bcc_orig_ind; +static int hf_gsm_a_dtap_bcc_state_attr; +static int hf_gsm_a_dtap_bcc_state_attr_da; +static int hf_gsm_a_dtap_bcc_state_attr_ua; +static int hf_gsm_a_dtap_bcc_state_attr_comm; +static int hf_gsm_a_dtap_bcc_state_attr_oi; +static int hf_gsm_a_dtap_bcc_compr_otdi; + +static int hf_gsm_a_dtap_bcc_spare_1; +static int hf_gsm_a_dtap_bcc_spare_3; +static int hf_gsm_a_dtap_bcc_spare_4; /* Initialize the subtree pointers */ -static gint ett_dtap_msg = -1; -static gint ett_dtap_oct_1 = -1; -static gint ett_cm_srvc_type = -1; -static gint ett_gsm_enc_info = -1; -static gint ett_bc_oct_3 = -1; -static gint ett_bc_oct_3a = -1; -static gint ett_bc_oct_4 = -1; -static gint ett_bc_oct_5 = -1; -static gint ett_bc_oct_5a = -1; -static gint ett_bc_oct_5b = -1; -static gint ett_bc_oct_6 = -1; -static gint ett_bc_oct_6a = -1; -static gint ett_bc_oct_6b = -1; -static gint ett_bc_oct_6c = -1; -static gint ett_bc_oct_6d = -1; -static gint ett_bc_oct_6e = -1; -static gint ett_bc_oct_6f = -1; -static gint ett_bc_oct_6g = -1; -static gint ett_bc_oct_7 = -1; -static gint ett_epc_ue_tl_a_lb_setup = -1; -static gint ett_mm_timer = -1; -static gint ett_ue_test_loop_mode = -1; - -static expert_field ei_gsm_a_dtap_keypad_info_not_dtmf_digit = EI_INIT; -static expert_field ei_gsm_a_dtap_text_string_not_multiple_of_7 = EI_INIT; -static expert_field ei_gsm_a_dtap_autn = EI_INIT; -static expert_field ei_gsm_a_dtap_invalid_ia5_character = EI_INIT; -static expert_field ei_gsm_a_dtap_auts = EI_INIT; -static expert_field ei_gsm_a_dtap_not_digit = EI_INIT; -static expert_field ei_gsm_a_dtap_end_mark_unexpected = EI_INIT; -static expert_field ei_gsm_a_dtap_extraneous_data = EI_INIT; -static expert_field ei_gsm_a_dtap_missing_mandatory_element = EI_INIT; -static expert_field ei_gsm_a_dtap_coding_scheme = EI_INIT; -static expert_field ei_gsm_a_dtap_ti_not_valid = EI_INIT; +static int ett_dtap_msg; +static int ett_dtap_oct_1; +static int ett_cm_srvc_type; +static int ett_gsm_enc_info; +static int ett_bc_oct_3; +static int ett_bc_oct_3a; +static int ett_bc_oct_4; +static int ett_bc_oct_5; +static int ett_bc_oct_5a; +static int ett_bc_oct_5b; +static int ett_bc_oct_6; +static int ett_bc_oct_6a; +static int ett_bc_oct_6b; +static int ett_bc_oct_6c; +static int ett_bc_oct_6d; +static int ett_bc_oct_6e; +static int ett_bc_oct_6f; +static int ett_bc_oct_6g; +static int ett_bc_oct_7; +static int ett_epc_ue_tl_a_lb_setup; +static int ett_mm_timer; +static int ett_ue_test_loop_mode; + +static expert_field ei_gsm_a_dtap_keypad_info_not_dtmf_digit; +static expert_field ei_gsm_a_dtap_text_string_not_multiple_of_7; +static expert_field ei_gsm_a_dtap_autn; +static expert_field ei_gsm_a_dtap_invalid_ia5_character; +static expert_field ei_gsm_a_dtap_auts; +static expert_field ei_gsm_a_dtap_not_digit; +static expert_field ei_gsm_a_dtap_end_mark_unexpected; +static expert_field ei_gsm_a_dtap_extraneous_data; +static expert_field ei_gsm_a_dtap_missing_mandatory_element; +static expert_field ei_gsm_a_dtap_coding_scheme; +static expert_field ei_gsm_a_dtap_ti_not_valid; static dissector_table_t u2u_dissector_table; @@ -772,17 +775,17 @@ static proto_tree *g_tree; /* * this should be set on a per message basis, if possible */ -static gint is_uplink; -static guint8 epc_test_loop_mode; +static int is_uplink; +static uint8_t epc_test_loop_mode; -#define NUM_GSM_DTAP_ELEM (sizeof(gsm_dtap_elem_strings)/sizeof(value_string)) -gint ett_gsm_dtap_elem[NUM_GSM_DTAP_ELEM]; +#define NUM_GSM_DTAP_ELEM array_length(gsm_dtap_elem_strings) +int ett_gsm_dtap_elem[NUM_GSM_DTAP_ELEM]; /* * [9] 10.5.3.1 Authentication parameter RAND */ -static guint16 -de_auth_param_rand(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_auth_param_rand(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { /* The RAND value is 16 octets long */ proto_tree_add_item(tree, hf_gsm_a_dtap_rand, tvb, offset, 16, ENC_NA); @@ -794,8 +797,8 @@ de_auth_param_rand(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin /* * [9] 10.5.3.1.1 Authentication Parameter AUTN (UMTS and EPS authentication challenge) */ -static guint16 -de_auth_param_autn(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_auth_param_autn(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { proto_item *item; proto_tree *subtree; @@ -818,21 +821,21 @@ de_auth_param_autn(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 /* * [9] 10.5.3.2 Authentication Response parameter */ -static guint16 -de_auth_resp_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_auth_resp_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { /* This IE contains either the SRES or the 4 most significant octets of the RES */ proto_tree_add_item(tree, hf_gsm_a_dtap_sres, tvb, offset, 4, ENC_NA); /* no length check possible */ - return (4); + return 4; } /* * [9] 10.5.3.2.1 Authentication Response Parameter (extension) (UMTS authentication challenge only) */ -static guint16 -de_auth_resp_param_ext(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_auth_resp_param_ext(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { /* This IE contains all but 4 most significant octets of RES */ proto_tree_add_item(tree, hf_gsm_a_dtap_xres, tvb, offset, len, ENC_NA); @@ -843,8 +846,8 @@ de_auth_resp_param_ext(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, /* * [9] 10.5.3.2.2 Authentication Failure parameter (UMTS and EPS authentication challenge) */ -static guint16 -de_auth_fail_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_auth_fail_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { proto_item *item; proto_tree *subtree; @@ -904,18 +907,18 @@ static const value_string gsm_a_dtap_coding_scheme_vals[] = { { 7, "Reserved"}, { 0, NULL } }; -static guint16 -de_network_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_network_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint8 oct; - guint32 curr_offset; - guint8 coding_scheme, num_spare_bits; - guint32 num_text_bits; + uint8_t oct; + uint32_t curr_offset; + uint8_t coding_scheme, num_spare_bits; + uint32_t num_text_bits; proto_item *item; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -985,13 +988,13 @@ static const range_string gsm_a_dtap_rej_cause_vals[] = { { 0, 0, NULL } }; -guint16 -de_rej_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +uint16_t +de_rej_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct; - const gchar *str; + uint8_t oct; + const char *str; - oct = tvb_get_guint8(tvb, offset); + oct = tvb_get_uint8(tvb, offset); str = try_rval_to_str(oct, gsm_a_dtap_rej_cause_vals); if (!str) @@ -1007,7 +1010,7 @@ de_rej_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of /* no length check possible */ - return (1); + return 1; } /* @@ -1017,11 +1020,11 @@ de_rej_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of /* * [3] 10.5.3.8 Time Zone */ -guint16 -de_time_zone(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +uint16_t +de_time_zone(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct; - guint32 curr_offset; + uint8_t oct; + uint32_t curr_offset; char sign; curr_offset = offset; @@ -1035,7 +1038,7 @@ de_time_zone(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of * represents the algebraic sign of this difference (0: positive, 1: negative). */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); sign = (oct & 0x08)?'-':'+'; oct = (oct >> 4) + (oct & 0x07) * 10; @@ -1050,11 +1053,11 @@ de_time_zone(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of /* * [3] 10.5.3.9 Time Zone and Time */ -static guint16 -de_time_zone_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_time_zone_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct; - guint32 curr_offset; + uint8_t oct; + uint32_t curr_offset; char sign; nstime_t tv; struct tm tm; @@ -1066,24 +1069,24 @@ de_time_zone_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint tm.tm_yday = 0; tm.tm_isdst = -1; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); tm.tm_year = (oct & 0x0f)*10 + ((oct & 0xf0) >> 4) + 100; - oct = tvb_get_guint8(tvb, curr_offset+1); + oct = tvb_get_uint8(tvb, curr_offset+1); tm.tm_mon = (oct & 0x0f)*10 + ((oct & 0xf0) >> 4) - 1; - oct = tvb_get_guint8(tvb, curr_offset+2); + oct = tvb_get_uint8(tvb, curr_offset+2); tm.tm_mday = (oct & 0x0f)*10 + ((oct & 0xf0) >> 4); - oct = tvb_get_guint8(tvb, curr_offset+3); + oct = tvb_get_uint8(tvb, curr_offset+3); tm.tm_hour = (oct & 0x0f)*10 + ((oct & 0xf0) >> 4); - oct = tvb_get_guint8(tvb, curr_offset+4); + oct = tvb_get_uint8(tvb, curr_offset+4); tm.tm_min = (oct & 0x0f)*10 + ((oct & 0xf0) >> 4); - oct = tvb_get_guint8(tvb, curr_offset+5); + oct = tvb_get_uint8(tvb, curr_offset+5); tm.tm_sec = (oct & 0x0f)*10 + ((oct & 0xf0) >> 4); tv.secs = mktime(&tm); tv.nsecs = 0; proto_tree_add_time_format_value(tree, hf_gsm_a_dtap_time_zone_time, tvb, curr_offset, 6, - &tv, "%s", abs_time_to_str(pinfo->pool, &tv, ABSOLUTE_TIME_LOCAL, FALSE)); + &tv, "%s", abs_time_to_str(pinfo->pool, &tv, ABSOLUTE_TIME_LOCAL, false)); curr_offset += 6; /* 3GPP TS 23.040 version 6.6.0 Release 6 @@ -1095,7 +1098,7 @@ de_time_zone_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * represents the algebraic sign of this difference (0: positive, 1: negative). */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); sign = (oct & 0x08)?'-':'+'; oct = (oct >> 4) + (oct & 0x07) * 10; @@ -1115,10 +1118,10 @@ de_time_zone_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [3] 10.5.3.11 LSA Identifier * 3GPP TS 24.008 version 6.8.0 Release 6 */ -static guint16 -de_lsa_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_lsa_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -1148,10 +1151,10 @@ static const value_string gsm_a_dtap_dst_adjustment_vals[] = { { 0, NULL } }; -static guint16 -de_day_saving_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_day_saving_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -1168,12 +1171,12 @@ de_day_saving_time(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 /* * 10.5.3.13 Emergency Number List */ -static guint16 -de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint8 en_len; - guint8 count; + uint32_t curr_offset; + uint8_t en_len; + uint8_t count; proto_tree *subtree; proto_item *item; char *digit_str; @@ -1186,7 +1189,7 @@ de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o * NOTE 1: The length contains the number of octets used to encode the * Emergency Service Category Value and the Number digits. */ - en_len = tvb_get_guint8(tvb, curr_offset); + en_len = tvb_get_uint8(tvb, curr_offset); item = proto_tree_add_uint(tree, hf_gsm_a_dtap_emergency_number_information, tvb, curr_offset, en_len + 1, count); @@ -1207,7 +1210,7 @@ de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o curr_offset++; en_len--; - item = proto_tree_add_item_ret_display_string(subtree, hf_gsm_a_dtap_emergency_bcd_num, tvb, curr_offset, en_len, ENC_BCD_DIGITS_0_9, pinfo->pool, &digit_str); + item = proto_tree_add_item_ret_display_string(subtree, hf_gsm_a_dtap_emergency_bcd_num, tvb, curr_offset, en_len, ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN, pinfo->pool, &digit_str); /* Check for values that aren't digits; they get mapped to '?' */ if(strchr(digit_str,'?')){ @@ -1239,10 +1242,10 @@ static const true_false_string gsm_a_dtap_csmt_value = { "No additional information" }; -static guint16 -de_add_upd_params(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_add_upd_params(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -1265,16 +1268,16 @@ static const value_string gsm_a_dtap_mm_timer_unit_vals[] = { { 0, NULL } }; -static guint16 -de_mm_timer(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_mm_timer(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct; - guint16 val; - const gchar *str; + uint8_t oct; + uint16_t val; + const char *str; proto_tree *subtree; proto_item *item = NULL; - oct = tvb_get_guint8(tvb, offset); + oct = tvb_get_uint8(tvb, offset); val = oct&0x1f; switch (oct>>5) @@ -1307,7 +1310,7 @@ de_mm_timer(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 off proto_tree_add_item(subtree, hf_gsm_a_dtap_mm_timer_unit, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_mm_timer_value, tvb, offset, 1, ENC_BIG_ENDIAN); - return (1); + return 1; } /* @@ -1330,10 +1333,10 @@ static const value_string gsm_a_dtap_multi_party_auxiliary_state_vals[] = { { 0, NULL } }; -static guint16 -de_aux_states(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_aux_states(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -1592,17 +1595,17 @@ static const true_false_string tfs_nic_on_tx = { "requires to send data with net static const true_false_string tfs_nic_on_rx = { "can accept data with network independent clock", "cannot accept data with network independent clock" }; -guint16 -de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +uint16_t +de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - guint8 oct; - guint8 itc; - gboolean extended; - guint32 curr_offset; - guint32 saved_offset; + uint8_t oct; + uint8_t itc; + bool extended; + uint32_t curr_offset; + uint32_t saved_offset; proto_tree *subtree; proto_item *item; - const gchar *str; + const char *str; #define DE_BC_ITC_SPEECH 0x00 #define DE_BC_ITC_UDI 0x01 @@ -1613,7 +1616,7 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); /* octet 3 */ @@ -1626,7 +1629,7 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse tvb, curr_offset, 1, ett_bc_oct_3, NULL, "Octet 3"); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; itc = oct & 0x07; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1718,9 +1721,9 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse do { - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_coding, tvb, curr_offset, 1, ENC_NA); @@ -1762,9 +1765,9 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse tvb, curr_offset, 1, ett_bc_oct_5, NULL, "Octet 5"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_access_identity, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1783,14 +1786,14 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse tvb, curr_offset, 1, ett_bc_oct_5a, NULL, "Octet 5a"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_other_itc, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_other_rate_adaption, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+5, 3, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+5, 3, ENC_BIG_ENDIAN); curr_offset++; NO_MORE_DATA_CHECK(len); @@ -1811,7 +1814,7 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse proto_tree_add_item(subtree, hf_gsm_a_dtap_logical_link_identifier_negotiation, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_assignor_assignee, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(subtree, hf_gsm_a_dtap_in_out_band, tvb, curr_offset, 1, ENC_NA); - proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+7, 1, ENC_BIG_ENDIAN); curr_offset++; @@ -1826,9 +1829,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6, NULL, "Octet 6"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1853,9 +1856,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6a, NULL, "Octet 6a"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_number_of_stop_bits, tvb, curr_offset, 1, ENC_NA); @@ -1878,9 +1881,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6b, NULL, "Octet 6b"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_v110_x30_rate_adaptation, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1900,9 +1903,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6c, NULL, "Octet 6c"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_connection_element, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1922,9 +1925,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6d, NULL, "Octet 6d"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_other_modem_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1943,9 +1946,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6e, NULL, "Octet 6e"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1980,9 +1983,9 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6f, NULL, "Octet 6f"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); - extended = (oct & 0x80) ? FALSE : TRUE; + extended = (oct & 0x80) ? false : true; proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_a_dtap_uimi, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2010,7 +2013,7 @@ bc_octet_6: tvb, curr_offset, 1, ett_bc_oct_6g, NULL, "Octet 6g"); - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_item(subtree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2026,7 +2029,7 @@ bc_octet_6: proto_tree_add_uint_format_value(subtree, hf_gsm_a_dtap_edge_channel_codings, tvb, curr_offset, 1, oct, "Spare"); } - proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+6, 2, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+6, 2, ENC_BIG_ENDIAN); curr_offset++; @@ -2056,8 +2059,8 @@ bc_octet_7: } -guint16 -de_bearer_cap_uplink(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +uint16_t +de_bearer_cap_uplink(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { is_uplink = IS_UPLINK_TRUE; return de_bearer_cap(tvb, tree, pinfo, offset, len, add_string, string_len); @@ -2082,14 +2085,14 @@ static const true_false_string gsm_a_dtap_dtmf_value = { "reserved for earlier versions of the protocol" }; -static guint16 -de_cc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - guint8 oct; - guint32 curr_offset; +static uint16_t +de_cc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { + uint8_t oct; + uint32_t curr_offset; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); if (((oct & 0xf0) >> 4) == 0) { @@ -2155,10 +2158,10 @@ static const value_string gsm_a_dtap_call_state_vals[] = { { 0, NULL } }; -static guint16 -de_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct, coding_standard, call_state; + uint8_t oct, coding_standard, call_state; proto_tree *subtree; subtree = @@ -2168,7 +2171,7 @@ de_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o proto_tree_add_item(subtree, hf_gsm_a_dtap_coding_standard, tvb, offset, 1, ENC_BIG_ENDIAN); - oct = tvb_get_guint8(tvb, offset); + oct = tvb_get_uint8(tvb, offset); coding_standard = (oct & 0xc0) >> 6; call_state = oct & 0x3f; @@ -2194,7 +2197,7 @@ de_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o /* no length check possible */ - return (1); + return 1; } /* @@ -2241,17 +2244,17 @@ static const value_string gsm_a_dtap_screening_ind_values[] = { { 0, NULL } }; -static guint16 -de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, int header_field, gchar **extracted_address) +static uint16_t +de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, int header_field, char **extracted_address) { - guint8 extension; - guint32 curr_offset, num_string_len; + uint8_t extension; + uint32_t curr_offset, num_string_len; proto_item *item; *extracted_address = NULL; curr_offset = offset; - extension = tvb_get_guint8(tvb, curr_offset) & 0x80; + extension = tvb_get_uint8(tvb, curr_offset) & 0x80; proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_type_of_number, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_numbering_plan_id, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2270,7 +2273,7 @@ de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, num_string_len = len - (curr_offset - offset); - item = proto_tree_add_item_ret_display_string(tree, header_field, tvb, curr_offset, num_string_len, ENC_KEYPAD_ABC_TBCD, pinfo->pool, extracted_address); + item = proto_tree_add_item_ret_display_string(tree, header_field, tvb, curr_offset, num_string_len, ENC_KEYPAD_ABC_TBCD|ENC_LITTLE_ENDIAN, pinfo->pool, extracted_address); /* Check for an end mark, which gets mapped to '?' */ if(strchr(*extracted_address,'?')){ @@ -2296,13 +2299,13 @@ static const value_string gsm_a_dtap_odd_even_ind_values[] = { }; -static guint16 -de_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar **extracted_address) +static uint16_t +de_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char **extracted_address) { - guint32 curr_offset, ia5_string_len, i; - guint8 type_of_sub_addr, afi, dig1, dig2, oct; - gchar *ia5_string; - gboolean invalid_ia5_char; + uint32_t curr_offset, ia5_string_len, i; + uint8_t type_of_sub_addr, afi, dig1, dig2, oct; + char *ia5_string; + bool invalid_ia5_char; proto_item *item; curr_offset = offset; @@ -2312,14 +2315,14 @@ de_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, proto_tree_add_item(tree, hf_gsm_a_dtap_type_of_sub_addr, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_odd_even_ind, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (curr_offset<<3)+5, 3, ENC_BIG_ENDIAN); - type_of_sub_addr = (tvb_get_guint8(tvb, curr_offset) & 0x70) >> 4; + type_of_sub_addr = (tvb_get_uint8(tvb, curr_offset) & 0x70) >> 4; curr_offset++; NO_MORE_DATA_CHECK(len); if (!type_of_sub_addr) { - afi = tvb_get_guint8(tvb, curr_offset); + afi = tvb_get_uint8(tvb, curr_offset); proto_tree_add_item(tree, hf_gsm_a_dtap_afi, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; @@ -2328,17 +2331,17 @@ de_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, if (afi == 0x50) { ia5_string_len = len - (curr_offset - offset); - ia5_string = (guint8 *)tvb_memdup(pinfo->pool, tvb, curr_offset, ia5_string_len); - *extracted_address = (gchar *)wmem_alloc(pinfo->pool, ia5_string_len + 1); + ia5_string = (uint8_t *)tvb_memdup(pinfo->pool, tvb, curr_offset, ia5_string_len); + *extracted_address = (char *)wmem_alloc(pinfo->pool, ia5_string_len + 1); - invalid_ia5_char = FALSE; + invalid_ia5_char = false; for(i = 0; i < ia5_string_len; i++) { dig1 = (ia5_string[i] & 0xf0) >> 4; dig2 = ia5_string[i] & 0x0f; oct = (dig1 * 10) + dig2 + 32; if (oct > 127) - invalid_ia5_char = TRUE; + invalid_ia5_char = true; ia5_string[i] = oct; } @@ -2362,10 +2365,10 @@ de_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, /* * [3] 10.5.4.7 Called party BCD number */ -guint16 -de_cld_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +uint16_t +de_cld_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - gchar *extr_addr; + char *extr_addr; de_bcd_num(tvb, tree, pinfo, offset, len, hf_gsm_a_dtap_cld_party_bcd_num, &extr_addr); @@ -2384,10 +2387,10 @@ de_cld_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 /* * [3] 10.5.4.8 Called party subaddress */ -static guint16 -de_cld_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len _U_) +static uint16_t +de_cld_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len _U_) { - gchar *extr_addr; + char *extr_addr; de_sub_addr(tvb, tree, pinfo, offset, len, &extr_addr); @@ -2400,10 +2403,10 @@ de_cld_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint /* 3GPP TS 24.008 * [3] 10.5.4.9 Calling party BCD number */ -static guint16 -de_clg_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_clg_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - gchar *extr_addr; + char *extr_addr; de_bcd_num(tvb, tree, pinfo, offset, len, hf_gsm_a_dtap_clg_party_bcd_num, &extr_addr); @@ -2416,10 +2419,10 @@ de_clg_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 /* * [3] 10.5.4.10 Calling party subaddress */ -static guint16 -de_clg_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len _U_) +static uint16_t +de_clg_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len _U_) { - gchar *extr_addr; + char *extr_addr; de_sub_addr(tvb, tree, pinfo, offset, len, &extr_addr); @@ -2452,15 +2455,15 @@ static const value_string gsm_a_dtap_de_cause_coding_standard_vals[] = { { 0, NULL } }; -static guint16 -de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - guint8 oct; - guint8 cause; - guint32 curr_offset; - guint32 diag_length; + uint8_t oct; + uint8_t cause; + uint32_t curr_offset; + uint32_t diag_length; proto_tree *subtree; - const gchar *str; + const char *str; curr_offset = offset; @@ -2472,7 +2475,7 @@ de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, gu proto_tree_add_item(tree, hf_gsm_a_dtap_location, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); if (!(oct & 0x80)) { @@ -2481,7 +2484,7 @@ de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, gu curr_offset++; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); } proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2611,10 +2614,10 @@ de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, gu /* * 10.5.4.13 Connected number */ -static guint16 -de_conn_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_conn_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - gchar *extr_addr; + char *extr_addr; de_bcd_num(tvb, tree, pinfo, offset, len, hf_gsm_a_dtap_conn_num, &extr_addr); @@ -2627,10 +2630,10 @@ de_conn_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, /* * 10.5.4.14 Connected subaddress */ -static guint16 -de_conn_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_conn_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - gchar *extr_addr; + char *extr_addr; de_sub_addr(tvb, tree, pinfo, offset, len, &extr_addr); @@ -2644,21 +2647,21 @@ de_conn_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of * 10.5.4.15 Facility */ -static guint16 -de_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint fac_len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned fac_len, char *add_string _U_, int string_len _U_) { - guint saved_offset; - gint8 appclass; + unsigned saved_offset; + int8_t appclass; bool pc; - bool ind = FALSE; - guint32 component_len = 0; - guint32 header_end_offset; - guint32 header_len; + bool ind = false; + uint32_t component_len = 0; + uint32_t header_end_offset; + uint32_t header_len; asn1_ctx_t asn1_ctx; tvbuff_t *SS_tvb = NULL; - static gint comp_type_tag; + static int comp_type_tag; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); saved_offset = offset; col_append_str(pinfo->cinfo, COL_PROTOCOL,"/"); @@ -2672,7 +2675,7 @@ de_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, header_len = header_end_offset - offset; component_len = header_len + component_len; /* - dissect_ROS_Component(FALSE, tvb, offset, &asn1_ctx, tree, hf_ROS_component); + dissect_ROS_Component(false, tvb, offset, &asn1_ctx, tree, hf_ROS_component); TODO Call gsm map here */ SS_tvb = tvb_new_subset_length(tvb, offset, component_len); @@ -2686,10 +2689,10 @@ de_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, /* * 10.5.4.16 High layer compatibility */ -static guint16 -de_hlc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_hlc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -2702,16 +2705,16 @@ de_hlc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, /* * [3] 10.5.4.17 Keypad facility */ -static guint16 -de_keypad_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string, int string_len) +static uint16_t +de_keypad_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len _U_, char *add_string, int string_len) { - guint8 keypad_char; - guint32 curr_offset; + uint8_t keypad_char; + uint32_t curr_offset; proto_item *item; curr_offset = offset; - keypad_char = tvb_get_guint8(tvb, curr_offset) & 0x7f; + keypad_char = tvb_get_uint8(tvb, curr_offset) & 0x7f; proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 1, ENC_BIG_ENDIAN); @@ -2735,10 +2738,10 @@ de_keypad_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 /* * 10.5.4.18 Low layer compatibility */ -static guint16 -de_llc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_llc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -2762,8 +2765,8 @@ static const value_string gsm_a_dtap_notification_description_vals[] = { { 0, NULL } }; -static guint16 -de_notif_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_notif_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_extension, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_notification_description, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2797,15 +2800,15 @@ static const value_string gsm_a_dtap_progress_description_vals[] = { { 0, NULL } }; -static guint16 -de_prog_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_prog_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct, coding_standard, progress_description; - guint32 curr_offset; + uint8_t oct, coding_standard, progress_description; + uint32_t curr_offset; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); coding_standard = (oct & 0x60) >> 5; proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_prog_coding_standard, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2813,7 +2816,7 @@ de_prog_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, proto_tree_add_item(tree, hf_gsm_a_dtap_location, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset++; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); progress_description = oct & 0x7f; proto_tree_add_item(tree, hf_gsm_a_extension, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2852,22 +2855,22 @@ static const range_string gsm_a_dtap_recall_type_vals[] = { { 0, 0, NULL } }; -static guint16 -de_recall_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_recall_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, (offset<<3), 5, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_recall_type, tvb, offset, 1, ENC_BIG_ENDIAN); - return (1); + return 1; } /* * 10.5.4.21b Redirecting party BCD number */ -static guint16 -de_red_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_red_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - gchar *extr_addr; + char *extr_addr; de_bcd_num(tvb, tree, pinfo, offset, len, hf_gsm_a_dtap_red_party_bcd_num, &extr_addr); @@ -2880,10 +2883,10 @@ de_red_party_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 /* * 10.5.4.21c Redirecting party subaddress */ -static guint16 -de_red_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_red_party_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - gchar *extr_addr; + char *extr_addr; de_sub_addr(tvb, tree, pinfo, offset, len, &extr_addr); @@ -2903,15 +2906,15 @@ static const value_string gsm_a_dtap_repeat_indicator_vals[] = { { 0, NULL } }; -static guint16 -de_repeat_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_repeat_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint8 oct; - guint32 curr_offset; + uint8_t oct; + uint32_t curr_offset; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_repeat_indicator, tvb, curr_offset, 1, oct, "%s", val_to_str_const(oct & 0xF, gsm_a_dtap_repeat_indicator_vals, "Reserved")); @@ -2929,10 +2932,10 @@ de_repeat_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o * 10.5.4.22b SETUP Container $(CCBS)$ */ static void -dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); +dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len); -static guint16 -de_setup_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_setup_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { dtap_cc_setup(tvb, tree, pinfo, offset, len); @@ -2957,8 +2960,8 @@ static const value_string gsm_a_dtap_signal_value_vals[] = { { 0, NULL } }; -static guint16 -de_signal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_signal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_dtap_signal_value, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2974,15 +2977,15 @@ static const value_string gsm_a_dtap_ss_ver_ind_vals[] = { { 0, NULL } }; -static guint16 -de_ss_ver_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_ss_ver_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint8 oct; - guint32 curr_offset; + uint8_t oct; + uint32_t curr_offset; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_ss_version_indicator, tvb, curr_offset, 1, oct, "%s", val_to_str_const(oct, gsm_a_dtap_ss_ver_ind_vals, "Reserved")); @@ -3037,11 +3040,11 @@ static const range_string gsm_a_dtap_u2u_prot_discr_vals[] = { { 0, 0, NULL } }; -static guint16 -de_u2u(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_u2u(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint32 proto_discr; + uint32_t curr_offset; + uint32_t proto_discr; proto_tree *subtree; tvbuff_t *u2u_tvb; @@ -3053,7 +3056,7 @@ de_u2u(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guin proto_tree_add_item(subtree, hf_gsm_a_dtap_data, tvb, curr_offset, len - 1, ENC_NA); u2u_tvb = tvb_new_subset_length(tvb, curr_offset, len - 1); - dissector_try_uint_new(u2u_dissector_table, proto_discr, u2u_tvb, pinfo, proto_tree_get_root(tree), TRUE, NULL); + dissector_try_uint_new(u2u_dissector_table, proto_discr, u2u_tvb, pinfo, proto_tree_get_root(tree), true, NULL); return (len); @@ -3073,10 +3076,10 @@ static const value_string gsm_a_alerting_pattern_vals[] = { { 0, NULL } }; -static guint16 -de_alert_pat(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_alert_pat(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3095,10 +3098,10 @@ static const true_false_string gsm_a_ccbs_activation_value = { "Activation of CCBS possible", "Activation of CCBS not possible" }; -static guint16 -de_allowed_act(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_allowed_act(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3114,15 +3117,15 @@ de_allowed_act(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offs /* * 10.5.4.28 Stream Identifier */ -static guint16 -de_stream_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_stream_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - guint32 curr_offset; - guint8 oct; + uint32_t curr_offset; + uint8_t oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); if (oct == 0x00) { proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_stream_identifier, tvb, curr_offset, 1, oct, @@ -3153,10 +3156,10 @@ static const true_false_string gsm_a_mcs_value = { "This value indicates that the network supports the multicall", "This value indicates that the network does not support the multicall" }; -static guint16 -de_nw_call_ctrl_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_nw_call_ctrl_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3180,15 +3183,15 @@ static const value_string gsm_a_cause_of_no_cli_values[] = { { 0, NULL } }; -static guint16 -de_ca_of_no_cli(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) +static uint16_t +de_ca_of_no_cli(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string, int string_len) { - guint32 curr_offset; - guint8 oct; + uint32_t curr_offset; + uint8_t oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_cause_of_no_cli, tvb, curr_offset, 1, oct, "%s (%u)", val_to_str_const(oct, gsm_a_cause_of_no_cli_values, "Unavailable"), @@ -3221,13 +3224,13 @@ static const value_string gsm_a_dtap_sysid_values[] = { { 0x4, "UMTS" }, { 0, NULL } }; -guint16 -de_sup_codec_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +uint16_t +de_sup_codec_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint8 length; + uint32_t curr_offset; + uint8_t length; proto_tree *subtree; - guint8 sysid_counter; + uint8_t sysid_counter; curr_offset = offset; @@ -3243,7 +3246,7 @@ de_sup_codec_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_offset++; /* Length Of Bitmap for SysID */ proto_tree_add_item(tree, hf_gsm_a_dtap_bitmap_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - length = tvb_get_guint8(tvb,curr_offset); + length = tvb_get_uint8(tvb,curr_offset); curr_offset++; if (length > 0) { @@ -3329,10 +3332,10 @@ Bit 6 manually initiated eCall Bit 7 automatically initiated eCall Bit 8 is spare and set to "0" */ -guint16 -de_serv_cat(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +uint16_t +de_serv_cat(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3359,10 +3362,10 @@ de_serv_cat(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 off /* * [5] 8.1.4.1 3GPP TS 24.011 version 6.1.0 Release 6 */ -static guint16 -de_cp_user_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_cp_user_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; tvbuff_t *rp_tvb; curr_offset = offset; @@ -3399,16 +3402,16 @@ static const value_string gsm_a_dtap_cp_cause_values[] = { { 0, NULL } }; -static guint16 -de_cp_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string, int string_len) +static uint16_t +de_cp_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string, int string_len) { - guint8 oct; - guint32 curr_offset; - const gchar *str; + uint8_t oct; + uint32_t curr_offset; + const char *str; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); str = val_to_str_const(oct, gsm_a_dtap_cp_cause_values, "Reserved, treat as Protocol error, unspecified"); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_cp_cause, tvb, curr_offset, 1, oct, "(%u) %s", oct, str); @@ -3425,16 +3428,16 @@ de_cp_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 off static const true_false_string tfs_gsm_a_dtap_subchannel = { "Only one TCH active or sub-channel 0 of two half rate channels is to be looped", "Sub-channel 1 of two half rate channels is to be looped" }; -static guint16 -de_tp_sub_channel(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_sub_channel(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; - const gchar *str; + uint32_t curr_offset; + unsigned char oct; + const char *str; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset) & 0x3f; + oct = tvb_get_uint8(tvb, curr_offset) & 0x3f; if ((oct & 0x38) == 0x38) str = "I"; else if ((oct & 0x38) == 0x18) @@ -3459,15 +3462,15 @@ de_tp_sub_channel(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint return (curr_offset - offset); } -static guint16 -de_tp_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; + uint32_t curr_offset; + unsigned char oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); if ((oct & 0xF0) == 0x80) proto_tree_add_uint(tree, hf_gsm_a_dtap_ack_element, tvb, curr_offset, 1, oct&0x01); @@ -3499,15 +3502,15 @@ static const value_string gsm_a_dtap_loop_mech_vals[] = { { 0, NULL } }; -static guint16 -de_tp_loop_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_loop_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; + uint32_t curr_offset; + unsigned char oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_item(tree, hf_gsm_a_dtap_channel_coding03, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_loop_mechanism1C, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -3524,10 +3527,10 @@ de_tp_loop_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 static const true_false_string tfs_multislot_tch = { "not closed due to error", "closed successfully" }; -static guint16 -de_tp_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset = offset; + uint32_t curr_offset = offset; proto_tree_add_item(tree, hf_gsm_a_dtap_channel_coding30, tvb, curr_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_a_dtap_loop_mechanism0E, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -3545,15 +3548,15 @@ static const value_string gsm_tp_tested_device_vals[] = { { 0, NULL } }; -static guint16 -de_tp_tested_device(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_tested_device(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; + uint32_t curr_offset; + unsigned char oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_tp_tested_device, tvb, curr_offset, 1, oct, "%s", val_to_str(oct, gsm_tp_tested_device_vals, "Reserved (%d)")); curr_offset+= 1; @@ -3561,11 +3564,11 @@ de_tp_tested_device(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui return (curr_offset - offset); } -static guint16 -de_tp_pdu_description(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_pdu_description(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint16 value; + uint32_t curr_offset; + uint16_t value; curr_offset = offset; @@ -3590,10 +3593,10 @@ de_tp_pdu_description(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g static const true_false_string tfs_gsm_a_dtap_mode_flag = { "MS shall select the loop back option", "MS shall itself generate the pseudorandom data" }; -static guint16 -de_tp_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset = offset; + uint32_t curr_offset = offset; proto_tree_add_item(tree, hf_gsm_a_dtap_mode_flag, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(tree, hf_gsm_a_dtap_downlink_timeslot_offset, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -3606,10 +3609,10 @@ de_tp_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 static const true_false_string tfs_gsm_a_dtap_egprs_mode_flag = { "MS loops back blocks on the uplink using GMSK modulation only", "MS loops back blocks on the uplink using either GMSK or 8-PSK modulation following the detected received modulation" }; -static guint16 -de_tp_egprs_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_egprs_mode_flag(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset = offset; + uint32_t curr_offset = offset; proto_tree_add_item(tree, hf_gsm_a_dtap_egprs_mode_flag, tvb, curr_offset, 1, ENC_NA); proto_tree_add_item(tree, hf_gsm_a_dtap_downlink_timeslot_offset, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -3625,15 +3628,15 @@ static const value_string gsm_positioning_technology_vals[] = { { 0, NULL } }; -static guint16 -de_tp_ms_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_ms_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; + uint32_t curr_offset; + unsigned char oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_ms_positioning_technology, tvb, curr_offset, 1, oct, "%s", val_to_str(oct, gsm_positioning_technology_vals, "Reserved (%d)")); curr_offset+= 1; @@ -3649,17 +3652,17 @@ static const value_string gsm_a_dtap_ue_test_loop_mode_vals[] = { { 0, NULL } }; -static guint16 -de_tp_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; - guint8 lb_setup_length,i,j; + uint32_t curr_offset; + unsigned char oct; + uint8_t lb_setup_length,i,j; proto_tree* subtree; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_item(tree, hf_gsm_a_dtap_ue_test_loop_mode, tvb, curr_offset, 1, ENC_BIG_ENDIAN); curr_offset+= 1; @@ -3667,7 +3670,7 @@ de_tp_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, { case 0: { - lb_setup_length = tvb_get_guint8(tvb, curr_offset); + lb_setup_length = tvb_get_uint8(tvb, curr_offset); curr_offset += 1; for (i=0,j=0; (i<lb_setup_length) && (j<4); i+=3,j++) { @@ -3680,7 +3683,7 @@ de_tp_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, break; } case 2: - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); curr_offset+= 1; proto_tree_add_uint(tree, hf_gsm_a_dtap_mbms_short_transmission_identity, tvb, curr_offset, 1, (oct & 0x1f)+1); break; @@ -3689,15 +3692,15 @@ de_tp_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, return (curr_offset - offset); } -static guint16 -de_tp_ue_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_ue_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guchar oct; + uint32_t curr_offset; + unsigned char oct; curr_offset = offset; - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_uint_format_value(tree, hf_gsm_a_dtap_ue_positioning_technology, tvb, curr_offset, 1, oct, "%s", val_to_str(oct, gsm_positioning_technology_vals, "Reserved (%d)")); @@ -3706,10 +3709,10 @@ de_tp_ue_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pi return (curr_offset - offset); } -static guint16 -de_tp_rlc_sdu_counter_value(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_rlc_sdu_counter_value(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset = offset; + uint32_t curr_offset = offset; proto_tree_add_item(tree, hf_gsm_a_dtap_ue_received_rlc_sdu_counter_value, tvb, curr_offset, 4, ENC_BIG_ENDIAN); curr_offset+= 4; @@ -3729,11 +3732,11 @@ static const value_string epc_ue_test_loop_mode_vals[] = { { 7, "H"}, { 0, NULL } }; -static guint16 -de_tp_epc_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint32 bit_offset; + uint32_t curr_offset; + uint32_t bit_offset; curr_offset = offset; bit_offset = curr_offset<<3; @@ -3742,18 +3745,18 @@ de_tp_epc_ue_test_loop_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo bit_offset += 5; proto_tree_add_bits_item(tree, hf_gsm_a_dtap_epc_ue_tl_mode, tvb, bit_offset, 3, ENC_BIG_ENDIAN); /* Store test loop mode to know how to dissect Close UE Test Loop message */ - epc_test_loop_mode = tvb_get_guint8(tvb, curr_offset) & 0x07; + epc_test_loop_mode = tvb_get_uint8(tvb, curr_offset) & 0x07; curr_offset++; return (curr_offset - offset); } -static guint16 -de_tp_epc_ue_tl_a_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_a_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint32 count, nb_lb; - guint8 drb; + uint32_t curr_offset; + uint32_t count, nb_lb; + uint8_t drb; proto_tree *lb_setup_tree = NULL; proto_item *ti; @@ -3770,7 +3773,7 @@ de_tp_epc_ue_tl_a_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, proto_tree_add_bits_item(lb_setup_tree, hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size, tvb, curr_offset<<3, 16, ENC_BIG_ENDIAN); curr_offset += 2; - drb = tvb_get_guint8(tvb, curr_offset) & 0x1f; + drb = tvb_get_uint8(tvb, curr_offset) & 0x1f; proto_tree_add_uint_format_value(lb_setup_tree, hf_gsm_a_dtap_epc_ue_tl_a_drb, tvb, curr_offset, 1, drb, "%d (%d)", drb+1, drb); curr_offset++; @@ -3782,10 +3785,10 @@ de_tp_epc_ue_tl_a_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, return (len); } -static guint16 -de_tp_epc_ue_tl_b_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_b_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3795,10 +3798,10 @@ de_tp_epc_ue_tl_b_lb_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ return (curr_offset - offset); } -static guint16 -de_tp_epc_ue_tl_c_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_c_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3823,10 +3826,10 @@ static const crumb_spec_t epc_ue_tl_d_prose_app_code_crumbs[] = { { 0, 0} }; -static guint16 -de_tp_epc_ue_tl_d_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_d_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3849,10 +3852,10 @@ static const true_false_string epc_ue_tl_e_communication_value = { "Receive" }; -static guint16 -de_tp_epc_ue_tl_e_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_e_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3873,8 +3876,8 @@ static const crumb_spec_t epc_ue_tl_f_sc_mtch_id_crumbs[] = { { 0, 0} }; -static guint16 -de_tp_epc_ue_tl_f_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_f_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_split_bits_item_ret_val(tree, hf_gsm_a_dtap_epc_ue_tl_f_sc_mtch_id, tvb, offset<<3, epc_ue_tl_f_sc_mtch_id_crumbs, NULL); @@ -3887,10 +3890,10 @@ static const true_false_string epc_ue_tl_gh_communication_value = { "EMM (mode G) or SMR (mode H)" }; -static guint16 -de_tp_epc_ue_tl_gh_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_tl_gh_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3913,10 +3916,10 @@ static const value_string epc_ue_positioning_technology_vals[] = { { 0, NULL } }; -static guint16 -de_tp_epc_ue_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ue_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3926,10 +3929,10 @@ de_tp_epc_ue_positioning_technology(tvbuff_t *tvb, proto_tree *tree, packet_info return (curr_offset - offset); } -static guint16 -de_tp_epc_mbms_packet_counter_value(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_mbms_packet_counter_value(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3949,11 +3952,11 @@ static const true_false_string epc_altitude_dir_value = { "Height" }; -static guint16 -de_tp_epc_ellipsoid_point_with_alt(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_ellipsoid_point_with_alt(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint32 longitude; + uint32_t curr_offset; + uint32_t longitude; curr_offset = offset; @@ -3972,10 +3975,10 @@ de_tp_epc_ellipsoid_point_with_alt(tvbuff_t *tvb, proto_tree *tree, packet_info return (curr_offset - offset); } -static guint16 -de_tp_epc_horizontal_velocity(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_horizontal_velocity(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -3986,10 +3989,10 @@ de_tp_epc_horizontal_velocity(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf return (curr_offset - offset); } -static guint16 -de_tp_epc_gnss_tod_msec(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_tp_epc_gnss_tod_msec(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -4010,11 +4013,11 @@ static const value_string gcc_call_ref_priority[] = { { 7, "level A"}, { 0, NULL } }; -static guint16 -de_gcc_call_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_gcc_call_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint32 value; + uint32_t curr_offset; + uint32_t value; curr_offset = offset; @@ -4034,7 +4037,7 @@ de_gcc_call_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_offset += 4; - return(curr_offset - offset); + return curr_offset - offset; } static const value_string gcc_call_state_vals[] = { @@ -4054,8 +4057,8 @@ static const value_string gcc_call_state_vals[] = { /* All other values are reserved. */ }; -static guint16 -de_gcc_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_gcc_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_dtap_gcc_call_state, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -4111,10 +4114,10 @@ static const true_false_string gcc_cause_structure_val = { "cause_part <cause>" }; -static guint16 -de_gcc_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_gcc_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; int curr_len; curr_len = len; @@ -4129,17 +4132,17 @@ de_gcc_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_dtap_extraneous_data); - return(curr_offset - offset); + return curr_offset - offset; } static const true_false_string gcc_orig_ind_vals = { "The MS is the originator of the call", "The MS is not the originator of the call" }; -static guint16 -de_gcc_orig_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_gcc_orig_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -4148,7 +4151,7 @@ de_gcc_orig_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_offset++; - return(curr_offset - offset); + return curr_offset - offset; } static const true_false_string gcc_state_attr_da = { @@ -4167,8 +4170,8 @@ static const true_false_string gcc_state_attr_oi = { "The MS is the originator of the call (ORIG = T)", "The MS is not the originator of the call (ORIG = F)" }; -static guint16 -de_gcc_state_attr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_gcc_state_attr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_dtap_gcc_state_attr, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_gsm_a_dtap_gcc_state_attr_da, tvb, offset, 1, ENC_NA); @@ -4190,11 +4193,11 @@ static const value_string bcc_call_ref_priority[] = { { 7, "level A"}, { 0, NULL } }; -static guint16 -de_bcc_call_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_bcc_call_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; - guint32 value; + uint32_t curr_offset; + uint32_t value; curr_offset = offset; @@ -4214,7 +4217,7 @@ de_bcc_call_ref(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_offset += 4; - return(curr_offset - offset); + return curr_offset - offset; } static const range_string bcc_call_state_vals[] = { @@ -4230,8 +4233,8 @@ static const range_string bcc_call_state_vals[] = { {0, 0, NULL } }; -static guint16 -de_bcc_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_bcc_call_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_dtap_bcc_call_state, tvb, offset, 2, ENC_NA); @@ -4287,10 +4290,10 @@ static const true_false_string bcc_cause_structure_val = { "cause_part <cause>" }; -static guint16 -de_bcc_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_bcc_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; int curr_len; curr_len = len; @@ -4305,17 +4308,17 @@ de_bcc_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_dtap_extraneous_data); - return(curr_offset - offset); + return curr_offset - offset; } static const true_false_string bcc_orig_ind_vals = { "The MS is the originator of the call", "The MS is not the originator of the call" }; -static guint16 -de_bcc_orig_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_bcc_orig_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { - guint32 curr_offset; + uint32_t curr_offset; curr_offset = offset; @@ -4324,7 +4327,7 @@ de_bcc_orig_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_offset++; - return(curr_offset - offset); + return curr_offset - offset; } static const true_false_string bcc_state_attr_da = { @@ -4343,8 +4346,8 @@ static const true_false_string bcc_state_attr_oi = { "The MS is the originator of the call (ORIG = T)", "The MS is not the originator of the call (ORIG = F)" }; -static guint16 -de_bcc_state_attr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_bcc_state_attr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_dtap_bcc_state_attr, tvb, offset, 1, ENC_NA); proto_tree_add_item(tree, hf_gsm_a_dtap_bcc_state_attr_da, tvb, offset, 1, ENC_NA); @@ -4355,15 +4358,15 @@ de_bcc_state_attr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint return 1; } -static guint16 -de_bcc_compr_otdi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +static uint16_t +de_bcc_compr_otdi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len _U_, char *add_string _U_, int string_len _U_) { proto_tree_add_item(tree, hf_gsm_a_dtap_bcc_compr_otdi, tvb, offset, len, ENC_NA); return len; } -guint16 (*dtap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { +uint16_t (*dtap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len, char *add_string, int string_len) = { /* Mobility Management Information Elements 10.5.3 */ de_auth_param_rand, /* Authentication Parameter RAND */ de_auth_param_autn, /* Authentication Parameter AUTN (UMTS and EPS authentication challenge) */ @@ -4475,12 +4478,12 @@ guint16 (*dtap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * [12] 8.3 IMMEDIATE SETUP */ static void -dtap_gcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -4489,7 +4492,7 @@ dtap_gcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 /* * special dissection for Cipher Key Sequence Number */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); @@ -4525,11 +4528,11 @@ dtap_gcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 * [12] 8.5 SETUP */ static void -dtap_gcc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4542,11 +4545,11 @@ dtap_gcc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offs * [12] 8.1 CONNECT */ static void -dtap_gcc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4562,11 +4565,11 @@ dtap_gcc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of * [12] 8.7 TERMINATION */ static void -dtap_gcc_term(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_term(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4578,11 +4581,11 @@ dtap_gcc_term(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offse * [12] 8.9 TERMINATION REQUEST */ static void -dtap_gcc_term_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_term_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4594,11 +4597,11 @@ dtap_gcc_term_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o * [12] 8.8 TERMINATION REJECT */ static void -dtap_gcc_term_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_term_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4610,11 +4613,11 @@ dtap_gcc_term_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o * [12] 8.6 STATUS */ static void -dtap_gcc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4628,11 +4631,11 @@ dtap_gcc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 off * [12] 8.2 GET STATUS */ static void -dtap_gcc_get_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_get_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4645,11 +4648,11 @@ dtap_gcc_get_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 * [12] 8.4 SET PARAMETER */ static void -dtap_gcc_set_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_gcc_set_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4663,11 +4666,11 @@ dtap_gcc_set_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 * [13] 8.1 CONNECT */ static void -dtap_bcc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_bcc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4683,11 +4686,11 @@ dtap_bcc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of * [13] 8.2 GET STATUS */ static void -dtap_bcc_get_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_bcc_get_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4700,12 +4703,12 @@ dtap_bcc_get_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 * [13] 8.3 IMMEDIATE SETUP */ static void -dtap_bcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_bcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -4714,7 +4717,7 @@ dtap_bcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 /* * special dissection for Cipher Key Sequence Number */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); @@ -4749,12 +4752,12 @@ dtap_bcc_imm_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 * [13] 8.3a IMMEDIATE SETUP 2 */ static void -dtap_bcc_imm_setup2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) +dtap_bcc_imm_setup2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -4763,7 +4766,7 @@ dtap_bcc_imm_setup2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 /* * special dissection for Cipher Key Sequence Number */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); @@ -4799,11 +4802,11 @@ dtap_bcc_imm_setup2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 * [13] 8.4 SET PARAMETER */ static void -dtap_bcc_set_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_bcc_set_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4817,11 +4820,11 @@ dtap_bcc_set_param(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin * [13] 8.5 SETUP */ static void -dtap_bcc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_bcc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4834,11 +4837,11 @@ dtap_bcc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [13] 8.6 STATUS */ static void -dtap_bcc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_bcc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4852,11 +4855,11 @@ dtap_bcc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [13] 8.7 TERMINATION */ static void -dtap_bcc_term(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_bcc_term(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4868,11 +4871,11 @@ dtap_bcc_term(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o * [13] 8.8 TERMINATION REJECT */ static void -dtap_bcc_term_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_bcc_term_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4884,11 +4887,11 @@ dtap_bcc_term_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [13] 8.9 TERMINATION REQUEST */ static void -dtap_bcc_term_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_bcc_term_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4900,12 +4903,12 @@ dtap_bcc_term_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [4] 9.2.2 Authentication request */ static void -dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -4916,7 +4919,7 @@ dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 /* * special dissection for Cipher Key Sequence Number */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); @@ -4953,11 +4956,11 @@ dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [4] 9.2.3 Authentication response */ static void -dtap_mm_auth_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_auth_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4975,11 +4978,11 @@ dtap_mm_auth_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [4] 9.2.3a Authentication Failure */ static void -dtap_mm_auth_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_auth_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -4997,12 +5000,12 @@ dtap_mm_auth_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [3] 9.2.4 CM Re-establishment request */ static void -dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -5013,7 +5016,7 @@ dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, /* * special dissection for Cipher Key Sequence Number */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); @@ -5055,11 +5058,11 @@ dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * [3] 9.2.5a CM service prompt $(CCBS) */ static void -dtap_mm_cm_srvc_prompt(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_cm_srvc_prompt(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5075,11 +5078,11 @@ dtap_mm_cm_srvc_prompt(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * [4] 9.2.6 CM service reject */ static void -dtap_mm_cm_srvc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_cm_srvc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5097,11 +5100,11 @@ dtap_mm_cm_srvc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * [4] 9.2.8 Abort */ static void -dtap_mm_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5137,12 +5140,12 @@ static const value_string gsm_a_dtap_service_type_vals[] = { }; static void -dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -5153,7 +5156,7 @@ dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui /* * special dissection for CM Service Type */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); subtree = proto_tree_add_subtree(tree, @@ -5213,10 +5216,10 @@ static const value_string gsm_a_dtap_type_of_identity_vals[] = { }; static void -dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint curr_len; + uint32_t curr_offset; + unsigned curr_len; proto_tree *subtree; curr_offset = offset; @@ -5247,11 +5250,11 @@ dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [3] 9.2.11 Identity response */ static void -dtap_mm_id_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_id_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5273,11 +5276,11 @@ dtap_mm_id_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [3] 9.2.12 IMSI detach indication */ static void -dtap_mm_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5295,11 +5298,11 @@ dtap_mm_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu * [3] 9.2.13 Location updating accept */ static void -dtap_mm_loc_upd_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_loc_upd_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5332,11 +5335,11 @@ dtap_mm_loc_upd_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * [3] 9.2.14 Location updating reject */ static void -dtap_mm_loc_upd_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_loc_upd_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5367,12 +5370,12 @@ static const true_false_string tfs_follow_on_request_value = { }; static void -dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; proto_item *item; @@ -5384,7 +5387,7 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui /* * special dissection for Location Updating Type */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); subtree = proto_tree_add_subtree(tree, @@ -5443,11 +5446,11 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * [4] 9.2.15a MM information */ void -dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5473,11 +5476,11 @@ dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.2.16 MM Status */ static void -dtap_mm_mm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_mm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5493,11 +5496,11 @@ dtap_mm_mm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [3] 9.2.17 TMSI reallocation command */ static void -dtap_mm_tmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_mm_tmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5524,11 +5527,11 @@ dtap_mm_tmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * [4] 9.3.1 Alerting */ static void -dtap_cc_alerting(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_alerting(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5552,11 +5555,11 @@ dtap_cc_alerting(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [4] 9.3.2 Call confirmed */ static void -dtap_cc_call_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_call_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5584,11 +5587,11 @@ dtap_cc_call_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [4] 9.3.3 Call proceeding */ static void -dtap_cc_call_proceed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_call_proceed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5622,12 +5625,12 @@ static const value_string gsm_a_dtap_congestion_level_vals[] = { }; static void -dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; - guint8 oct; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; + uint8_t oct; proto_tree *subtree; curr_offset = offset; @@ -5638,7 +5641,7 @@ dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ /* * special dissection for Congestion Level */ - oct = tvb_get_guint8(tvb, curr_offset); + oct = tvb_get_uint8(tvb, curr_offset); proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, curr_offset<<3, 4, ENC_BIG_ENDIAN); @@ -5662,11 +5665,11 @@ dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * [4] 9.3.5 Connect */ static void -dtap_cc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5696,11 +5699,11 @@ dtap_cc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.7 Disconnect */ static void -dtap_cc_disconnect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_disconnect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5728,11 +5731,11 @@ dtap_cc_disconnect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin * [4] 9.3.8 Emergency setup */ static void -dtap_cc_emerg_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_emerg_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5754,11 +5757,11 @@ dtap_cc_emerg_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * [4] 9.3.9 Facility */ static void -dtap_cc_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5784,11 +5787,11 @@ dtap_cc_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [4] 9.3.12 Hold Reject */ static void -dtap_cc_hold_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_hold_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5804,11 +5807,11 @@ dtap_cc_hold_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [4] 9.3.13 Modify */ static void -dtap_cc_modify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_modify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5832,11 +5835,11 @@ dtap_cc_modify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.14 Modify complete */ static void -dtap_cc_modify_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_modify_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5858,11 +5861,11 @@ dtap_cc_modify_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * [4] 9.3.15 Modify reject */ static void -dtap_cc_modify_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_modify_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5884,11 +5887,11 @@ dtap_cc_modify_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin * [4] 9.3.16 Notify */ static void -dtap_cc_notify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_notify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5904,11 +5907,11 @@ dtap_cc_notify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.17 Progress */ static void -dtap_cc_progress(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_progress(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5926,11 +5929,11 @@ dtap_cc_progress(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [4] 9.3.17a CC-Establishment $(CCBS)$ */ static void -dtap_cc_cc_est(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_cc_est(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5946,11 +5949,11 @@ dtap_cc_cc_est(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.17b CC-Establishment confirmed $(CCBS)$ */ static void -dtap_cc_cc_est_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_cc_est_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -5974,11 +5977,11 @@ dtap_cc_cc_est_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * [4] 9.3.18 Release */ static void -dtap_cc_release(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_release(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6004,11 +6007,11 @@ dtap_cc_release(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.18a Recall $(CCBS)$ */ static void -dtap_cc_recall(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_recall(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6026,11 +6029,11 @@ dtap_cc_recall(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.19 Release complete */ static void -dtap_cc_release_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_release_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6054,11 +6057,11 @@ dtap_cc_release_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * [4] 9.3.22 Retrieve */ static void -dtap_cc_retrieve_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_retrieve_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6083,11 +6086,11 @@ dtap_cc_retrieve_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu * 3GPP TS 24.008 version 7.5.0 Release 7 */ static void -dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6173,11 +6176,11 @@ dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o * [4] 9.3.23a Start CC $(CCBS)$ */ static void -dtap_cc_start_cc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_start_cc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6193,11 +6196,11 @@ dtap_cc_start_cc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [4] 9.3.24 Start DTMF */ static void -dtap_cc_start_dtmf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_start_dtmf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6213,11 +6216,11 @@ dtap_cc_start_dtmf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin * [4] 9.3.25 Start DTMF Acknowledge */ static void -dtap_cc_start_dtmf_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_start_dtmf_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6233,11 +6236,11 @@ dtap_cc_start_dtmf_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * [4] 9.3.26 Start DTMF reject */ static void -dtap_cc_start_dtmf_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_start_dtmf_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6253,11 +6256,11 @@ dtap_cc_start_dtmf_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, * [4] 9.3.27 Status */ static void -dtap_cc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6288,11 +6291,11 @@ dtap_cc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [4] 9.3.31 User information */ static void -dtap_cc_user_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_cc_user_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6311,11 +6314,11 @@ dtap_cc_user_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * [6] 2.4.2 */ static void -dtap_ss_register(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_ss_register(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6334,11 +6337,11 @@ dtap_ss_register(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [5] 7.2.1 */ static void -dtap_sms_cp_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_sms_cp_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6354,11 +6357,11 @@ dtap_sms_cp_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * [5] 7.2.3 */ static void -dtap_sms_cp_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_sms_cp_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_offset = offset; curr_len = len; @@ -6371,11 +6374,11 @@ dtap_sms_cp_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint } static void -dtap_tp_close_tch_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_close_tch_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6386,11 +6389,11 @@ dtap_tp_close_tch_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ } static void -dtap_tp_open_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_open_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6402,11 +6405,11 @@ dtap_tp_open_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g } static void -dtap_tp_multi_slot_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_multi_slot_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6417,11 +6420,11 @@ dtap_tp_multi_slot_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo } static void -dtap_tp_multi_slot_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_multi_slot_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6432,11 +6435,11 @@ dtap_tp_multi_slot_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo } static void -dtap_tp_test_interface(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_test_interface(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6447,11 +6450,11 @@ dtap_tp_test_interface(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, } static void -dtap_tp_gprs_test_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_gprs_test_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6464,11 +6467,11 @@ dtap_tp_gprs_test_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ } static void -dtap_tp_egprs_start_radio_block_loopback_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_egprs_start_radio_block_loopback_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6479,11 +6482,11 @@ dtap_tp_egprs_start_radio_block_loopback_cmd(tvbuff_t *tvb, proto_tree *tree, pa } static void -dtap_tp_reset_ms_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_reset_ms_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6494,11 +6497,11 @@ dtap_tp_reset_ms_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, } static void -dtap_tp_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6509,11 +6512,11 @@ dtap_tp_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ } static void -dtap_tp_reset_ue_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_reset_ue_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6524,11 +6527,11 @@ dtap_tp_reset_ue_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, } static void -dtap_tp_ue_test_loop_mode_3_rlc_sdu_counter_response(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_ue_test_loop_mode_3_rlc_sdu_counter_response(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6539,11 +6542,11 @@ dtap_tp_ue_test_loop_mode_3_rlc_sdu_counter_response(tvbuff_t *tvb, proto_tree * } static void -dtap_tp_epc_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_epc_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6582,11 +6585,11 @@ dtap_tp_epc_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pin } static void -dtap_tp_epc_activate_test_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_epc_activate_test_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6597,11 +6600,11 @@ dtap_tp_epc_activate_test_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pin } static void -dtap_tp_epc_reset_ue_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_epc_reset_ue_positioning_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6612,11 +6615,11 @@ dtap_tp_epc_reset_ue_positioning_stored_information(tvbuff_t *tvb, proto_tree *t } static void -dtap_tp_epc_test_loop_mode_c_mbms_packet_counter_response(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_epc_test_loop_mode_c_mbms_packet_counter_response(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6626,11 +6629,11 @@ dtap_tp_epc_test_loop_mode_c_mbms_packet_counter_response(tvbuff_t *tvb, proto_t EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_dtap_extraneous_data); } static void -dtap_tp_epc_update_ue_location_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +dtap_tp_epc_update_ue_location_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) { - guint32 curr_offset; - guint32 consumed; - guint curr_len; + uint32_t curr_offset; + uint32_t consumed; + unsigned curr_len; curr_len = len; curr_offset = offset; @@ -6644,9 +6647,9 @@ dtap_tp_epc_update_ue_location_information(tvbuff_t *tvb, proto_tree *tree, pack EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_dtap_extraneous_data); } -#define NUM_GSM_DTAP_MSG_GCC (sizeof(gsm_a_dtap_msg_gcc_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_gcc[NUM_GSM_DTAP_MSG_GCC]; -static void (*dtap_msg_gcc[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_GCC array_length(gsm_a_dtap_msg_gcc_strings) +static int ett_gsm_dtap_msg_gcc[NUM_GSM_DTAP_MSG_GCC]; +static void (*dtap_msg_gcc[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_gcc_imm_setup, /* IMMEDIATE SETUP */ dtap_gcc_setup, /* SETUP */ dtap_gcc_connect, /* CONNECT */ @@ -6659,9 +6662,9 @@ static void (*dtap_msg_gcc[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf NULL, /* NONE */ }; -#define NUM_GSM_DTAP_MSG_BCC (sizeof(gsm_a_dtap_msg_bcc_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_bcc[NUM_GSM_DTAP_MSG_BCC]; -static void (*dtap_msg_bcc[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_BCC array_length(gsm_a_dtap_msg_bcc_strings) +static int ett_gsm_dtap_msg_bcc[NUM_GSM_DTAP_MSG_BCC]; +static void (*dtap_msg_bcc[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_bcc_imm_setup, /* IMMEDIATE SETUP */ dtap_bcc_setup, /* SETUP */ dtap_bcc_connect, /* CONNECT */ @@ -6675,9 +6678,9 @@ static void (*dtap_msg_bcc[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf NULL, /* NONE */ }; -#define NUM_GSM_DTAP_MSG_MM (sizeof(gsm_a_dtap_msg_mm_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_mm[NUM_GSM_DTAP_MSG_MM]; -static void (*dtap_msg_mm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_MM array_length(gsm_a_dtap_msg_mm_strings) +static int ett_gsm_dtap_msg_mm[NUM_GSM_DTAP_MSG_MM]; +static void (*dtap_msg_mm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_mm_imsi_det_ind, /* IMSI Detach Indication */ dtap_mm_loc_upd_acc, /* Location Updating Accept */ dtap_mm_loc_upd_rej, /* Location Updating Reject */ @@ -6704,9 +6707,9 @@ static void (*dtap_msg_mm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *p NULL, /* NONE */ }; -#define NUM_GSM_DTAP_MSG_CC (sizeof(gsm_a_dtap_msg_cc_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_cc[NUM_GSM_DTAP_MSG_CC]; -static void (*dtap_msg_cc_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_CC array_length(gsm_a_dtap_msg_cc_strings) +static int ett_gsm_dtap_msg_cc[NUM_GSM_DTAP_MSG_CC]; +static void (*dtap_msg_cc_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_cc_alerting, /* Alerting */ dtap_cc_call_conf, /* Call Confirmed */ dtap_cc_call_proceed, /* Call Proceeding */ @@ -6745,27 +6748,27 @@ static void (*dtap_msg_cc_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *p NULL, /* NONE */ }; -#define NUM_GSM_DTAP_MSG_SMS (sizeof(gsm_a_dtap_msg_sms_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_sms[NUM_GSM_DTAP_MSG_SMS]; -static void (*dtap_msg_sms_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_SMS array_length(gsm_a_dtap_msg_sms_strings) +static int ett_gsm_dtap_msg_sms[NUM_GSM_DTAP_MSG_SMS]; +static void (*dtap_msg_sms_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_sms_cp_data, /* CP-DATA */ NULL /* no associated data */, /* CP-ACK */ dtap_sms_cp_error, /* CP-ERROR */ NULL, /* NONE */ }; -#define NUM_GSM_DTAP_MSG_SS (sizeof(gsm_a_dtap_msg_ss_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_ss[NUM_GSM_DTAP_MSG_SS]; -static void (*dtap_msg_ss_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_SS array_length(gsm_a_dtap_msg_ss_strings) +static int ett_gsm_dtap_msg_ss[NUM_GSM_DTAP_MSG_SS]; +static void (*dtap_msg_ss_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_cc_release_complete, /* Release Complete */ dtap_cc_facility, /* Facility */ dtap_ss_register, /* Register */ NULL, /* NONE */ }; -#define NUM_GSM_DTAP_MSG_TP (sizeof(gsm_a_dtap_msg_tp_strings)/sizeof(value_string)) -static gint ett_gsm_dtap_msg_tp[NUM_GSM_DTAP_MSG_TP]; -static void (*dtap_msg_tp_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { +#define NUM_GSM_DTAP_MSG_TP array_length(gsm_a_dtap_msg_tp_strings) +static int ett_gsm_dtap_msg_tp[NUM_GSM_DTAP_MSG_TP]; +static void (*dtap_msg_tp_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, uint32_t offset, unsigned len) = { dtap_tp_close_tch_loop_cmd, /* CLOSE TCH LOOP CMD */ NULL, /* CLOSE TCH LOOP ACK */ dtap_tp_open_loop_cmd, /* OPEN LOOP CMD */ @@ -6817,25 +6820,25 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { static gsm_a_tap_rec_t tap_rec[4]; static gsm_a_tap_rec_t *tap_p; - static guint tap_current = 0; + static unsigned tap_current = 0; - void (*dtap_msg_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); + void (*dtap_msg_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, uint32_t offset, unsigned len); - guint8 oct; - guint8 pd; - guint32 offset; - guint32 len; - guint32 oct_1; - gint idx; + uint8_t oct; + uint8_t pd; + uint32_t offset; + uint32_t len; + uint32_t oct_1; + int idx; proto_item *dtap_item = NULL; proto_tree *dtap_tree = NULL; proto_item *oct_1_item = NULL; proto_tree *pd_tree = NULL; - const gchar *msg_str; - gint ett_tree; - gint ti; + const char *msg_str; + int ett_tree; + int ti; int hf_idx; - gboolean nsd; + bool nsd; sccp_msg_info_t* sccp_msg = (sccp_msg_info_t*)data; @@ -6870,7 +6873,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* * get protocol discriminator */ - oct_1 = tvb_get_guint8(tvb, offset++); + oct_1 = tvb_get_uint8(tvb, offset++); if ((((oct_1 & DTAP_TI_MASK) >> 4) & DTAP_TIE_PRES_MASK) == DTAP_TIE_PRES_MASK) { @@ -6879,14 +6882,14 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) return len; } /* - * eventhough we don't know if a TI should be in the message yet + * even though we don't know if a TI should be in the message yet * we rely on the TI/SKIP indicator to be 0 to avoid taking this * octet */ offset++; } - oct = tvb_get_guint8(tvb, offset); + oct = tvb_get_uint8(tvb, offset); pd = oct_1 & DTAP_PD_MASK; ti = -1; @@ -6894,7 +6897,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) ett_tree = -1; hf_idx = -1; dtap_msg_fcn = NULL; - nsd = FALSE; + nsd = false; col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ",val_to_str_const(pd,gsm_a_pd_short_str_vals,"unknown")); /* @@ -6905,7 +6908,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) switch (pd) { case 0: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_GCC_IEI_MASK), gsm_a_dtap_msg_gcc_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_GCC_IEI_MASK), gsm_a_dtap_msg_gcc_strings, &idx); if (msg_str != NULL) { ett_tree = ett_gsm_dtap_msg_gcc[idx]; @@ -6913,10 +6916,10 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } hf_idx = hf_gsm_a_dtap_msg_gcc_type; ti = (oct_1 & DTAP_TI_MASK) >> 4; - nsd = TRUE; + nsd = true; break; case 1: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_BCC_IEI_MASK), gsm_a_dtap_msg_bcc_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_BCC_IEI_MASK), gsm_a_dtap_msg_bcc_strings, &idx); if (msg_str != NULL) { ett_tree = ett_gsm_dtap_msg_bcc[idx]; @@ -6924,10 +6927,10 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } hf_idx = hf_gsm_a_dtap_msg_bcc_type; ti = (oct_1 & DTAP_TI_MASK) >> 4; - nsd = TRUE; + nsd = true; break; case 3: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_CC_IEI_MASK), gsm_a_dtap_msg_cc_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_CC_IEI_MASK), gsm_a_dtap_msg_cc_strings, &idx); if (msg_str != NULL) { ett_tree = ett_gsm_dtap_msg_cc[idx]; @@ -6935,18 +6938,18 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } hf_idx = hf_gsm_a_dtap_msg_cc_type; ti = (oct_1 & DTAP_TI_MASK) >> 4; - nsd = TRUE; + nsd = true; break; case 5: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_MM_IEI_MASK), gsm_a_dtap_msg_mm_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_MM_IEI_MASK), gsm_a_dtap_msg_mm_strings, &idx); if (msg_str != NULL) { ett_tree = ett_gsm_dtap_msg_mm[idx]; dtap_msg_fcn = dtap_msg_mm_fcn[idx]; } hf_idx = hf_gsm_a_dtap_msg_mm_type; - nsd = TRUE; + nsd = true; break; case 6: @@ -6958,7 +6961,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) break; case 9: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_SMS_IEI_MASK), gsm_a_dtap_msg_sms_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_SMS_IEI_MASK), gsm_a_dtap_msg_sms_strings, &idx); hf_idx = hf_gsm_a_dtap_msg_sms_type; if (msg_str != NULL) { @@ -6974,7 +6977,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) break; case 11: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_SS_IEI_MASK), gsm_a_dtap_msg_ss_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_SS_IEI_MASK), gsm_a_dtap_msg_ss_strings, &idx); hf_idx = hf_gsm_a_dtap_msg_ss_type; if (msg_str != NULL) { @@ -6982,18 +6985,18 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) dtap_msg_fcn = dtap_msg_ss_fcn[idx]; } ti = (oct_1 & DTAP_TI_MASK) >> 4; - nsd = TRUE; + nsd = true; break; case 15: - msg_str = try_val_to_str_idx((guint32) (oct & DTAP_TP_IEI_MASK), gsm_a_dtap_msg_tp_strings, &idx); + msg_str = try_val_to_str_idx((uint32_t) (oct & DTAP_TP_IEI_MASK), gsm_a_dtap_msg_tp_strings, &idx); hf_idx = hf_gsm_a_dtap_msg_tp_type; if (msg_str != NULL) { ett_tree = ett_gsm_dtap_msg_tp[idx]; dtap_msg_fcn = dtap_msg_tp_fcn[idx]; } - nsd = TRUE; + nsd = true; break; default: @@ -7137,8 +7140,8 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) void proto_register_gsm_a_dtap(void) { - guint i; - guint last_offset; + unsigned i; + unsigned last_offset; /* Setup list of header fields */ @@ -7625,7 +7628,7 @@ proto_register_gsm_a_dtap(void) }, { &hf_gsm_a_dtap_epc_ue_tl_gh_ul_loopback_op_mode, { "Uplink loopback operation mode","gsm_a.dtap.epc.ue_tl_gh_ul_loopback_op_mode", - FT_BOOLEAN, 8, TFS(&epc_ue_tl_gh_communication_value), 0x0, + FT_BOOLEAN, BASE_NONE, TFS(&epc_ue_tl_gh_communication_value), 0x0, NULL, HFILL } }, { &hf_gsm_a_dtap_epc_ue_tl_gh_repetitions, @@ -7635,7 +7638,7 @@ proto_register_gsm_a_dtap(void) }, { &hf_gsm_a_dtap_epc_ue_tl_gh_ul_data_delay, { "Uplink data delay","gsm_a.dtap.epc.ue_tl_gh_ul_data_delay", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0x0, + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&units_seconds), 0x0, NULL, HFILL } }, { &hf_gsm_a_dtap_epc_ue_positioning_technology, @@ -8371,7 +8374,7 @@ proto_register_gsm_a_dtap(void) }, { &hf_gsm_a_dtap_uplink_rlc_sdu_size, { "Uplink RLC SDU size", "gsm_a_dtap.uplink_rlc_sdu_size", - FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_bit_bits, 0x0, + FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&units_bit_bits), 0x0, NULL, HFILL } }, { &hf_gsm_a_dtap_radio_bearer, @@ -8398,7 +8401,7 @@ proto_register_gsm_a_dtap(void) /* Setup protocol subtree array */ #define NUM_INDIVIDUAL_ELEMS 22 - gint *ett[NUM_INDIVIDUAL_ELEMS + + int *ett[NUM_INDIVIDUAL_ELEMS + NUM_GSM_DTAP_MSG_MM + NUM_GSM_DTAP_MSG_CC + NUM_GSM_DTAP_MSG_SMS + NUM_GSM_DTAP_MSG_SS + NUM_GSM_DTAP_MSG_TP + NUM_GSM_DTAP_ELEM]; @@ -8446,37 +8449,31 @@ proto_register_gsm_a_dtap(void) for (i=0; i < NUM_GSM_DTAP_MSG_MM; i++, last_offset++) { - ett_gsm_dtap_msg_mm[i] = -1; ett[last_offset] = &ett_gsm_dtap_msg_mm[i]; } for (i=0; i < NUM_GSM_DTAP_MSG_CC; i++, last_offset++) { - ett_gsm_dtap_msg_cc[i] = -1; ett[last_offset] = &ett_gsm_dtap_msg_cc[i]; } for (i=0; i < NUM_GSM_DTAP_MSG_SMS; i++, last_offset++) { - ett_gsm_dtap_msg_sms[i] = -1; ett[last_offset] = &ett_gsm_dtap_msg_sms[i]; } for (i=0; i < NUM_GSM_DTAP_MSG_SS; i++, last_offset++) { - ett_gsm_dtap_msg_ss[i] = -1; ett[last_offset] = &ett_gsm_dtap_msg_ss[i]; } for (i=0; i < NUM_GSM_DTAP_MSG_TP; i++, last_offset++) { - ett_gsm_dtap_msg_tp[i] = -1; ett[last_offset] = &ett_gsm_dtap_msg_tp[i]; } for (i=0; i < NUM_GSM_DTAP_ELEM; i++, last_offset++) { - ett_gsm_dtap_elem[i] = -1; ett[last_offset] = &ett_gsm_dtap_elem[i]; } |