diff options
Diffstat (limited to 'epan/dissectors/packet-q933.c')
| -rw-r--r-- | epan/dissectors/packet-q933.c | 248 |
1 files changed, 124 insertions, 124 deletions
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index b4fe045b3f..18b718536b 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -19,116 +19,116 @@ void proto_register_q933(void); void proto_reg_handoff_q933(void); -static int proto_q933 = -1; -static int hf_q933_discriminator = -1; -static int hf_q933_coding_standard = -1; -static int hf_q933_information_transfer_capability = -1; -static int hf_q933_transfer_mode = -1; -static int hf_q933_uil1 = -1; -static int hf_q933_call_ref_len = -1; -static int hf_q933_call_ref_flag = -1; -static int hf_q933_call_ref = -1; -static int hf_q933_message_type = -1; -static int hf_q933_cause_location = -1; -static int hf_q933_cause_value = -1; -static int hf_q933_number_type = -1; -static int hf_q933_numbering_plan = -1; -static int hf_q933_extension_ind = -1; -static int hf_q933_calling_party_number = -1; -static int hf_q933_called_party_number = -1; -static int hf_q933_connected_number = -1; -/* static int hf_q933_redirecting_number = -1; */ -static int hf_q933_screening_ind = -1; -static int hf_q933_presentation_ind = -1; -static int hf_q933_report_type = -1; -static int hf_q933_link_verf_txseq = -1; -static int hf_q933_link_verf_rxseq = -1; -static int hf_q933_data = -1; +static int proto_q933; +static int hf_q933_discriminator; +static int hf_q933_coding_standard; +static int hf_q933_information_transfer_capability; +static int hf_q933_transfer_mode; +static int hf_q933_uil1; +static int hf_q933_call_ref_len; +static int hf_q933_call_ref_flag; +static int hf_q933_call_ref; +static int hf_q933_message_type; +static int hf_q933_cause_location; +static int hf_q933_cause_value; +static int hf_q933_number_type; +static int hf_q933_numbering_plan; +static int hf_q933_extension_ind; +static int hf_q933_calling_party_number; +static int hf_q933_called_party_number; +static int hf_q933_connected_number; +/* static int hf_q933_redirecting_number; */ +static int hf_q933_screening_ind; +static int hf_q933_presentation_ind; +static int hf_q933_report_type; +static int hf_q933_link_verf_txseq; +static int hf_q933_link_verf_rxseq; +static int hf_q933_data; /* Generated from convert_proto_tree_add_text.pl */ -static int hf_q933_user_information_layer_3_protocol = -1; -static int hf_q933_additional_layer_3_protocol_information = -1; -static int hf_q933_network_identification_plan = -1; -static int hf_q933_map_element_type = -1; -static int hf_q933_channel_type = -1; -static int hf_q933_channel_indicated_by = -1; -static int hf_q933_extended_audiovisual_characteristics_id = -1; -static int hf_q933_location = -1; -static int hf_q933_subaddress = -1; -static int hf_q933_type_of_network_identification = -1; -static int hf_q933_address_inclusion = -1; -static int hf_q933_odd_even_indicator = -1; -static int hf_q933_reverse_charging_indication = -1; -static int hf_q933_call_state = -1; -static int hf_q933_user_information_layer_2_protocol = -1; -static int hf_q933_packet_window_size = -1; -static int hf_q933_locking_shift_to_codeset = -1; -static int hf_q933_non_locking_shift_to_codeset = -1; -static int hf_q933_not_first_segment = -1; -static int hf_q933_user_rate = -1; -static int hf_q933_indicated_channel_required = -1; -static int hf_q933_high_layer_characteristics_identification = -1; -static int hf_q933_rejection_reason = -1; -static int hf_q933_progress_description = -1; -static int hf_q933_parity = -1; -static int hf_q933_extended_high_layer_characteristics_id = -1; -static int hf_q933_dlci = -1; -static int hf_q933_recommendation = -1; -static int hf_q933_mode = -1; -static int hf_q933_user_information_str = -1; -static int hf_q933_network_service = -1; -static int hf_q933_interface_basic = -1; -static int hf_q933_missing_information_element = -1; -static int hf_q933_information_element = -1; -static int hf_q933_condition_normal = -1; -static int hf_q933_not_channel_selection = -1; -static int hf_q933_network_identification_length = -1; -static int hf_q933_segmented_message_type = -1; -static int hf_q933_diagnostic = -1; -static int hf_q933_user_specified_layer_2_protocol_information = -1; -static int hf_q933_interface_identified = -1; -static int hf_q933_network_specific_facility_specification = -1; -static int hf_q933_data_bits = -1; -static int hf_q933_default_packet_size = -1; -static int hf_q933_insufficient_information_element = -1; -static int hf_q933_modem_type = -1; -static int hf_q933_user_information_bytes = -1; -static int hf_q933_multiple_frame_establishment = -1; -static int hf_q933_duplex = -1; -static int hf_q933_mode_of_operation = -1; -static int hf_q933_condition = -1; -static int hf_q933_status = -1; -static int hf_q933_repeat_indicator = -1; -static int hf_q933_confirmation = -1; -static int hf_q933_default_packet_size_0F = -1; -static int hf_q933_interface_identifier = -1; -static int hf_q933_stop_bits = -1; -static int hf_q933_indicated_channel_d_channel = -1; -static int hf_q933_channel_selection = -1; -static int hf_q933_user_specific_diagnostic = -1; -static int hf_q933_timer = -1; -static int hf_q933_first_segment = -1; -static int hf_q933_network_identification = -1; -static int hf_q933_out_band_negotiation = -1; -static int hf_q933_layer_1 = -1; -static int hf_q933_type_of_subaddress = -1; -static int hf_q933_protocol_discriminator = -1; -static int hf_q933_rate_adaption_header = -1; -static int hf_q933_reason_for_redirection = -1; -static int hf_q933_length = -1; -static int hf_q933_diagnostics = -1; -static int hf_q933_display_information = -1; -static int hf_q933_cumulative_transit_delay = -1; -static int hf_q933_requested_end_to_end_transit_delay = -1; -static int hf_q933_max_end_to_end_transit_delay = -1; -static int hf_q933_transit_delay = -1; -static int hf_q933_request = -1; - -static gint ett_q933 = -1; -static gint ett_q933_ie = -1; - -static expert_field ei_q933_invalid_length = EI_INIT; -static expert_field ei_q933_information_element = EI_INIT; +static int hf_q933_user_information_layer_3_protocol; +static int hf_q933_additional_layer_3_protocol_information; +static int hf_q933_network_identification_plan; +static int hf_q933_map_element_type; +static int hf_q933_channel_type; +static int hf_q933_channel_indicated_by; +static int hf_q933_extended_audiovisual_characteristics_id; +static int hf_q933_location; +static int hf_q933_subaddress; +static int hf_q933_type_of_network_identification; +static int hf_q933_address_inclusion; +static int hf_q933_odd_even_indicator; +static int hf_q933_reverse_charging_indication; +static int hf_q933_call_state; +static int hf_q933_user_information_layer_2_protocol; +static int hf_q933_packet_window_size; +static int hf_q933_locking_shift_to_codeset; +static int hf_q933_non_locking_shift_to_codeset; +static int hf_q933_not_first_segment; +static int hf_q933_user_rate; +static int hf_q933_indicated_channel_required; +static int hf_q933_high_layer_characteristics_identification; +static int hf_q933_rejection_reason; +static int hf_q933_progress_description; +static int hf_q933_parity; +static int hf_q933_extended_high_layer_characteristics_id; +static int hf_q933_dlci; +static int hf_q933_recommendation; +static int hf_q933_mode; +static int hf_q933_user_information_str; +static int hf_q933_network_service; +static int hf_q933_interface_basic; +static int hf_q933_missing_information_element; +static int hf_q933_information_element; +static int hf_q933_condition_normal; +static int hf_q933_not_channel_selection; +static int hf_q933_network_identification_length; +static int hf_q933_segmented_message_type; +static int hf_q933_diagnostic; +static int hf_q933_user_specified_layer_2_protocol_information; +static int hf_q933_interface_identified; +static int hf_q933_network_specific_facility_specification; +static int hf_q933_data_bits; +static int hf_q933_default_packet_size; +static int hf_q933_insufficient_information_element; +static int hf_q933_modem_type; +static int hf_q933_user_information_bytes; +static int hf_q933_multiple_frame_establishment; +static int hf_q933_duplex; +static int hf_q933_mode_of_operation; +static int hf_q933_condition; +static int hf_q933_status; +static int hf_q933_repeat_indicator; +static int hf_q933_confirmation; +static int hf_q933_default_packet_size_0F; +static int hf_q933_interface_identifier; +static int hf_q933_stop_bits; +static int hf_q933_indicated_channel_d_channel; +static int hf_q933_channel_selection; +static int hf_q933_user_specific_diagnostic; +static int hf_q933_timer; +static int hf_q933_first_segment; +static int hf_q933_network_identification; +static int hf_q933_out_band_negotiation; +static int hf_q933_layer_1; +static int hf_q933_type_of_subaddress; +static int hf_q933_protocol_discriminator; +static int hf_q933_rate_adaption_header; +static int hf_q933_reason_for_redirection; +static int hf_q933_length; +static int hf_q933_diagnostics; +static int hf_q933_display_information; +static int hf_q933_cumulative_transit_delay; +static int hf_q933_requested_end_to_end_transit_delay; +static int hf_q933_max_end_to_end_transit_delay; +static int hf_q933_transit_delay; +static int hf_q933_request; + +static gint ett_q933; +static gint ett_q933_ie; + +static expert_field ei_q933_invalid_length; +static expert_field ei_q933_information_element; static dissector_handle_t q933_handle; @@ -432,16 +432,16 @@ static const value_string q933_l1_user_rate_vals[] = { }; static const value_string q933_l1_stop_bits_vals[] = { - { 0x20, "1" }, - { 0x40, "1.5" }, - { 0x60, "2" }, + { 1, "1" }, + { 2, "1.5" }, + { 3, "2" }, { 0, NULL } }; static const value_string q933_l1_data_bits_vals[] = { - { 0x08, "5" }, - { 0x10, "7" }, - { 0x18, "8" }, + { 1, "5" }, + { 2, "7" }, + { 3, "8" }, { 0, NULL } }; @@ -480,8 +480,8 @@ static const value_string q933_address_inclusion_vals[] = { }; static const value_string q933_mode_vals[] = { - { 0x20, "Normal mode" }, - { 0x40, "Extended mode" }, + { 1, "Normal mode" }, + { 2, "Extended mode" }, { 0, NULL } }; @@ -1009,7 +1009,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, case Q933_CAUSE_REC_TIMER_EXP: if (len < 3) return; - proto_tree_add_item(tree, hf_q933_timer, tvb, offset, 3, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_q933_timer, tvb, offset, 3, ENC_ASCII); break; default: @@ -1306,9 +1306,9 @@ dissect_q933_progress_indicator_ie(tvbuff_t *tvb, int offset, int len, * information element. */ static const value_string q933_netid_type_vals[] = { - { 0x00, "User specified" }, - { 0x20, "National network identification" }, - { 0x30, "International network identification" }, + { 0, "User specified" }, + { 2, "National network identification" }, + { 3, "International network identification" }, { 0, NULL } }; @@ -1607,14 +1607,14 @@ dissect_q933_number_ie(tvbuff_t *tvb, int offset, int len, * Dissect a party subaddress information element. */ static const value_string q933_subaddress_type_vals[] = { - { 0x00, "X.213/ISO 8348 Add.2 NSAP" }, - { 0x20, "User-specified" }, + { 0, "X.213/ISO 8348 Add.2 NSAP" }, + { 2, "User-specified" }, { 0, NULL } }; static const value_string q933_odd_even_indicator_vals[] = { - { 0x00, "Even number of address signals" }, - { 0x10, "Odd number of address signals" }, + { 0, "Even number of address signals" }, + { 1, "Odd number of address signals" }, { 0, NULL } }; |