diff options
Diffstat (limited to '')
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 1614 |
1 files changed, 855 insertions, 759 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index b271d422..904dd436 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -91,7 +91,6 @@ #include <epan/packet.h> #include <epan/expert.h> -#include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/to_str.h> #include <epan/in_cksum.h> @@ -101,6 +100,11 @@ #include <epan/conversation_table.h> #include <epan/tap.h> #include <epan/addr_resolv.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> + +#include <wsutil/array.h> +#include <wsutil/utf8_entities.h> #include "packet-rsvp.h" #include "packet-ip.h" #include "packet-diffserv-mpls-common.h" @@ -113,529 +117,539 @@ void proto_register_rsvp(void); void proto_reg_handoff_rsvp(void); static dissector_handle_t rsvp_handle, rsvpe2ei_handle; -static int proto_rsvp = -1; -static int proto_rsvp_e2e1 = -1; - -static int hf_rsvp_error_flags = -1; -static int hf_rsvp_error_flags_path_state_removed = -1; -static int hf_rsvp_error_flags_not_guilty = -1; -static int hf_rsvp_error_flags_in_place = -1; -static int hf_rsvp_eth_tspec_tlv_color_mode = -1; -static int hf_rsvp_eth_tspec_tlv_coupling_flag = -1; -static int hf_rsvp_sender_tspec_standard_contiguous_concatenation = -1; -static int hf_rsvp_sender_tspec_arbitrary_contiguous_concatenation = -1; -static int hf_rsvp_sender_tspec_regenerator_section = -1; -static int hf_rsvp_sender_tspec_multiplex_section = -1; -static int hf_rsvp_sender_tspec_J0_transparency = -1; -static int hf_rsvp_sender_tspec_SOH_RSOH_DCC_transparency = -1; -static int hf_rsvp_sender_tspec_LOH_MSOH_DCC_transparency = -1; -static int hf_rsvp_sender_tspec_LOH_MSOH_extended_DCC_transparency = -1; -static int hf_rsvp_sender_tspec_K1_K2_transparency = -1; -static int hf_rsvp_sender_tspec_E1_transparency = -1; -static int hf_rsvp_sender_tspec_F1_transparency = -1; -static int hf_rsvp_sender_tspec_E2_transparency = -1; -static int hf_rsvp_sender_tspec_B1_transparency = -1; -static int hf_rsvp_sender_tspec_B2_transparency = -1; -static int hf_rsvp_sender_tspec_M0_transparency = -1; -static int hf_rsvp_sender_tspec_M1_transparency = -1; -static int hf_rsvp_flowspec_standard_contiguous_concatenation = -1; -static int hf_rsvp_flowspec_arbitrary_contiguous_concatenation = -1; -static int hf_rsvp_flowspec_regenerator_section = -1; -static int hf_rsvp_flowspec_multiplex_section = -1; -static int hf_rsvp_flowspec_J0_transparency = -1; -static int hf_rsvp_flowspec_SOH_RSOH_DCC_transparency = -1; -static int hf_rsvp_flowspec_LOH_MSOH_DCC_transparency = -1; -static int hf_rsvp_flowspec_LOH_MSOH_extended_DCC_transparency = -1; -static int hf_rsvp_flowspec_K1_K2_transparency = -1; -static int hf_rsvp_flowspec_E1_transparency = -1; -static int hf_rsvp_flowspec_F1_transparency = -1; -static int hf_rsvp_flowspec_E2_transparency = -1; -static int hf_rsvp_flowspec_B1_transparency = -1; -static int hf_rsvp_flowspec_B2_transparency = -1; -static int hf_rsvp_flowspec_M0_transparency = -1; -static int hf_rsvp_flowspec_M1_transparency = -1; -static int hf_rsvp_integrity_flags_handshake = -1; -static int hf_rsvp_sa_flags_local = -1; -static int hf_rsvp_sa_flags_label = -1; -static int hf_rsvp_sa_flags_se_style = -1; -static int hf_rsvp_sa_flags_bandwidth = -1; -static int hf_rsvp_sa_flags_node = -1; -static int hf_rsvp_rro_flags_local_avail = -1; -static int hf_rsvp_rro_flags_local_in_use = -1; -static int hf_rsvp_rro_flags_bandwidth = -1; -static int hf_rsvp_rro_flags_node = -1; -static int hf_rsvp_rro_flags_node_address = -1; -static int hf_rsvp_rro_flags_backup_tunnel_bandwidth = -1; -static int hf_rsvp_rro_flags_backup_tunnel_hop = -1; -static int hf_rsvp_rro_flags_global_label = -1; -static int hf_rsvp_lsp_attr = -1; -static int hf_rsvp_lsp_attr_e2e = -1; -static int hf_rsvp_lsp_attr_boundary = -1; -static int hf_rsvp_lsp_attr_segment = -1; -static int hf_rsvp_lsp_attr_integrity = -1; -static int hf_rsvp_lsp_attr_contiguous = -1; -static int hf_rsvp_lsp_attr_stitching = -1; -static int hf_rsvp_lsp_attr_preplanned = -1; -static int hf_rsvp_lsp_attr_nophp = -1; -static int hf_rsvp_lsp_attr_oobmap = -1; -static int hf_rsvp_lsp_attr_entropy = -1; -static int hf_rsvp_lsp_attr_oammep = -1; -static int hf_rsvp_lsp_attr_oammip = -1; -static int hf_rsvp_lsp_attr_loopback = -1; -static int hf_rsvp_lsp_attr_p2mp = -1; -static int hf_rsvp_lsp_attr_rtm = -1; -static int hf_rsvp_lsp_attr_lsi = -1; -static int hf_rsvp_lsp_attr_lsids2e = -1; -static int hf_rsvp_lsp_attr_telinklabel = -1; -static int hf_rsvp_lsp_attr_srlgcollect = -1; -static int hf_rsvp_gen_uni_direction = -1; -static int hf_rsvp_protection_info_flags_secondary_lsp = -1; -static int hf_rsvp_pi_link_flags_extra_traffic = -1; -static int hf_rsvp_pi_link_flags_unprotected = -1; -static int hf_rsvp_pi_link_flags_shared = -1; -static int hf_rsvp_pi_link_flags_dedicated1_1 = -1; -static int hf_rsvp_pi_link_flags_dedicated1plus1 = -1; -static int hf_rsvp_pi_link_flags_enhanced = -1; -static int hf_rsvp_pi_link_flags_extra = -1; -static int hf_rsvp_pi_link_flags_dedicated_1_1 = -1; -static int hf_rsvp_pi_link_flags_dedicated_1plus1 = -1; -static int hf_rsvp_rfc4872_secondary = -1; -static int hf_rsvp_rfc4872_protecting = -1; -static int hf_rsvp_rfc4872_notification_msg = -1; -static int hf_rsvp_rfc4872_operational = -1; -static int hf_rsvp_pi_lsp_flags_full_rerouting = -1; -static int hf_rsvp_pi_lsp_flags_rerouting_extra = -1; -static int hf_rsvp_pi_lsp_flags_1_n_protection = -1; -static int hf_rsvp_pi_lsp_flags_1plus1_unidirectional = -1; -static int hf_rsvp_pi_lsp_flags_1plus1_bidirectional = -1; -static int hf_rsvp_protection_info_in_place = -1; -static int hf_rsvp_protection_info_required = -1; -static int hf_rsvp_pi_seg_flags_full_rerouting = -1; -static int hf_rsvp_pi_seg_flags_rerouting_extra = -1; -static int hf_rsvp_pi_seg_flags_1_n_protection = -1; -static int hf_rsvp_pi_seg_flags_1plus1_unidirectional = -1; -static int hf_rsvp_pi_seg_flags_1plus1_bidirectional = -1; -static int hf_rsvp_frr_flags_one2one_backup = -1; -static int hf_rsvp_frr_flags_facility_backup = -1; -static int hf_rsvp_type = -1; -static int hf_rsvp_3gpp_obj_tid = -1; -static int hf_rsvp_3gpp_obj_ie_len = -1; -static int hf_rsvp_3gpp_obj_ie_type = -1; -static int hf_rsvp_3gpp_obj_ue_ipv4_addr = -1; -static int hf_rsvp_3gpp_obj_ue_ipv6_addr = -1; -static int hf_rsvp_3gpp_obj_tft_d = -1; -static int hf_rsvp_3gpp_obj_tft_ns = -1; -static int hf_rsvp_3gpp_obj_tft_sr_id = -1; -static int hf_rsvp_3gpp_obj_tft_p = -1; -static int hf_rsvp_3gpp_obj_tft_opcode = -1; -static int hf_rsvp_3gpp_obj_tft_n_pkt_flt = -1; -static int hf_rsvp_3gpp_obj_flow_id = -1; -static int hf_rsvp_3gpp_obj_pf_ev_prec = -1; -static int hf_rsvp_3gpp_obj_pf_len = -1; -static int hf_rsvp_3gpp_obj_pf_type = -1; -static int hf_rsvp_3gpp_obj_pf_cont_len = -1; -static int hf_rsvp_3gpp_obj_pf_comp_type_id = -1; -static int hf_rsvp_3gpp_obj_pf_src_ipv4 = -1; -static int hf_rsvp_3gpp_obj_pf_dst_ipv4 = -1; -static int hf_rsvp_3gpp_obj_pf_ipv4_mask = -1; -static int hf_rsvp_3gpp_obj_pf_src_ipv6 = -1; -static int hf_rsvp_3gpp_obj_pf_dst_ipv6 = -1; -static int hf_rsvp_3gpp_obj_pf_ipv6_prefix_length = -1; -static int hf_rsvp_3gpp_obj_pf_prot_next = -1; -static int hf_rsvp_3gpp_obj_pf_dst_port = -1; -static int hf_rsvp_3gpp_obj_pf_src_port = -1; -static int hf_rsvp_3gpp_obj_pf_ipsec_spi = -1; -static int hf_rsvp_3gpp_obj_pf_tos_tc = -1; -static int hf_rsvp_3gpp_obj_pf_flow_lbl = -1; -static int hf_rsvp_3gpp_obj_pf_ipv6 = -1; -static int hf_rsvp_3gpp_obj_pf_treatment = -1; -static int hf_rsvp_3gpp_obj_pf_hint = -1; -static int hf_rsvp_3gpp_obj_tft_qos_list_len = -1; -static int hf_rsvp_3gpp_r_qos_blob_len = -1; -static int hf_rsvp_3gpp_r_qos_blob_flow_pri = -1; -static int hf_rsvp_3gpp_r_qos_blob_num_qos_att_set = -1; -static int hf_rsvp_3gpp_qos_att_set_len = -1; -static int hf_rsvp_3gpp_qos_attribute_set_id = -1; -static int hf_rsvp_3gpp_qos_attribute_verbose = -1; -static int hf_rsvp_3gpp_qos_attribute_prof_id = -1; -static int hf_rsvp_3gpp_qos_attribute_traff_cls = -1; -static int hf_rsvp_3gpp_qos_attribute_peak_rate = -1; -static int hf_rsvp_3gpp_qos_attribute_bucket_size = -1; -static int hf_rsvp_3gpp_qos_attribute_token_rate = -1; -static int hf_rsvp_3gpp_qos_attribute_max_latency = -1; -static int hf_rsvp_3gpp_qos_attribute_max_loss_rte = -1; -static int hf_rsvp_3gpp_qos_attribute_delay_var_sensitive = -1; -static int hf_rsvp_3gpp_qos_attribute_reserved = -1; -static int hf_rsvp_3gpp_r_qos_blob = -1; -static int hf_rsvp_3gpp_qos_result = -1; -static int hf_rsvp_xro_sobj_lbit = -1; -static int hf_rsvp_rro_sobj_dbit = -1; -static int hf_rsvp_xro_sobj_len = -1; -static int hf_rsvp_xro_sobj_ipv4_addr = -1; -static int hf_rsvp_xro_sobj_ipv4_prefix = -1; -static int hf_rsvp_xro_sobj_ipv4_attr = -1; -static int hf_rsvp_xro_sobj_ipv6_attr = -1; -static int hf_rsvp_xro_sobj_srlg_id = -1; -static int hf_rsvp_xro_sobj_srlg_res = -1; -static int hf_rsvp_private_data = -1; -static int hf_rsvp_juniper_numtlvs = -1; -static int hf_rsvp_juniper_padlength = -1; -static int hf_rsvp_juniper_type = -1; -static int hf_rsvp_juniper_length = -1; -static int hf_rsvp_juniper_attrib_cos = -1; -static int hf_rsvp_juniper_attrib_metric1 = -1; -static int hf_rsvp_juniper_attrib_metric2 = -1; -static int hf_rsvp_juniper_attrib_ccc_status = -1; -static int hf_rsvp_juniper_attrib_path = -1; -static int hf_rsvp_juniper_attrib_unknown = -1; -static int hf_rsvp_juniper_unknown = -1; -static int hf_rsvp_juniper_pad = -1; -static int hf_rsvp_unknown_data = -1; -static int hf_rsvp_ctype = -1; -static int hf_rsvp_ctype_session = -1; -static int hf_rsvp_ctype_scope = -1; -static int hf_rsvp_ctype_label_request = -1; -static int hf_rsvp_ctype_integrity = -1; -static int hf_rsvp_ctype_adspec = -1; -static int hf_rsvp_ctype_tspec = -1; -static int hf_rsvp_ctype_call_id = -1; -static int hf_rsvp_ctype_template = -1; -static int hf_rsvp_ctype_style = -1; -static int hf_rsvp_ctype_policy = -1; -static int hf_rsvp_ctype_error = -1; -static int hf_rsvp_ctype_attribute = -1; -static int hf_rsvp_ctype_explicit_route = -1; -static int hf_rsvp_ctype_secondary_explicit_route = -1; -static int hf_rsvp_ctype_flowspec = -1; -static int hf_rsvp_ctype_hop = -1; -static int hf_rsvp_ctype_confirm = -1; -static int hf_rsvp_ctype_time_values = -1; -static int hf_rsvp_ctype_record_route = -1; -static int hf_rsvp_ctype_secondary_record_route = -1; -static int hf_rsvp_ctype_exclude_route = -1; -static int hf_rsvp_ctype_message_id = -1; -static int hf_rsvp_ctype_message_id_ack = -1; -static int hf_rsvp_ctype_message_id_list = -1; -static int hf_rsvp_ctype_hello = -1; -static int hf_rsvp_ctype_dclass = -1; -static int hf_rsvp_ctype_admin_status = -1; -static int hf_rsvp_ctype_lsp_attributes = -1; -static int hf_rsvp_ctype_label_set = -1; -static int hf_rsvp_ctype_association = -1; -static int hf_rsvp_ctype_tunnel_if_id = -1; -static int hf_rsvp_ctype_3gpp_object = -1; -static int hf_rsvp_ctype_restart_cap = -1; -static int hf_rsvp_ctype_link_cap = -1; -static int hf_rsvp_ctype_protection_info = -1; -static int hf_rsvp_ctype_fast_reroute = -1; -static int hf_rsvp_ctype_detour = -1; -static int hf_rsvp_ctype_diffserv = -1; -static int hf_rsvp_ctype_diffserv_aware_te = -1; -static int hf_rsvp_ctype_vendor = -1; -static int hf_rsvp_ctype_juniper = -1; -static int hf_rsvp_ctype_unknown = -1; -static int hf_rsvp_ctype_label = -1; -static int hf_rsvp_ctype_notify_request = -1; -static int hf_rsvp_ctype_generalized_uni = -1; -static int hf_rsvp_parameter = -1; -static int hf_rsvp_parameter_flags = -1; -static int hf_rsvp_parameter_length = -1; -static int hf_rsvp_error_value = -1; -static int hf_rsvp_class = -1; -static int hf_rsvp_class_length = -1; -static int hf_rsvp_reserved = -1; -static int hf_rsvp_switching_granularity = -1; -static int hf_rsvp_callid_srcaddr_ether = -1; -static int hf_rsvp_callid_srcaddr_bytes = -1; -static int hf_rsvp_loose_hop = -1; -static int hf_rsvp_data_length = -1; - -static int hf_rsvp_ctype_s2l_sub_lsp = -1; -static int hf_rsvp_s2l_sub_lsp_destination_ipv4_address = -1; -static int hf_rsvp_s2l_sub_lsp_destination_ipv6_address = -1; -static int hf_rsvp_s2l_sub_lsp_data = -1; +static int proto_rsvp; +static int proto_rsvp_e2e1; + +static int hf_rsvp_error_flags; +static int hf_rsvp_error_flags_path_state_removed; +static int hf_rsvp_error_flags_not_guilty; +static int hf_rsvp_error_flags_in_place; +static int hf_rsvp_eth_tspec_tlv_color_mode; +static int hf_rsvp_eth_tspec_tlv_coupling_flag; +static int hf_rsvp_sender_tspec_standard_contiguous_concatenation; +static int hf_rsvp_sender_tspec_arbitrary_contiguous_concatenation; +static int hf_rsvp_sender_tspec_regenerator_section; +static int hf_rsvp_sender_tspec_multiplex_section; +static int hf_rsvp_sender_tspec_J0_transparency; +static int hf_rsvp_sender_tspec_SOH_RSOH_DCC_transparency; +static int hf_rsvp_sender_tspec_LOH_MSOH_DCC_transparency; +static int hf_rsvp_sender_tspec_LOH_MSOH_extended_DCC_transparency; +static int hf_rsvp_sender_tspec_K1_K2_transparency; +static int hf_rsvp_sender_tspec_E1_transparency; +static int hf_rsvp_sender_tspec_F1_transparency; +static int hf_rsvp_sender_tspec_E2_transparency; +static int hf_rsvp_sender_tspec_B1_transparency; +static int hf_rsvp_sender_tspec_B2_transparency; +static int hf_rsvp_sender_tspec_M0_transparency; +static int hf_rsvp_sender_tspec_M1_transparency; +static int hf_rsvp_flowspec_standard_contiguous_concatenation; +static int hf_rsvp_flowspec_arbitrary_contiguous_concatenation; +static int hf_rsvp_flowspec_regenerator_section; +static int hf_rsvp_flowspec_multiplex_section; +static int hf_rsvp_flowspec_J0_transparency; +static int hf_rsvp_flowspec_SOH_RSOH_DCC_transparency; +static int hf_rsvp_flowspec_LOH_MSOH_DCC_transparency; +static int hf_rsvp_flowspec_LOH_MSOH_extended_DCC_transparency; +static int hf_rsvp_flowspec_K1_K2_transparency; +static int hf_rsvp_flowspec_E1_transparency; +static int hf_rsvp_flowspec_F1_transparency; +static int hf_rsvp_flowspec_E2_transparency; +static int hf_rsvp_flowspec_B1_transparency; +static int hf_rsvp_flowspec_B2_transparency; +static int hf_rsvp_flowspec_M0_transparency; +static int hf_rsvp_flowspec_M1_transparency; +static int hf_rsvp_integrity_flags_handshake; +static int hf_rsvp_sa_flags_local; +static int hf_rsvp_sa_flags_label; +static int hf_rsvp_sa_flags_se_style; +static int hf_rsvp_sa_flags_bandwidth; +static int hf_rsvp_sa_flags_node; +static int hf_rsvp_rro_flags_local_avail; +static int hf_rsvp_rro_flags_local_in_use; +static int hf_rsvp_rro_flags_bandwidth; +static int hf_rsvp_rro_flags_node; +static int hf_rsvp_rro_flags_node_address; +static int hf_rsvp_rro_flags_backup_tunnel_bandwidth; +static int hf_rsvp_rro_flags_backup_tunnel_hop; +static int hf_rsvp_rro_flags_global_label; +static int hf_rsvp_lsp_attr; +static int hf_rsvp_lsp_attr_e2e; +static int hf_rsvp_lsp_attr_boundary; +static int hf_rsvp_lsp_attr_segment; +static int hf_rsvp_lsp_attr_integrity; +static int hf_rsvp_lsp_attr_contiguous; +static int hf_rsvp_lsp_attr_stitching; +static int hf_rsvp_lsp_attr_preplanned; +static int hf_rsvp_lsp_attr_nophp; +static int hf_rsvp_lsp_attr_oobmap; +static int hf_rsvp_lsp_attr_entropy; +static int hf_rsvp_lsp_attr_oammep; +static int hf_rsvp_lsp_attr_oammip; +static int hf_rsvp_lsp_attr_loopback; +static int hf_rsvp_lsp_attr_p2mp; +static int hf_rsvp_lsp_attr_rtm; +static int hf_rsvp_lsp_attr_lsi; +static int hf_rsvp_lsp_attr_lsids2e; +static int hf_rsvp_lsp_attr_telinklabel; +static int hf_rsvp_lsp_attr_srlgcollect; +static int hf_rsvp_gen_uni_direction; +static int hf_rsvp_protection_info_flags_secondary_lsp; +static int hf_rsvp_pi_link_flags_extra_traffic; +static int hf_rsvp_pi_link_flags_unprotected; +static int hf_rsvp_pi_link_flags_shared; +static int hf_rsvp_pi_link_flags_dedicated1_1; +static int hf_rsvp_pi_link_flags_dedicated1plus1; +static int hf_rsvp_pi_link_flags_enhanced; +static int hf_rsvp_pi_link_flags_extra; +static int hf_rsvp_pi_link_flags_dedicated_1_1; +static int hf_rsvp_pi_link_flags_dedicated_1plus1; +static int hf_rsvp_rfc4872_secondary; +static int hf_rsvp_rfc4872_protecting; +static int hf_rsvp_rfc4872_notification_msg; +static int hf_rsvp_rfc4872_operational; +static int hf_rsvp_pi_lsp_flags_full_rerouting; +static int hf_rsvp_pi_lsp_flags_rerouting_extra; +static int hf_rsvp_pi_lsp_flags_1_n_protection; +static int hf_rsvp_pi_lsp_flags_1plus1_unidirectional; +static int hf_rsvp_pi_lsp_flags_1plus1_bidirectional; +static int hf_rsvp_protection_info_in_place; +static int hf_rsvp_protection_info_required; +static int hf_rsvp_pi_seg_flags_full_rerouting; +static int hf_rsvp_pi_seg_flags_rerouting_extra; +static int hf_rsvp_pi_seg_flags_1_n_protection; +static int hf_rsvp_pi_seg_flags_1plus1_unidirectional; +static int hf_rsvp_pi_seg_flags_1plus1_bidirectional; +static int hf_rsvp_frr_flags_one2one_backup; +static int hf_rsvp_frr_flags_facility_backup; +static int hf_rsvp_type; +static int hf_rsvp_3gpp_obj_tid; +static int hf_rsvp_3gpp_obj_ie_len; +static int hf_rsvp_3gpp_obj_ie_type; +static int hf_rsvp_3gpp_obj_ue_ipv4_addr; +static int hf_rsvp_3gpp_obj_ue_ipv6_addr; +static int hf_rsvp_3gpp_obj_tft_d; +static int hf_rsvp_3gpp_obj_tft_ns; +static int hf_rsvp_3gpp_obj_tft_sr_id; +static int hf_rsvp_3gpp_obj_tft_p; +static int hf_rsvp_3gpp_obj_tft_opcode; +static int hf_rsvp_3gpp_obj_tft_n_pkt_flt; +static int hf_rsvp_3gpp_obj_flow_id; +static int hf_rsvp_3gpp_obj_pf_ev_prec; +static int hf_rsvp_3gpp_obj_pf_len; +static int hf_rsvp_3gpp_obj_pf_type; +static int hf_rsvp_3gpp_obj_pf_cont_len; +static int hf_rsvp_3gpp_obj_pf_comp_type_id; +static int hf_rsvp_3gpp_obj_pf_src_ipv4; +static int hf_rsvp_3gpp_obj_pf_dst_ipv4; +static int hf_rsvp_3gpp_obj_pf_ipv4_mask; +static int hf_rsvp_3gpp_obj_pf_src_ipv6; +static int hf_rsvp_3gpp_obj_pf_dst_ipv6; +static int hf_rsvp_3gpp_obj_pf_ipv6_prefix_length; +static int hf_rsvp_3gpp_obj_pf_prot_next; +static int hf_rsvp_3gpp_obj_pf_dst_port; +static int hf_rsvp_3gpp_obj_pf_src_port; +static int hf_rsvp_3gpp_obj_pf_ipsec_spi; +static int hf_rsvp_3gpp_obj_pf_tos_tc; +static int hf_rsvp_3gpp_obj_pf_flow_lbl; +static int hf_rsvp_3gpp_obj_pf_ipv6; +static int hf_rsvp_3gpp_obj_pf_treatment; +static int hf_rsvp_3gpp_obj_pf_hint; +static int hf_rsvp_3gpp_obj_tft_qos_list_len; +static int hf_rsvp_3gpp_r_qos_blob_len; +static int hf_rsvp_3gpp_r_qos_blob_flow_pri; +static int hf_rsvp_3gpp_r_qos_blob_num_qos_att_set; +static int hf_rsvp_3gpp_qos_att_set_len; +static int hf_rsvp_3gpp_qos_attribute_set_id; +static int hf_rsvp_3gpp_qos_attribute_verbose; +static int hf_rsvp_3gpp_qos_attribute_prof_id; +static int hf_rsvp_3gpp_qos_attribute_traff_cls; +static int hf_rsvp_3gpp_qos_attribute_peak_rate; +static int hf_rsvp_3gpp_qos_attribute_bucket_size; +static int hf_rsvp_3gpp_qos_attribute_token_rate; +static int hf_rsvp_3gpp_qos_attribute_max_latency; +static int hf_rsvp_3gpp_qos_attribute_max_loss_rte; +static int hf_rsvp_3gpp_qos_attribute_delay_var_sensitive; +static int hf_rsvp_3gpp_qos_attribute_reserved; +static int hf_rsvp_3gpp_r_qos_blob; +static int hf_rsvp_3gpp_qos_result; +static int hf_rsvp_xro_sobj_lbit; +static int hf_rsvp_rro_sobj_dbit; +static int hf_rsvp_xro_sobj_len; +static int hf_rsvp_xro_sobj_ipv4_addr; +static int hf_rsvp_xro_sobj_ipv4_prefix; +static int hf_rsvp_xro_sobj_ipv4_attr; +static int hf_rsvp_xro_sobj_ipv6_attr; +static int hf_rsvp_xro_sobj_srlg_id; +static int hf_rsvp_xro_sobj_srlg_res; +static int hf_rsvp_private_data; +static int hf_rsvp_juniper_numtlvs; +static int hf_rsvp_juniper_padlength; +static int hf_rsvp_juniper_type; +static int hf_rsvp_juniper_length; +static int hf_rsvp_juniper_attrib_cos; +static int hf_rsvp_juniper_attrib_metric1; +static int hf_rsvp_juniper_attrib_metric2; +static int hf_rsvp_juniper_attrib_ccc_status; +static int hf_rsvp_juniper_attrib_path; +static int hf_rsvp_juniper_attrib_unknown; +static int hf_rsvp_juniper_unknown; +static int hf_rsvp_juniper_pad; +static int hf_rsvp_unknown_data; +static int hf_rsvp_ctype; +static int hf_rsvp_ctype_session; +static int hf_rsvp_ctype_scope; +static int hf_rsvp_ctype_label_request; +static int hf_rsvp_ctype_integrity; +static int hf_rsvp_ctype_adspec; +static int hf_rsvp_ctype_tspec; +static int hf_rsvp_ctype_call_id; +static int hf_rsvp_ctype_template; +static int hf_rsvp_ctype_style; +static int hf_rsvp_ctype_policy; +static int hf_rsvp_ctype_error; +static int hf_rsvp_ctype_attribute; +static int hf_rsvp_ctype_explicit_route; +static int hf_rsvp_ctype_secondary_explicit_route; +static int hf_rsvp_ctype_flowspec; +static int hf_rsvp_ctype_hop; +static int hf_rsvp_ctype_confirm; +static int hf_rsvp_ctype_time_values; +static int hf_rsvp_ctype_record_route; +static int hf_rsvp_ctype_secondary_record_route; +static int hf_rsvp_ctype_exclude_route; +static int hf_rsvp_ctype_message_id; +static int hf_rsvp_ctype_message_id_ack; +static int hf_rsvp_ctype_message_id_list; +static int hf_rsvp_ctype_hello; +static int hf_rsvp_ctype_dclass; +static int hf_rsvp_ctype_admin_status; +static int hf_rsvp_ctype_lsp_attributes; +static int hf_rsvp_ctype_label_set; +static int hf_rsvp_ctype_association; +static int hf_rsvp_ctype_tunnel_if_id; +static int hf_rsvp_ctype_3gpp_object; +static int hf_rsvp_ctype_restart_cap; +static int hf_rsvp_ctype_link_cap; +static int hf_rsvp_ctype_capability; +static int hf_rsvp_ctype_protection_info; +static int hf_rsvp_ctype_fast_reroute; +static int hf_rsvp_ctype_detour; +static int hf_rsvp_ctype_diffserv; +static int hf_rsvp_ctype_diffserv_aware_te; +static int hf_rsvp_ctype_vendor; +static int hf_rsvp_ctype_juniper; +static int hf_rsvp_ctype_unknown; +static int hf_rsvp_ctype_label; +static int hf_rsvp_ctype_notify_request; +static int hf_rsvp_ctype_generalized_uni; +static int hf_rsvp_parameter; +static int hf_rsvp_parameter_flags; +static int hf_rsvp_parameter_length; +static int hf_rsvp_error_value; +static int hf_rsvp_class; +static int hf_rsvp_class_length; +static int hf_rsvp_reserved; +static int hf_rsvp_switching_granularity; +static int hf_rsvp_callid_srcaddr_ether; +static int hf_rsvp_callid_srcaddr_bytes; +static int hf_rsvp_loose_hop; +static int hf_rsvp_data_length; + +static int hf_rsvp_ctype_s2l_sub_lsp; +static int hf_rsvp_s2l_sub_lsp_destination_ipv4_address; +static int hf_rsvp_s2l_sub_lsp_destination_ipv6_address; +static int hf_rsvp_s2l_sub_lsp_data; /* Generated from convert_proto_tree_add_text.pl */ -static int hf_rsvp_message_id_data = -1; -static int hf_rsvp_ero_rro_subobjects_length = -1; -static int hf_rsvp_fast_reroute_hop_limit = -1; -static int hf_rsvp_lsp_tunnel_if_id_router_id = -1; -static int hf_rsvp_ero_rro_subobjects_path_key = -1; -static int hf_rsvp_ifid_tlv_area = -1; -static int hf_rsvp_session_attribute_include_any = -1; -static int hf_rsvp_lsp_tunnel_if_id_sc_pc_scn_address = -1; -static int hf_rsvp_ero_rro_subobjects_ipv6_hop = -1; -static int hf_rsvp_lsp_tunnel_if_id_ipv6_interface_address = -1; -static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier_ipv4 = -1; -static int hf_rsvp_ifid_tlvinterface_id = -1; -static int hf_rsvp_eth_tspec_cir = -1; -static int hf_rsvp_confirm_receiver_address_ipv6 = -1; -static int hf_rsvp_error_error_node_ipv6 = -1; -static int hf_rsvp_time_values_data = -1; -static int hf_rsvp_flowspec_rate = -1; -static int hf_rsvp_session_attribute_hold_priority = -1; -static int hf_rsvp_notify_request_notify_node_address_ipv4 = -1; -static int hf_rsvp_lsp_tunnel_if_id_action = -1; -static int hf_rsvp_scope_data = -1; -static int hf_rsvp_label_request_l3pid = -1; -static int hf_rsvp_eth_tspec_index = -1; -static int hf_rsvp_integrity_sequence_number = -1; -static int hf_rsvp_adspec_message_format_version = -1; -static int hf_rsvp_fast_reroute_setup_priority = -1; -static int hf_rsvp_eth_tspec_reserved = -1; -static int hf_rsvp_eth_tspec_el2cp = -1; -static int hf_rsvp_eth_tspec_il2cp = -1; -static int hf_rsvp_fast_reroute_include_all = -1; -static int hf_rsvp_association_routing_area_id = -1; -static int hf_rsvp_label_label = -1; -static int hf_rsvp_session_attribute_include_all = -1; -static int hf_rsvp_flowspec_token_bucket_rate = -1; -static int hf_rsvp_call_id_address_type = -1; -static int hf_rsvp_session_attribute_name_length = -1; -static int hf_rsvp_detour_data = -1; -static int hf_rsvp_association_node_id = -1; -static int hf_rsvp_ifid_tlv_length = -1; -static int hf_rsvp_flags = -1; -static int hf_rsvp_tspec_message_format_version = -1; -static int hf_rsvp_ifid_tlv_ipv4_address = -1; -static int hf_rsvp_hop_data = -1; -static int hf_rsvp_ifid_tlv_data = -1; -static int hf_rsvp_length = -1; -static int hf_rsvp_ero_rro_subobjects_pce_id_ipv6 = -1; -static int hf_rsvp_association_data = -1; -static int hf_rsvp_tspec_number_of_multiplexed_components = -1; -static int hf_rsvp_session_attribute_setup_priority = -1; -static int hf_rsvp_message_id_flags = -1; -static int hf_rsvp_hop_logical_interface = -1; -static int hf_rsvp_compression_factor = -1; -static int hf_rsvp_ero_rro_subobjects_private_data = -1; -static int hf_rsvp_lsp_attributes_tlv_data = -1; -static int hf_rsvp_flowspec_token_bucket_size = -1; -static int hf_rsvp_call_id_data = -1; -static int hf_rsvp_template_filter_source_address_ipv6 = -1; -static int hf_rsvp_message_id_ack_flags = -1; -static int hf_rsvp_flowspec_multiplier = -1; -static int hf_rsvp_tspec_token_bucket_size = -1; -static int hf_rsvp_admin_status_bits = -1; -static int hf_rsvp_admin_status_data = -1; -static int hf_rsvp_tspec_peak_data_rate = -1; -static int hf_rsvp_flowspec_number_of_virtual_components = -1; -static int hf_rsvp_hop_neighbor_address_ipv6 = -1; -static int hf_rsvp_flowspec_signal_type_sonet = -1; -static int hf_rsvp_ifid_tlv_autonomous_system = -1; -static int hf_rsvp_scope_ipv6_address = -1; -static int hf_rsvp_flowspec_service_header = -1; -static int hf_rsvp_tspec_hint = -1; -static int hf_rsvp_label_set_action = -1; -static int hf_rsvp_error_data = -1; -static int hf_rsvp_style_flags = -1; -static int hf_rsvp_g_pid = -1; -static int hf_rsvp_integrity_key_identifier = -1; -static int hf_rsvp_adspec_service_header = -1; -static int hf_rsvp_ifid_tlv_error_string = -1; -static int hf_rsvp_session_destination_address = -1; -static int hf_rsvp_ifid_tlv_node_id = -1; -static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier = -1; -static int hf_rsvp_call_id_international_segment = -1; -static int hf_rsvp_fast_reroute_include_any = -1; -static int hf_rsvp_label_request_min_vci = -1; -static int hf_rsvp_tspec_profile = -1; -static int hf_rsvp_eth_tspec_length = -1; -static int hf_rsvp_exclude_route_data = -1; -static int hf_rsvp_record_route_data = -1; -static int hf_rsvp_secondary_record_route_data = -1; -static int hf_rsvp_confirm_receiver_address_ipv4 = -1; -static int hf_rsvp_message_id_list_message_id = -1; -static int hf_rsvp_template_filter_ipv4_tunnel_sender_address = -1; -static int hf_rsvp_template_filter_ipv6_tunnel_sender_address = -1; -static int hf_rsvp_template_filter_sub_group_originator_id = -1; -static int hf_rsvp_template_filter_sub_group_id = -1; -static int hf_rsvp_template_filter_data = -1; -static int hf_rsvp_notify_request_notify_node_address_ipv6 = -1; -static int hf_rsvp_message_id_ack_data = -1; -static int hf_rsvp_eth_tspec_profile = -1; -static int hf_rsvp_label_request_max_vpi = -1; -static int hf_rsvp_ero_rro_subobjects_private_length = -1; -static int hf_rsvp_fast_reroute_exclude_any = -1; -static int hf_rsvp_lsp_tunnel_if_id_data = -1; -static int hf_rsvp_hello_destination_instance = -1; -static int hf_rsvp_tspec_signal_type_g709 = -1; -static int hf_rsvp_call_id_reserved = -1; -static int hf_rsvp_version = -1; -static int hf_rsvp_association_source_ipv6 = -1; -static int hf_rsvp_ero_rro_subobjects_flags = -1; -static int hf_rsvp_lsp_tunnel_if_id_lsp_encoding_type = -1; -static int hf_rsvp_association_type = -1; -static int hf_rsvp_tspec_data = -1; -static int hf_rsvp_session_destination_port = -1; -static int hf_rsvp_association_id = -1; -static int hf_rsvp_integrity_hash = -1; -static int hf_rsvp_flowspec_number_of_contiguous_components = -1; -static int hf_rsvp_policy_data = -1; -static int hf_rsvp_tspec_token_bucket_rate = -1; -static int hf_rsvp_tspec_multiplier = -1; -static int hf_rsvp_dclass_dscp = -1; -static int hf_rsvp_tspec_number_of_contiguous_components = -1; -static int hf_rsvp_session_p2mp_id = -1; -static int hf_rsvp_session_data = -1; -static int hf_rsvp_lsp_tunnel_if_id_target_igp_instance = -1; -static int hf_rsvp_flowspec_profile = -1; -static int hf_rsvp_message_id_ack_epoch = -1; -static int hf_rsvp_hello_source_instance = -1; -static int hf_rsvp_scope_ipv4_address = -1; -static int hf_rsvp_label_request_lsp_encoding_type = -1; -static int hf_rsvp_fast_reroute_hold_priority = -1; -static int hf_rsvp_label_request_max_vci = -1; -static int hf_rsvp_fast_reroute_flags = -1; -static int hf_rsvp_flowspec_peak_data_rate = -1; -static int hf_rsvp_ero_rro_subobjects_label = -1; -static int hf_rsvp_notify_request_data = -1; -static int hf_rsvp_lsp_tunnel_if_id_connection_id = -1; -static int hf_rsvp_eth_tspec_ebs = -1; -static int hf_rsvp_fast_reroute_data = -1; -static int hf_rsvp_label_request_min_vpi = -1; -static int hf_rsvp_session_attribute_data = -1; -static int hf_rsvp_protection_info_data = -1; -static int hf_rsvp_tspec_transparency = -1; -static int hf_rsvp_ifid_tlv_label = -1; -static int hf_rsvp_session_extended_ipv4_address = -1; -static int hf_rsvp_diffserv_aware_te_data = -1; -static int hf_rsvp_lsp_tunnel_if_id_signal_type = -1; -static int hf_rsvp_ero_rro_subobjects_pce_id_ipv4 = -1; -static int hf_rsvp_error_error_node_ipv4 = -1; -static int hf_rsvp_session_protocol = -1; -static int hf_rsvp_tspec_signal_type_sonet = -1; -static int hf_rsvp_session_attribute_flags = -1; -static int hf_rsvp_ero_rro_subobjects_router_id = -1; -static int hf_rsvp_message_id_list_data = -1; -static int hf_rsvp_style_style = -1; -static int hf_rsvp_tspec_number_of_virtual_components = -1; -static int hf_rsvp_tspec_mtu = -1; -static int hf_rsvp_lsp_tunnel_if_id_length = -1; -static int hf_rsvp_ifid_tlv_ipv6_address = -1; -static int hf_rsvp_diffserv_data = -1; -static int hf_rsvp_session_flags = -1; -static int hf_rsvp_flowspec_transparency = -1; -static int hf_rsvp_dclass_data = -1; -static int hf_rsvp_lsp_tunnel_if_id_interface_id = -1; -static int hf_rsvp_lsp_tunnel_if_id_sc_pc_id = -1; -static int hf_rsvp_error_error_code = -1; -static int hf_rsvp_lsp_tunnel_if_id_ipv4_interface_address = -1; -static int hf_rsvp_session_attribute_exclude_any = -1; -static int hf_rsvp_sending_ttl = -1; -static int hf_rsvp_integrity_flags = -1; -static int hf_rsvp_message_id_ack_message_id = -1; -static int hf_rsvp_message_id_message_id = -1; -static int hf_rsvp_ero_rro_subobjects_interface_id = -1; -static int hf_rsvp_message_length = -1; -static int hf_rsvp_message_id_epoch = -1; -static int hf_rsvp_flowspec_signal_type_g709 = -1; -static int hf_rsvp_label_request_data = -1; -static int hf_rsvp_restart_cap_data = -1; -static int hf_rsvp_lsp_attributes_tlv = -1; -static int hf_rsvp_flowspec_mtu = -1; -static int hf_rsvp_flowspec_m = -1; -static int hf_rsvp_tspec_service_header = -1; -static int hf_rsvp_eth_tspec_cbs = -1; -static int hf_rsvp_call_id_national_segment = -1; -static int hf_rsvp_template_filter_source_port = -1; -static int hf_rsvp_eth_tspec_eir = -1; -static int hf_rsvp_ero_rro_subobjects_ipv4_hop = -1; -static int hf_rsvp_lsp_tunnel_if_id_switching_type = -1; -static int hf_rsvp_flowspec_number_of_multiplexed_components = -1; -static int hf_rsvp_label_request_switching_type = -1; -static int hf_rsvp_ero_rro_subobjects_prefix_length = -1; -static int hf_rsvp_explicit_route_data = -1; -static int hf_rsvp_secondary_explicit_route_data = -1; -static int hf_rsvp_association_source_ipv4 = -1; -static int hf_rsvp_call_id_local_identifier = -1; -static int hf_rsvp_flowspec_message_format_version = -1; -static int hf_rsvp_tspec_requested_concatenation = -1; -static int hf_rsvp_association_padding = -1; -static int hf_rsvp_hop_neighbor_address_ipv4 = -1; -static int hf_rsvp_flowspec_requested_concatenation = -1; -static int hf_rsvp_fast_reroute_bandwidth = -1; -static int hf_rsvp_message_id_list_epoch = -1; -static int hf_rsvp_style_data = -1; -static int hf_rsvp_session_dscp = -1; -static int hf_rsvp_confirm_data = -1; -static int hf_rsvp_protection_info_link_flags = -1; -static int hf_rsvp_message_id_list_flags = -1; -static int hf_rsvp_label_data = -1; -static int hf_rsvp_flowspec_slack_term = -1; -static int hf_rsvp_label_generalized_label = -1; -static int hf_rsvp_label_generalized_label_evpl_vlad_id = -1; -static int hf_rsvp_session_attribute_name = -1; -static int hf_rsvp_ifid_tlv_padding = -1; -static int hf_rsvp_max_dlci = -1; -static int hf_rsvp_minimum_policed_unit = -1; -static int hf_rsvp_dlci_length = -1; -static int hf_rsvp_label_request_m = -1; -static int hf_rsvp_detour_avoid_node_id = -1; -static int hf_rsvp_restart_cap_restart_time = -1; -static int hf_rsvp_nsap_length = -1; -static int hf_rsvp_message_checksum = -1; -static int hf_rsvp_ero_rro_autonomous_system = -1; -static int hf_rsvp_gen_uni_service_level = -1; -static int hf_rsvp_hf_rsvp_adspec_break_bit = -1; -static int hf_rsvp_extended_tunnel_id = -1; -static int hf_rsvp_extended_tunnel_ipv6 = -1; -static int hf_rsvp_maximum_packet_size = -1; -static int hf_rsvp_min_dlci = -1; -static int hf_rsvp_gen_uni_data = -1; -static int hf_rsvp_gen_uni_logical_port_id = -1; -static int hf_rsvp_refresh_interval = -1; -static int hf_rsvp_detour_plr_id = -1; -static int hf_rsvp_restart_cap_recovery_time = -1; -static int hf_rsvp_extended_tunnel = -1; -static int hf_rsvp_call_attributes_endpont_id = -1; -static int hf_rsvp_isis_area_id = -1; -static int hf_rsvp_adspec_type = -1; -static int hf_rsvp_adspec_len = -1; -static int hf_rsvp_adspec_uint = -1; -static int hf_rsvp_adspec_float = -1; -static int hf_rsvp_adspec_bytes = -1; -static int hf_rsvp_wavelength_grid = -1; -static int hf_rsvp_wavelength_cs1 = -1; -static int hf_rsvp_wavelength_cs2 = -1; -static int hf_rsvp_wavelength_cs3 = -1; -static int hf_rsvp_wavelength_channel_spacing = -1; -static int hf_rsvp_wavelength_n = -1; -static int hf_rsvp_wavelength_m = -1; -static int hf_rsvp_wavelength_freq = -1; -static int hf_rsvp_wavelength_wavelength = -1; -static int hf_rsvp_sonet_s = -1; -static int hf_rsvp_sonet_u = -1; -static int hf_rsvp_sonet_k = -1; -static int hf_rsvp_sonet_l = -1; -static int hf_rsvp_sonet_m = -1; -static int hf_rsvp_g709_t3 = -1; -static int hf_rsvp_g709_t2 = -1; -static int hf_rsvp_g709_t1 = -1; -static int hf_rsvp_label_set_type = -1; -static int hf_rsvp_label_set_subchannel = -1; -static int hf_rsvp_nsap_address = -1; -static int hf_rsvp_class_diversity = -1; -static int hf_rsvp_egress_label_type = -1; -static int hf_rsvp_egress_label = -1; -static int hf_rsvp_source_transport_network_addr = -1; -static int hf_rsvp_ie_data = -1; -static int hf_rsvp_3gpp_obj_pf_dst_port_range = -1; -static int hf_rsvp_3gpp_obj_pf_src_port_range = -1; - -static expert_field ei_rsvp_invalid_length = EI_INIT; -static expert_field ei_rsvp_packet_filter_component = EI_INIT; -static expert_field ei_rsvp_bundle_component_msg = EI_INIT; -static expert_field ei_rsvp_parameter = EI_INIT; -static expert_field ei_rsvp_adspec_type = EI_INIT; -static expert_field ei_rsvp_call_id_address_type = EI_INIT; -static expert_field ei_rsvp_session_type = EI_INIT; - -static int rsvp_tap = -1; +static int hf_rsvp_message_id_data; +static int hf_rsvp_ero_rro_subobjects_length; +static int hf_rsvp_fast_reroute_hop_limit; +static int hf_rsvp_lsp_tunnel_if_id_router_id; +static int hf_rsvp_ero_rro_subobjects_path_key; +static int hf_rsvp_ifid_tlv_area; +static int hf_rsvp_session_attribute_include_any; +static int hf_rsvp_lsp_tunnel_if_id_sc_pc_scn_address; +static int hf_rsvp_ero_rro_subobjects_ipv6_hop; +static int hf_rsvp_lsp_tunnel_if_id_ipv6_interface_address; +static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier_ipv4; +static int hf_rsvp_ifid_tlvinterface_id; +static int hf_rsvp_eth_tspec_cir; +static int hf_rsvp_confirm_receiver_address_ipv6; +static int hf_rsvp_error_error_node_ipv6; +static int hf_rsvp_time_values_data; +static int hf_rsvp_flowspec_rate; +static int hf_rsvp_session_attribute_hold_priority; +static int hf_rsvp_notify_request_notify_node_address_ipv4; +static int hf_rsvp_lsp_tunnel_if_id_action; +static int hf_rsvp_scope_data; +static int hf_rsvp_label_request_l3pid; +static int hf_rsvp_eth_tspec_index; +static int hf_rsvp_integrity_sequence_number; +static int hf_rsvp_adspec_message_format_version; +static int hf_rsvp_fast_reroute_setup_priority; +static int hf_rsvp_eth_tspec_reserved; +static int hf_rsvp_eth_tspec_el2cp; +static int hf_rsvp_eth_tspec_il2cp; +static int hf_rsvp_fast_reroute_include_all; +static int hf_rsvp_association_routing_area_id; +static int hf_rsvp_label_label; +static int hf_rsvp_session_attribute_include_all; +static int hf_rsvp_flowspec_token_bucket_rate; +static int hf_rsvp_call_id_address_type; +static int hf_rsvp_session_attribute_name_length; +static int hf_rsvp_detour_data; +static int hf_rsvp_association_node_id; +static int hf_rsvp_ifid_tlv_length; +static int hf_rsvp_flags; +static int hf_rsvp_tspec_message_format_version; +static int hf_rsvp_ifid_tlv_ipv4_address; +static int hf_rsvp_hop_data; +static int hf_rsvp_ifid_tlv_data; +static int hf_rsvp_length; +static int hf_rsvp_ero_rro_subobjects_pce_id_ipv6; +static int hf_rsvp_association_data; +static int hf_rsvp_tspec_number_of_multiplexed_components; +static int hf_rsvp_session_attribute_setup_priority; +static int hf_rsvp_message_id_flags; +static int hf_rsvp_hop_logical_interface; +static int hf_rsvp_compression_factor; +static int hf_rsvp_ero_rro_subobjects_private_data; +static int hf_rsvp_lsp_attributes_tlv_data; +static int hf_rsvp_flowspec_token_bucket_size; +static int hf_rsvp_call_id_data; +static int hf_rsvp_template_filter_source_address_ipv6; +static int hf_rsvp_message_id_ack_flags; +static int hf_rsvp_flowspec_multiplier; +static int hf_rsvp_tspec_token_bucket_size; +static int hf_rsvp_admin_status_bits; +static int hf_rsvp_admin_status_data; +static int hf_rsvp_tspec_peak_data_rate; +static int hf_rsvp_flowspec_number_of_virtual_components; +static int hf_rsvp_hop_neighbor_address_ipv6; +static int hf_rsvp_flowspec_signal_type_sonet; +static int hf_rsvp_ifid_tlv_autonomous_system; +static int hf_rsvp_scope_ipv6_address; +static int hf_rsvp_flowspec_service_header; +static int hf_rsvp_tspec_hint; +static int hf_rsvp_label_set_action; +static int hf_rsvp_error_data; +static int hf_rsvp_style_flags; +static int hf_rsvp_g_pid; +static int hf_rsvp_integrity_key_identifier; +static int hf_rsvp_adspec_service_header; +static int hf_rsvp_ifid_tlv_error_string; +static int hf_rsvp_session_destination_address; +static int hf_rsvp_ifid_tlv_node_id; +static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier; +static int hf_rsvp_call_id_international_segment; +static int hf_rsvp_fast_reroute_include_any; +static int hf_rsvp_label_request_min_vci; +static int hf_rsvp_tspec_profile; +static int hf_rsvp_eth_tspec_length; +static int hf_rsvp_exclude_route_data; +static int hf_rsvp_record_route_data; +static int hf_rsvp_secondary_record_route_data; +static int hf_rsvp_confirm_receiver_address_ipv4; +static int hf_rsvp_message_id_list_message_id; +static int hf_rsvp_template_filter_ipv4_tunnel_sender_address; +static int hf_rsvp_template_filter_ipv6_tunnel_sender_address; +static int hf_rsvp_template_filter_sub_group_originator_id; +static int hf_rsvp_template_filter_sub_group_id; +static int hf_rsvp_template_filter_data; +static int hf_rsvp_notify_request_notify_node_address_ipv6; +static int hf_rsvp_message_id_ack_data; +static int hf_rsvp_eth_tspec_profile; +static int hf_rsvp_label_request_max_vpi; +static int hf_rsvp_ero_rro_subobjects_private_length; +static int hf_rsvp_fast_reroute_exclude_any; +static int hf_rsvp_lsp_tunnel_if_id_data; +static int hf_rsvp_hello_destination_instance; +static int hf_rsvp_tspec_signal_type_g709; +static int hf_rsvp_call_id_reserved; +static int hf_rsvp_version; +static int hf_rsvp_association_source_ipv6; +static int hf_rsvp_ero_rro_subobjects_flags; +static int hf_rsvp_lsp_tunnel_if_id_lsp_encoding_type; +static int hf_rsvp_association_type; +static int hf_rsvp_tspec_data; +static int hf_rsvp_session_destination_port; +static int hf_rsvp_association_id; +static int hf_rsvp_integrity_hash; +static int hf_rsvp_flowspec_number_of_contiguous_components; +static int hf_rsvp_policy_data; +static int hf_rsvp_tspec_token_bucket_rate; +static int hf_rsvp_tspec_multiplier; +static int hf_rsvp_dclass_dscp; +static int hf_rsvp_tspec_number_of_contiguous_components; +static int hf_rsvp_session_p2mp_id; +static int hf_rsvp_session_data; +static int hf_rsvp_lsp_tunnel_if_id_target_igp_instance; +static int hf_rsvp_flowspec_profile; +static int hf_rsvp_message_id_ack_epoch; +static int hf_rsvp_hello_source_instance; +static int hf_rsvp_scope_ipv4_address; +static int hf_rsvp_label_request_lsp_encoding_type; +static int hf_rsvp_fast_reroute_hold_priority; +static int hf_rsvp_label_request_max_vci; +static int hf_rsvp_fast_reroute_flags; +static int hf_rsvp_flowspec_peak_data_rate; +static int hf_rsvp_ero_rro_subobjects_label; +static int hf_rsvp_notify_request_data; +static int hf_rsvp_lsp_tunnel_if_id_connection_id; +static int hf_rsvp_eth_tspec_ebs; +static int hf_rsvp_fast_reroute_data; +static int hf_rsvp_label_request_min_vpi; +static int hf_rsvp_session_attribute_data; +static int hf_rsvp_protection_info_data; +static int hf_rsvp_tspec_transparency; +static int hf_rsvp_ifid_tlv_label; +static int hf_rsvp_session_extended_ipv4_address; +static int hf_rsvp_diffserv_aware_te_data; +static int hf_rsvp_lsp_tunnel_if_id_signal_type; +static int hf_rsvp_ero_rro_subobjects_pce_id_ipv4; +static int hf_rsvp_error_error_node_ipv4; +static int hf_rsvp_session_protocol; +static int hf_rsvp_tspec_signal_type_sonet; +static int hf_rsvp_session_attribute_flags; +static int hf_rsvp_ero_rro_subobjects_router_id; +static int hf_rsvp_message_id_list_data; +static int hf_rsvp_style_style; +static int hf_rsvp_tspec_number_of_virtual_components; +static int hf_rsvp_tspec_mtu; +static int hf_rsvp_lsp_tunnel_if_id_length; +static int hf_rsvp_ifid_tlv_ipv6_address; +static int hf_rsvp_diffserv_data; +static int hf_rsvp_session_flags; +static int hf_rsvp_flowspec_transparency; +static int hf_rsvp_dclass_data; +static int hf_rsvp_lsp_tunnel_if_id_interface_id; +static int hf_rsvp_lsp_tunnel_if_id_sc_pc_id; +static int hf_rsvp_error_error_code; +static int hf_rsvp_lsp_tunnel_if_id_ipv4_interface_address; +static int hf_rsvp_session_attribute_exclude_any; +static int hf_rsvp_sending_ttl; +static int hf_rsvp_integrity_flags; +static int hf_rsvp_message_id_ack_message_id; +static int hf_rsvp_message_id_message_id; +static int hf_rsvp_ero_rro_subobjects_interface_id; +static int hf_rsvp_message_length; +static int hf_rsvp_message_id_epoch; +static int hf_rsvp_flowspec_signal_type_g709; +static int hf_rsvp_label_request_data; +static int hf_rsvp_restart_cap_data; +static int hf_rsvp_link_cap_data; +static int hf_rsvp_capability_flags; +static int hf_rsvp_capability_flags_reserved; +static int hf_rsvp_capability_flags_i; +static int hf_rsvp_capability_flags_f; +static int hf_rsvp_capability_flags_t; +static int hf_rsvp_capability_flags_r; +static int hf_rsvp_capability_flags_s; +static int hf_rsvp_capability_data; +static int hf_rsvp_lsp_attributes_tlv; +static int hf_rsvp_flowspec_mtu; +static int hf_rsvp_flowspec_m; +static int hf_rsvp_tspec_service_header; +static int hf_rsvp_eth_tspec_cbs; +static int hf_rsvp_call_id_national_segment; +static int hf_rsvp_template_filter_source_port; +static int hf_rsvp_eth_tspec_eir; +static int hf_rsvp_ero_rro_subobjects_ipv4_hop; +static int hf_rsvp_lsp_tunnel_if_id_switching_type; +static int hf_rsvp_flowspec_number_of_multiplexed_components; +static int hf_rsvp_label_request_switching_type; +static int hf_rsvp_ero_rro_subobjects_prefix_length; +static int hf_rsvp_explicit_route_data; +static int hf_rsvp_secondary_explicit_route_data; +static int hf_rsvp_association_source_ipv4; +static int hf_rsvp_call_id_local_identifier; +static int hf_rsvp_flowspec_message_format_version; +static int hf_rsvp_tspec_requested_concatenation; +static int hf_rsvp_association_padding; +static int hf_rsvp_hop_neighbor_address_ipv4; +static int hf_rsvp_flowspec_requested_concatenation; +static int hf_rsvp_fast_reroute_bandwidth; +static int hf_rsvp_message_id_list_epoch; +static int hf_rsvp_style_data; +static int hf_rsvp_session_dscp; +static int hf_rsvp_confirm_data; +static int hf_rsvp_protection_info_link_flags; +static int hf_rsvp_message_id_list_flags; +static int hf_rsvp_label_data; +static int hf_rsvp_flowspec_slack_term; +static int hf_rsvp_label_generalized_label; +static int hf_rsvp_label_generalized_label_evpl_vlad_id; +static int hf_rsvp_session_attribute_name; +static int hf_rsvp_ifid_tlv_padding; +static int hf_rsvp_max_dlci; +static int hf_rsvp_minimum_policed_unit; +static int hf_rsvp_dlci_length; +static int hf_rsvp_label_request_m; +static int hf_rsvp_detour_avoid_node_id; +static int hf_rsvp_restart_cap_restart_time; +static int hf_rsvp_nsap_length; +static int hf_rsvp_message_checksum; +static int hf_rsvp_ero_rro_autonomous_system; +static int hf_rsvp_gen_uni_service_level; +static int hf_rsvp_hf_rsvp_adspec_break_bit; +static int hf_rsvp_extended_tunnel_id; +static int hf_rsvp_extended_tunnel_ipv6; +static int hf_rsvp_maximum_packet_size; +static int hf_rsvp_min_dlci; +static int hf_rsvp_gen_uni_data; +static int hf_rsvp_gen_uni_logical_port_id; +static int hf_rsvp_refresh_interval; +static int hf_rsvp_detour_plr_id; +static int hf_rsvp_restart_cap_recovery_time; +static int hf_rsvp_extended_tunnel; +static int hf_rsvp_call_attributes_endpont_id; +static int hf_rsvp_isis_area_id; +static int hf_rsvp_adspec_type; +static int hf_rsvp_adspec_len; +static int hf_rsvp_adspec_uint; +static int hf_rsvp_adspec_float; +static int hf_rsvp_adspec_bytes; +static int hf_rsvp_wavelength_grid; +static int hf_rsvp_wavelength_cs1; +static int hf_rsvp_wavelength_cs2; +static int hf_rsvp_wavelength_cs3; +static int hf_rsvp_wavelength_channel_spacing; +static int hf_rsvp_wavelength_n; +static int hf_rsvp_wavelength_m; +static int hf_rsvp_wavelength_freq; +static int hf_rsvp_wavelength_wavelength; +static int hf_rsvp_sonet_s; +static int hf_rsvp_sonet_u; +static int hf_rsvp_sonet_k; +static int hf_rsvp_sonet_l; +static int hf_rsvp_sonet_m; +static int hf_rsvp_g709_t3; +static int hf_rsvp_g709_t2; +static int hf_rsvp_g709_t1; +static int hf_rsvp_label_set_type; +static int hf_rsvp_label_set_subchannel; +static int hf_rsvp_nsap_address; +static int hf_rsvp_class_diversity; +static int hf_rsvp_egress_label_type; +static int hf_rsvp_egress_label; +static int hf_rsvp_source_transport_network_addr; +static int hf_rsvp_ie_data; +static int hf_rsvp_3gpp_obj_pf_dst_port_range; +static int hf_rsvp_3gpp_obj_pf_src_port_range; + +static expert_field ei_rsvp_invalid_length; +static expert_field ei_rsvp_packet_filter_component; +static expert_field ei_rsvp_bundle_component_msg; +static expert_field ei_rsvp_parameter; +static expert_field ei_rsvp_adspec_type; +static expert_field ei_rsvp_call_id_address_type; +static expert_field ei_rsvp_session_type; + +static int rsvp_tap; /* * All RSVP packets belonging to a particular flow belong to the same - * conversation. The following structure definitions are for auxillary + * conversation. The following structure definitions are for auxiliary * structures which have all the relevant flow information to make up the * RSVP five-tuple. Note that the values of the five-tuple are determined * from the session object and sender template/filter spec for PATH/RESV @@ -647,60 +661,60 @@ static int rsvp_tap = -1; typedef struct rsvp_session_ipv4_info { address destination; - guint8 protocol; - guint16 udp_dest_port; + uint8_t protocol; + uint16_t udp_dest_port; } rsvp_session_ipv4_info; typedef struct rsvp_session_ipv6_info { /* not supported yet */ - guint8 dummy; + uint8_t dummy; } rsvp_session_ipv6_info; typedef struct rsvp_session_ipv4_lsp_info { address destination; - guint16 udp_dest_port; - guint32 ext_tunnel_id; + uint16_t udp_dest_port; + uint32_t ext_tunnel_id; } rsvp_session_ipv4_lsp_info; typedef struct rsvp_session_ipv6_lsp_info { address destination; - guint16 udp_dest_port; - guint64 ext_tunnel_id; + uint16_t udp_dest_port; + uint64_t ext_tunnel_id; } rsvp_session_ipv6_lsp_info; typedef struct rsvp_session_agg_ipv4_info { address destination; - guint8 dscp; + uint8_t dscp; } rsvp_session_agg_ipv4_info; typedef struct rsvp_session_ipv4_uni_info { address destination; - guint16 udp_dest_port; - guint32 ext_tunnel_id; + uint16_t udp_dest_port; + uint32_t ext_tunnel_id; } rsvp_session_ipv4_uni_info; typedef struct rsvp_session_ipv4_p2mp_lsp_info { address destination; - guint16 udp_dest_port; - guint32 ext_tunnel_id; + uint16_t udp_dest_port; + uint32_t ext_tunnel_id; } rsvp_session_ipv4_p2mp_lsp_info; typedef struct rsvp_session_ipv6_p2mp_lsp_info { address destination; - guint16 udp_dest_port; - guint64 ext_tunnel_id; + uint16_t udp_dest_port; + uint64_t ext_tunnel_id; } rsvp_session_ipv6_p2mp_lsp_info; typedef struct rsvp_session_ipv4_enni_info { address destination; - guint16 udp_dest_port; - guint32 ext_tunnel_id; + uint16_t udp_dest_port; + uint32_t ext_tunnel_id; } rsvp_session_ipv4_enni_info; typedef struct rsvp_template_filter_info { address source; - guint16 udp_source_port; + uint16_t udp_source_port; } rsvp_template_filter_info; /* @@ -713,7 +727,7 @@ typedef struct rsvp_template_filter_info { * the session, filter and sender template objects are dissected. */ struct rsvp_request_key { - guint32 session_type; + uint32_t session_type; union { /* differentiated by session_type field */ rsvp_session_ipv4_info session_ipv4; @@ -728,7 +742,7 @@ struct rsvp_request_key { } u; rsvp_template_filter_info source_info; - guint32 conversation; + uint32_t conversation; }; /* @@ -739,13 +753,13 @@ struct rsvp_request_key { * If this changes in the future, then other stuff can be added here. */ struct rsvp_request_val { - guint32 value; + uint32_t value; }; /* * Initialize the conversation related data structures. */ -static wmem_map_t *rsvp_request_hash = NULL; +static wmem_map_t *rsvp_request_hash; /* * The list of tree types @@ -806,6 +820,8 @@ enum { TT_BUNDLE_COMPMSG, TT_RESTART_CAP, TT_LINK_CAP, + TT_CAPABILITY, + TT_CAPABILITY_FLAGS, TT_PROTECTION_INFO, TT_PROTECTION_INFO_LINK, TT_PROTECTION_INFO_LSP, @@ -833,11 +849,11 @@ enum { TT_MAX }; -static gint ett_treelist[TT_MAX]; +static int ett_treelist[TT_MAX]; #define TREE(X) ett_treelist[(X)] /* Should we dissect bundle messages? */ -static gboolean rsvp_bundle_dissect = TRUE; +static bool rsvp_bundle_dissect = true; /* FF: How should we dissect generalized label? */ static const enum_val_t rsvp_generalized_label_options[] = { @@ -852,7 +868,7 @@ static const enum_val_t rsvp_generalized_label_options[] = { { NULL, NULL, 0 } }; -static guint rsvp_generalized_label_option = 1; +static unsigned rsvp_generalized_label_option = 1; /* * RSVP message types. @@ -979,8 +995,9 @@ enum rsvp_classes { RSVP_CLASS_ACCEPTABLE_LABEL_SET, RSVP_CLASS_RESTART_CAP, RSVP_CLASS_LINK_CAP = 133, + RSVP_CLASS_CAPABILITY, - /* 132-160 Unassigned */ + /* 135-160 Unassigned */ /* 166-187 Unassigned */ @@ -1110,6 +1127,7 @@ static const value_string rsvp_class_vals[] = { { RSVP_CLASS_ACCEPTABLE_LABEL_SET, "ACCEPTABLE-LABEL-SET object"}, { RSVP_CLASS_RESTART_CAP, "RESTART-CAPABILITY object"}, { RSVP_CLASS_LINK_CAP, "LINK-CAPABILITY object"}, + { RSVP_CLASS_CAPABILITY, "Capability object"}, { RSVP_CLASS_VENDOR_PRIVATE_5, "VENDOR PRIVATE object (10bbbbbb: " "ignore if unknown)"}, @@ -1860,6 +1878,7 @@ enum hf_rsvp_filter_keys { RSVPF_RESTART_CAP, RSVPF_LINK_CAP, + RSVPF_CAPABILITY, RSVPF_SESSION_ATTRIBUTE, RSVPF_DCLASS, @@ -1947,7 +1966,7 @@ static const true_false_string tfs_gen_uni_direction = { "U: 1 - Upstream label/ static const unit_name_string units_word_not_including_header = { " word, not including header", " words, not including header" }; -static int hf_rsvp_filter[RSVPF_MAX] = { -1 }; +static int hf_rsvp_filter[RSVPF_MAX]; /* RSVP Conversation related Hash functions */ @@ -1958,8 +1977,8 @@ static int hf_rsvp_filter[RSVPF_MAX] = { -1 }; * same internal conversation identifier, session type, and matching values in * the session info and source info structures. */ -static gint -rsvp_equal(gconstpointer k1, gconstpointer k2) +static int +rsvp_equal(const void *k1, const void *k2) { const struct rsvp_request_key *key1 = (const struct rsvp_request_key*) k1; const struct rsvp_request_key *key2 = (const struct rsvp_request_key*) k2; @@ -1975,7 +1994,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) switch (key1->session_type) { case RSVP_SESSION_TYPE_IPV4: if (addresses_equal(&key1->u.session_ipv4.destination, - &key2->u.session_ipv4.destination) == FALSE) + &key2->u.session_ipv4.destination) == false) return 0; if (key1->u.session_ipv4.protocol != key2->u.session_ipv4.protocol) @@ -1992,7 +2011,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) case RSVP_SESSION_TYPE_IPV4_LSP: if (addresses_equal(&key1->u.session_ipv4_lsp.destination, - &key2->u.session_ipv4_lsp.destination) == FALSE) + &key2->u.session_ipv4_lsp.destination) == false) return 0; if (key1->u.session_ipv4_lsp.udp_dest_port != @@ -2008,7 +2027,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) case RSVP_SESSION_TYPE_AGGREGATE_IPV4: if (addresses_equal(&key1->u.session_agg_ipv4.destination, - &key2->u.session_agg_ipv4.destination) == FALSE) + &key2->u.session_agg_ipv4.destination) == false) return 0; if (key1->u.session_agg_ipv4.dscp != key2->u.session_agg_ipv4.dscp) @@ -2022,7 +2041,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) case RSVP_SESSION_TYPE_IPV4_UNI: if (addresses_equal(&key1->u.session_ipv4_uni.destination, - &key2->u.session_ipv4_uni.destination) == FALSE) + &key2->u.session_ipv4_uni.destination) == false) return 0; if (key1->u.session_ipv4_uni.udp_dest_port != @@ -2038,7 +2057,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) case RSVP_SESSION_TYPE_P2MP_LSP_TUNNEL_IPV4: if (addresses_equal(&key1->u.session_ipv4_p2mp_lsp.destination, - &key2->u.session_ipv4_p2mp_lsp.destination) == FALSE) + &key2->u.session_ipv4_p2mp_lsp.destination) == false) return 0; if (key1->u.session_ipv4_p2mp_lsp.udp_dest_port != @@ -2054,7 +2073,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) case RSVP_SESSION_TYPE_P2MP_LSP_TUNNEL_IPV6: if (addresses_equal(&key1->u.session_ipv6_p2mp_lsp.destination, - &key2->u.session_ipv6_p2mp_lsp.destination) == FALSE) + &key2->u.session_ipv6_p2mp_lsp.destination) == false) return 0; if (key1->u.session_ipv6_p2mp_lsp.udp_dest_port != @@ -2070,7 +2089,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) case RSVP_SESSION_TYPE_IPV4_E_NNI: if (addresses_equal(&key1->u.session_ipv4_enni.destination, - &key2->u.session_ipv4_enni.destination) == FALSE) + &key2->u.session_ipv4_enni.destination) == false) return 0; if (key1->u.session_ipv4_enni.udp_dest_port != @@ -2090,7 +2109,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) } if (addresses_equal(&key1->source_info.source, - &key2->source_info.source) == FALSE) + &key2->source_info.source) == false) return 0; if (key1->source_info.udp_source_port != key2->source_info.udp_source_port) @@ -2104,8 +2123,8 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) * Calculate a hash key for the supplied RSVP request. The internally allocated * conversation-id is unique, so we just use that. */ -static guint -rsvp_hash(gconstpointer k) +static unsigned +rsvp_hash(const void *k) { const struct rsvp_request_key *key = (const struct rsvp_request_key*) k; return key->conversation; @@ -2164,8 +2183,8 @@ rsvp_endpoint_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, con * itself). XXX - this could probably be done more efficiently inside * endpoint_table */ - add_endpoint_table_data(hash, &rsvph->source, 0, TRUE, 1, pinfo->fd->pkt_len, &rsvp_endpoint_dissector_info, ENDPOINT_NONE); - add_endpoint_table_data(hash, &rsvph->destination, 0, FALSE, 1, pinfo->fd->pkt_len, &rsvp_endpoint_dissector_info, ENDPOINT_NONE); + add_endpoint_table_data(hash, &rsvph->source, 0, true, 1, pinfo->fd->pkt_len, &rsvp_endpoint_dissector_info, ENDPOINT_NONE); + add_endpoint_table_data(hash, &rsvph->destination, 0, false, 1, pinfo->fd->pkt_len, &rsvp_endpoint_dissector_info, ENDPOINT_NONE); return TAP_PACKET_REDRAW; } @@ -2196,7 +2215,6 @@ rsvp_class_to_filter_num(int classnum) case RSVP_CLASS_MESSAGE_ID_ACK : case RSVP_CLASS_MESSAGE_ID_LIST : return classnum + RSVPF_OBJECT; - break; case RSVP_CLASS_RECOVERY_LABEL : case RSVP_CLASS_UPSTREAM_LABEL : @@ -2212,6 +2230,9 @@ rsvp_class_to_filter_num(int classnum) case RSVP_CLASS_LINK_CAP : return RSVPF_LINK_CAP; + case RSVP_CLASS_CAPABILITY : + return RSVPF_CAPABILITY; + case RSVP_CLASS_DIFFSERV : return RSVPF_DIFFSERV; @@ -2334,6 +2355,8 @@ rsvp_class_to_tree_type(int classnum) return TT_RESTART_CAP; case RSVP_CLASS_LINK_CAP : return TT_LINK_CAP; + case RSVP_CLASS_CAPABILITY : + return TT_CAPABILITY; case RSVP_CLASS_DIFFSERV : return TT_DIFFSERV; case RSVP_CLASS_CLASSTYPE: @@ -2388,7 +2411,7 @@ find_rsvp_session_tempfilt(tvbuff_t *tvb, int hdr_offset, int *session_offp, int { int s_off = 0, t_off = 0; int len, off; - guint obj_length; + unsigned obj_length; if (!tvb_bytes_exist(tvb, hdr_offset+6, 2)) goto done; @@ -2398,7 +2421,7 @@ find_rsvp_session_tempfilt(tvbuff_t *tvb, int hdr_offset, int *session_offp, int obj_length = tvb_get_ntohs(tvb, off); if (obj_length == 0) break; - switch(tvb_get_guint8(tvb, off+2)) { + switch(tvb_get_uint8(tvb, off+2)) { case RSVP_CLASS_SESSION: s_off = off; break; @@ -2557,12 +2580,12 @@ static const value_string rsvp_c_type_s2l_sub_lsp_vals[] = { static char * summary_session(wmem_allocator_t *pool, tvbuff_t *tvb, int offset) { - switch(tvb_get_guint8(tvb, offset+3)) { + switch(tvb_get_uint8(tvb, offset+3)) { case RSVP_SESSION_TYPE_IPV4: return wmem_strdup_printf(pool, "SESSION: IPv4, Destination %s, Protocol %d, Port %d. ", tvb_ip_to_str(pool, tvb, offset+4), - tvb_get_guint8(tvb, offset+8), + tvb_get_uint8(tvb, offset+8), tvb_get_ntohs(tvb, offset+10)); break; case RSVP_SESSION_TYPE_IPV4_LSP: @@ -2587,7 +2610,7 @@ summary_session(wmem_allocator_t *pool, tvbuff_t *tvb, int offset) return wmem_strdup_printf(pool, "SESSION: IPv4-Aggregate, Destination %s, DSCP %d. ", tvb_ip_to_str(pool, tvb, offset+4), - tvb_get_guint8(tvb, offset+11)); + tvb_get_uint8(tvb, offset+11)); break; case RSVP_SESSION_TYPE_IPV4_UNI: return wmem_strdup_printf(pool, @@ -2619,7 +2642,7 @@ summary_session(wmem_allocator_t *pool, tvbuff_t *tvb, int offset) break; default: return wmem_strdup_printf(pool, - "SESSION: Type %d. ", tvb_get_guint8(tvb, offset+3)); + "SESSION: Type %d. ", tvb_get_uint8(tvb, offset+3)); break; } DISSECTOR_ASSERT_NOT_REACHED(); @@ -2630,12 +2653,12 @@ summary_template(wmem_allocator_t *pool, tvbuff_t *tvb, int offset) { const char *objtype; - if (tvb_get_guint8(tvb, offset+2) == RSVP_CLASS_FILTER_SPEC) + if (tvb_get_uint8(tvb, offset+2) == RSVP_CLASS_FILTER_SPEC) objtype = "FILTERSPEC"; else objtype = "SENDER TEMPLATE"; - switch(tvb_get_guint8(tvb, offset+3)) { + switch(tvb_get_uint8(tvb, offset+3)) { case 1: return wmem_strdup_printf(pool, "%s: IPv4, Sender %s, Port %d. ", objtype, @@ -2677,7 +2700,7 @@ summary_template(wmem_allocator_t *pool, tvbuff_t *tvb, int offset) break; default: return wmem_strdup_printf(pool, - "%s: Type %d. ", objtype, tvb_get_guint8(tvb, offset+3)); + "%s: Type %d. ", objtype, tvb_get_uint8(tvb, offset+3)); break; } DISSECTOR_ASSERT_NOT_REACHED(); @@ -2722,7 +2745,7 @@ dissect_rsvp_session(packet_info *pinfo, proto_item *ti, proto_tree *rsvp_object */ rsvph->session_type = RSVP_SESSION_TYPE_IPV4; set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); - rsvph->protocol = tvb_get_guint8(tvb, offset2+4); + rsvph->protocol = tvb_get_uint8(tvb, offset2+4); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+6); break; @@ -2743,7 +2766,7 @@ dissect_rsvp_session(packet_info *pinfo, proto_item *ti, proto_tree *rsvp_object break; case RSVP_SESSION_TYPE_IPV4_LSP: - proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_session, tvb, offset+3, 1, ENC_BIG_ENDIAN);; + proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_session, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_IP], tvb, offset2, 4, ENC_BIG_ENDIAN); @@ -2813,7 +2836,7 @@ dissect_rsvp_session(packet_info *pinfo, proto_item *ti, proto_tree *rsvp_object case RSVP_SESSION_TYPE_AGGREGATE_IPV4: - proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_session, tvb, offset+3, 1, ENC_BIG_ENDIAN);; + proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_session, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_IP], tvb, offset2, 4, ENC_BIG_ENDIAN); @@ -2825,7 +2848,7 @@ dissect_rsvp_session(packet_info *pinfo, proto_item *ti, proto_tree *rsvp_object */ rsvph->session_type = RSVP_SESSION_TYPE_AGGREGATE_IPV4; set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); - rsvph->dscp = tvb_get_guint8(tvb, offset2+7); + rsvph->dscp = tvb_get_uint8(tvb, offset2+7); rsvph->ext_tunnel_id = tvb_get_ntohl(tvb, offset2 + 8); break; @@ -2892,7 +2915,7 @@ dissect_rsvp_session(packet_info *pinfo, proto_item *ti, proto_tree *rsvp_object hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID], tvb, offset2+6, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(rsvp_object_tree, hf_rsvp_extended_tunnel, tvb, offset2+8, 16, ENC_NA); + proto_tree_add_item(rsvp_object_tree, hf_rsvp_extended_tunnel_ipv6, tvb, offset2+8, 16, ENC_NA); hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID_IPV6], tvb, offset2+8, 16, ENC_NA); @@ -2954,9 +2977,9 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_objec int subtree_type) { int tlv_off, padding; - guint16 tlv_type; + uint16_t tlv_type; int tlv_len; - guint8 isis_len; + uint8_t isis_len; const char *tlv_name, *ip_str; proto_tree *rsvp_ifid_subtree=NULL, *ti2 = NULL; @@ -3108,7 +3131,7 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_objec case 23: /* REPORTING_ISIS_AREA */ tlv_name = "Reporting-"; ifid_isis: - isis_len = tvb_get_guint8(tvb, offset+tlv_off+4); + isis_len = tvb_get_uint8(tvb, offset+tlv_off+4); if ((isis_len < 2) || (isis_len > 11)) { proto_tree_add_expert_format(rsvp_object_tree, pinfo, &ei_rsvp_invalid_length, tvb, offset+tlv_off, tlv_len, @@ -3295,12 +3318,12 @@ dissect_rsvp_time_values(proto_item *ti, proto_tree *rsvp_object_tree, /*------------------------------------------------------------------------------ * Error value field in ERROR object *------------------------------------------------------------------------------*/ -static guint16 +static uint16_t dissect_rsvp_error_value(proto_tree *ti, tvbuff_t *tvb, - int offset, guint8 error_code) + int offset, uint8_t error_code) { - guint16 error_val; - guint8 error_class, error_ctype; + uint16_t error_val; + uint8_t error_class, error_ctype; value_string_ext *rsvp_error_vals_ext_p = NULL; error_val = tvb_get_ntohs(tvb, offset); @@ -3385,9 +3408,9 @@ dissect_rsvp_error(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t { int offset2 = offset + 4; int offset3 = 0; - guint8 error_flags; - guint8 error_code; - guint16 error_val; + uint8_t error_flags; + uint8_t error_code; + uint16_t error_val; proto_tree *ti2 = NULL, *rsvp_error_subtree; proto_item *hidden_item; @@ -3444,7 +3467,7 @@ dissect_rsvp_error(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t } if(obj_length>4) { - error_flags = tvb_get_guint8(tvb, offset3); + error_flags = tvb_get_uint8(tvb, offset3); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_error_flags, tvb, offset3, 1, ENC_BIG_ENDIAN); rsvp_error_subtree = proto_item_add_subtree(ti2, TREE(TT_ERROR_FLAGS)); @@ -3458,7 +3481,7 @@ dissect_rsvp_error(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t (error_flags & (1U<<2)) ? "Path-State-Removed" : "", (error_flags & (1U<<1)) ? "NotGuilty" : "", (error_flags & (1U<<0)) ? "InPlace" : ""); - error_code = tvb_get_guint8(tvb, offset3+1); + error_code = tvb_get_uint8(tvb, offset3+1); proto_tree_add_item(rsvp_object_tree, hf_rsvp_error_error_code, tvb, offset3+1, 1, ENC_BIG_ENDIAN); error_val = dissect_rsvp_error_value(rsvp_object_tree, tvb, offset3+2, error_code); @@ -3543,7 +3566,7 @@ dissect_rsvp_style(proto_item *ti, proto_tree *rsvp_object_tree, switch(type) { case 1: { - guint32 style; + uint32_t style; proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_style, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_style_flags, tvb, offset2, 1, ENC_BIG_ENDIAN); @@ -3765,9 +3788,9 @@ dissect_rsvp_eth_tspec_tlv(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_ { int tlv_off; int bit_offset; - guint16 tlv_type; + uint16_t tlv_type; int tlv_len; - guint8 profile; + uint8_t profile; proto_tree *rsvp_ethspec_subtree, *ethspec_profile_subtree, *ti3; for (tlv_off = 0; tlv_off < tlv_length; ) { @@ -3782,7 +3805,7 @@ dissect_rsvp_eth_tspec_tlv(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_ case 0: case 1: - /*case 2: ethernet bandwidth profile accordig to RFC 6003*/ + /*case 2: ethernet bandwidth profile according to RFC 6003*/ case 2: rsvp_ethspec_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset+tlv_off, tlv_len, subtree_type, NULL, @@ -3795,7 +3818,7 @@ dissect_rsvp_eth_tspec_tlv(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_ proto_tree_add_uint_format_value(rsvp_ethspec_subtree, hf_rsvp_type, tvb, offset+tlv_off, 2, tlv_type, "%u - Ethernet Bandwidth Profile", tlv_type); proto_tree_add_item(rsvp_ethspec_subtree, hf_rsvp_eth_tspec_length, tvb, offset+tlv_off+2, 2, ENC_BIG_ENDIAN); - profile = tvb_get_guint8(tvb, offset+tlv_off+4); + profile = tvb_get_uint8(tvb, offset+tlv_off+4); ti3 = proto_tree_add_item(rsvp_ethspec_subtree, hf_rsvp_eth_tspec_profile, tvb, offset+tlv_off+4, 1, ENC_NA); ethspec_profile_subtree = proto_item_add_subtree(ti3, TREE(TT_ETHSPEC_SUBTREE)); proto_tree_add_item(ethspec_profile_subtree, hf_rsvp_eth_tspec_tlv_color_mode, @@ -3855,7 +3878,7 @@ dissect_rsvp_eth_tspec_tlv(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_ proto_tree_add_uint_format_value(rsvp_ethspec_subtree, hf_rsvp_type, tvb, offset+tlv_off, 2, tlv_type, "%u - Ethernet Bandwidth Profile", tlv_type); proto_tree_add_item(rsvp_ethspec_subtree, hf_rsvp_eth_tspec_length, tvb, offset+tlv_off+2, 2, ENC_BIG_ENDIAN); - profile = tvb_get_guint8(tvb, offset+tlv_off+4); + profile = tvb_get_uint8(tvb, offset+tlv_off+4); ti3 = proto_tree_add_item(rsvp_ethspec_subtree, hf_rsvp_eth_tspec_profile, tvb, offset+tlv_off+4, 1, ENC_BIG_ENDIAN); ethspec_profile_subtree = proto_item_add_subtree(ti3, TREE(TT_ETHSPEC_SUBTREE)); proto_tree_add_item(ethspec_profile_subtree, hf_rsvp_eth_tspec_tlv_color_mode, @@ -3908,8 +3931,8 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t int offset2 = offset + 4; int mylen; proto_tree *tspec_tree, *ti2 = NULL; - guint8 signal_type; - guint16 m; + uint8_t signal_type; + uint16_t m; proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -3929,10 +3952,10 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t proto_item_set_text(ti, "SENDER TSPEC: IntServ, "); while (mylen > 0) { - guint8 param_id; - guint param_len, raw_len; - guint param_len_processed; - guint length; + uint8_t param_id; + unsigned param_len, raw_len; + unsigned param_len_processed; + unsigned length; proto_tree_add_item(rsvp_object_tree, hf_rsvp_tspec_service_header, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item_ret_uint(rsvp_object_tree, hf_rsvp_data_length, tvb, offset2+2, 2, ENC_BIG_ENDIAN, &length); @@ -3943,7 +3966,7 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t /* Process all known service headers as a set of parameters */ param_len_processed = 0; while (param_len_processed < length) { - param_id = tvb_get_guint8(tvb, offset2); + param_id = tvb_get_uint8(tvb, offset2); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_parameter, tvb, offset2, 1, ENC_NA); raw_len = tvb_get_ntohs(tvb, offset2+2); param_len = raw_len + 1; @@ -4017,7 +4040,7 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t proto_item_set_text(ti, "SENDER TSPEC: SONET/SDH, "); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_tspec, tvb, offset+3, 1, ENC_BIG_ENDIAN); - signal_type = tvb_get_guint8(tvb, offset2); + signal_type = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_tspec_signal_type_sonet, tvb, offset2, 1, ENC_BIG_ENDIAN); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_tspec_requested_concatenation, tvb, offset2+1, 1, ENC_BIG_ENDIAN); tspec_tree = proto_item_add_subtree(ti2, TREE(TT_TSPEC_SUBTREE)); @@ -4064,7 +4087,7 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t proto_item_append_text(ti, "Signal [%s], RCC %d, NCC %d, NVC %d, MT %d, Transparency %d, Profile %d", val_to_str_ext_const(signal_type, &gmpls_sonet_signal_type_str_ext, "Unknown"), - tvb_get_guint8(tvb, offset2+1), tvb_get_ntohs(tvb, offset2+2), + tvb_get_uint8(tvb, offset2+1), tvb_get_ntohs(tvb, offset2+2), tvb_get_ntohs(tvb, offset2+4), tvb_get_ntohs(tvb, offset2+6), tvb_get_ntohl(tvb, offset2+8), tvb_get_ntohl(tvb, offset2+12)); break; @@ -4073,7 +4096,7 @@ dissect_rsvp_tspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_object_t proto_item_set_text(ti, "SENDER TSPEC: G.709, "); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_tspec, tvb, offset + 3, 1, ENC_BIG_ENDIAN); - signal_type = tvb_get_guint8(tvb, offset2); + signal_type = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_tspec_signal_type_g709, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_tspec_number_of_multiplexed_components, tvb, offset2 + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_tspec_number_of_virtual_components, tvb, offset2 + 4, 2, ENC_BIG_ENDIAN); @@ -4129,7 +4152,7 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec int mylen, signal_type; proto_tree *flowspec_tree, *ti2 = NULL; proto_item *hidden_item; - guint16 m; + uint16_t m; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_item_set_hidden(hidden_item); @@ -4153,18 +4176,18 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec mylen -= 4; offset2+= 4; while (mylen > 0) { - guint8 service_num; - guint length; - guint8 param_id; - guint param_len, raw_len; - guint param_len_processed; + uint8_t service_num; + unsigned length; + uint8_t param_id; + unsigned param_len, raw_len; + unsigned param_len_processed; if (mylen < 4) { proto_tree_add_expert_format(rsvp_object_tree, pinfo, &ei_rsvp_invalid_length, tvb, 0, 0, "Object length %u not large enough", obj_length); return; } - service_num = tvb_get_guint8(tvb, offset2); + service_num = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_flowspec_service_header, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item_ret_uint(rsvp_object_tree, hf_rsvp_data_length, tvb, offset2+2, 2, ENC_BIG_ENDIAN, &length); @@ -4179,7 +4202,7 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec param_len_processed = 0; while (param_len_processed < length) { ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_parameter, tvb, offset2, 1, ENC_NA); - param_id = tvb_get_guint8(tvb, offset2); + param_id = tvb_get_uint8(tvb, offset2); raw_len = tvb_get_ntohs(tvb, offset2+2); param_len = raw_len + 1; switch(param_id) { @@ -4253,7 +4276,7 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec proto_item_set_text(ti, "FLOWSPEC: SONET/SDH, "); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_flowspec, tvb, offset+3, 1, ENC_BIG_ENDIAN); - signal_type = tvb_get_guint8(tvb, offset2); + signal_type = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_flowspec_signal_type_sonet, tvb, offset2, 1, ENC_BIG_ENDIAN); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_flowspec_requested_concatenation, tvb, offset2+1, 1, ENC_BIG_ENDIAN); flowspec_tree = proto_item_add_subtree(ti2, TREE(TT_FLOWSPEC_SUBTREE)); @@ -4300,7 +4323,7 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec proto_item_append_text(ti, "Signal [%s], RCC %d, NCC %d, NVC %d, MT %d, Transparency %d, Profile %d", val_to_str_ext_const(signal_type, &gmpls_sonet_signal_type_str_ext, "Unknown"), - tvb_get_guint8(tvb, offset2+1), tvb_get_ntohs(tvb, offset2+2), + tvb_get_uint8(tvb, offset2+1), tvb_get_ntohs(tvb, offset2+2), tvb_get_ntohs(tvb, offset2+4), tvb_get_ntohs(tvb, offset2+6), tvb_get_ntohl(tvb, offset2+8), tvb_get_ntohl(tvb, offset2+12)); break; @@ -4309,7 +4332,7 @@ dissect_rsvp_flowspec(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec proto_item_set_text(ti, "FLOWSPEC: G.709, "); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_flowspec, tvb, offset+3, 1, ENC_BIG_ENDIAN); - signal_type = tvb_get_guint8(tvb, offset2); + signal_type = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_flowspec_signal_type_g709, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_flowspec_number_of_multiplexed_components, tvb, offset2 + 2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_flowspec_number_of_virtual_components, tvb, offset2 + 4, 2, ENC_BIG_ENDIAN); @@ -4375,11 +4398,11 @@ dissect_rsvp_adspec(proto_item *ti _U_, packet_info* pinfo, proto_tree *rsvp_obj mylen -= 4; offset2 += 4; while (mylen > 0) { - guint8 service_num; - guint length; + uint8_t service_num; + unsigned length; const char *str; - service_num = tvb_get_guint8(tvb, offset2); + service_num = tvb_get_uint8(tvb, offset2); str = val_to_str_ext_const(service_num, &intsrv_services_str_ext, "Unknown"); length = tvb_get_ntohs(tvb, offset2+2); adspec_tree = proto_tree_add_subtree(rsvp_object_tree, tvb, offset2, @@ -4392,7 +4415,7 @@ dissect_rsvp_adspec(proto_item *ti _U_, packet_info* pinfo, proto_tree *rsvp_obj offset2 += 4; i = length*4; while (i > 0) { - guint id, phdr_length; + unsigned id, phdr_length; ti2 = proto_tree_add_item_ret_uint(adspec_tree, hf_rsvp_adspec_type, tvb, offset2, 1, ENC_NA, &id); adspec_type_tree = proto_item_add_subtree(ti2, TREE(TT_ADSPEC_TYPE_SUBTREE)); @@ -4521,13 +4544,13 @@ dissect_rsvp_label_request(proto_item *ti, proto_tree *rsvp_object_tree, proto_item_set_text(ti, "LABEL REQUEST: ATM: L3PID: %s (0x%04x). VPI/VCI: Min: %d/%d, Max: %d/%d. %s Merge. ", val_to_str_const(l3pid, etype_vals, "Unknown"), l3pid, min_vpi, min_vci, max_vpi, max_vci, - (tvb_get_guint8(tvb, offset2+4) & 0x80) ? "Can" : "Cannot"); + (tvb_get_uint8(tvb, offset2+4) & 0x80) ? "Can" : "Cannot"); break; } case 3: { - guint16 l3pid = tvb_get_ntohs(tvb, offset2+2); - guint32 min_dlci, max_dlci, dlci_len, dlci_len_code; + uint16_t l3pid = tvb_get_ntohs(tvb, offset2+2); + uint32_t min_dlci, max_dlci, dlci_len, dlci_len_code; proto_tree_add_item(rsvp_object_tree, hf_rsvp_label_request_l3pid, tvb, offset2+2, 2, ENC_BIG_ENDIAN); dlci_len_code = (tvb_get_ntohs(tvb, offset2+4) & 0x0180) >> 7; min_dlci = tvb_get_ntohl(tvb, offset2+4) & 0x7fffff; @@ -4565,14 +4588,14 @@ dissect_rsvp_label_request(proto_item *ti, proto_tree *rsvp_object_tree, case 4: case 5: { unsigned short l3pid = tvb_get_ntohs(tvb, offset2+2); - unsigned char lsp_enc = tvb_get_guint8(tvb,offset2); + unsigned char lsp_enc = tvb_get_uint8(tvb,offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_label_request_lsp_encoding_type, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_label_request_switching_type, tvb, offset2+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_g_pid, tvb, offset2+2, 2, ENC_BIG_ENDIAN); proto_item_set_text(ti, "LABEL REQUEST: Generalized: LSP Encoding=%s, " "Switching Type=%s, G-PID=%s ", rval_to_str(lsp_enc, gmpls_lsp_enc_rvals, "Unknown (%d)"), - rval_to_str(tvb_get_guint8(tvb,offset2+1), + rval_to_str(tvb_get_uint8(tvb,offset2+1), gmpls_switching_type_rvals, "Unknown (%d)"), rval_to_str_const(l3pid, gmpls_gpid_rvals, val_to_str(l3pid, etype_vals, @@ -4629,16 +4652,16 @@ dissect_glabel_lambda(proto_tree *ti, proto_tree *rsvp_object_tree, { float freq = 0.0f; float slot_width = 0.0f; - guint32 wavelength = 0; + uint32_t wavelength = 0; float cs_thz = 0.0f; proto_tree *wavelength_tree; - guint8 grid, cs; - gint16 n, m; + uint8_t grid, cs; + int16_t n, m; - grid = ((tvb_get_guint8(tvb, offset) & 0xE0) >> 5); - cs = ((tvb_get_guint8(tvb, offset) & 0x1E) >> 1); + grid = ((tvb_get_uint8(tvb, offset) & 0xE0) >> 5); + cs = ((tvb_get_uint8(tvb, offset) & 0x1E) >> 1); n = tvb_get_ntohs(tvb, offset + 2); wavelength_tree = proto_tree_add_subtree(rsvp_object_tree, tvb, offset, 4, TREE(TT_WAVELENGTH), NULL, "Wavelength Label"); @@ -4699,8 +4722,8 @@ dissect_glabel_sdh(proto_tree *ti _U_, proto_tree *rsvp_object_tree, tvbuff_t *tvb, int offset) { - guint16 s; - guint8 u, k, l, m; + uint16_t s; + uint8_t u, k, l, m; proto_tree* sonet_tree; sonet_tree = proto_tree_add_subtree(rsvp_object_tree, tvb, offset, 4, TREE(TT_SONET_SDH), NULL, "SONET/SDH Label"); @@ -4711,10 +4734,10 @@ dissect_glabel_sdh(proto_tree *ti _U_, proto_tree *rsvp_object_tree, proto_tree_add_item(sonet_tree, hf_rsvp_sonet_m, tvb, offset+3, 1, ENC_BIG_ENDIAN); s = tvb_get_ntohs(tvb, offset); - u = ((tvb_get_guint8(tvb, offset + 2) & 0xF0) >> 4); - k = ((tvb_get_guint8(tvb, offset + 2) & 0x0F) >> 0); - l = ((tvb_get_guint8(tvb, offset + 3) & 0xF0) >> 4); - m = ((tvb_get_guint8(tvb, offset + 3) & 0x0F) >> 0); + u = ((tvb_get_uint8(tvb, offset + 2) & 0xF0) >> 4); + k = ((tvb_get_uint8(tvb, offset + 2) & 0x0F) >> 0); + l = ((tvb_get_uint8(tvb, offset + 3) & 0xF0) >> 4); + m = ((tvb_get_uint8(tvb, offset + 3) & 0x0F) >> 0); proto_item_append_text(ti, ": SONET/SDH: S=%u, U=%u, K=%u, L=%u, M=%u", s, u, k, l, m); } @@ -4733,7 +4756,7 @@ dissect_glabel_g709(proto_tree *ti _U_, proto_tree *rsvp_object_tree, tvbuff_t *tvb, int offset) { - guint8 t1, t2, t3; + uint8_t t1, t2, t3; proto_tree* g709_tree; g709_tree = proto_tree_add_subtree(rsvp_object_tree, tvb, offset, 4, TREE(TT_G709), NULL, "G.709 ODUk Label"); @@ -4741,10 +4764,10 @@ dissect_glabel_g709(proto_tree *ti _U_, proto_tree *rsvp_object_tree, proto_tree_add_item(g709_tree, hf_rsvp_g709_t2, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(g709_tree, hf_rsvp_g709_t1, tvb, offset+3, 1, ENC_BIG_ENDIAN); - t2 = ((tvb_get_guint8(tvb, offset + 3) & 0x0E) >> 1); - t1 = ((tvb_get_guint8(tvb, offset + 3) & 0x01) >> 0); - t3 = ((tvb_get_guint8(tvb, offset + 2) & 0x03) << 4); - t3 |= ((tvb_get_guint8(tvb, offset + 3) & 0xF0) >> 4); + t2 = ((tvb_get_uint8(tvb, offset + 3) & 0x0E) >> 1); + t1 = ((tvb_get_uint8(tvb, offset + 3) & 0x01) >> 0); + t3 = ((tvb_get_uint8(tvb, offset + 2) & 0x03) << 4); + t3 |= ((tvb_get_uint8(tvb, offset + 3) & 0xF0) >> 4); proto_item_append_text(ti, ": G.709 ODUk: " "t3=%u, " @@ -4767,7 +4790,7 @@ dissect_glabel_evpl(proto_tree *ti _U_, proto_tree *rsvp_object_tree, int offset) { int bit_offset; - guint16 vlan_id = ((tvb_get_ntohs(tvb,offset) << 4) & 0xFFFF); + uint16_t vlan_id = ((tvb_get_ntohs(tvb,offset) << 4) & 0xFFFF); /* point to the first bit in VLAN ID */ bit_offset = (offset<<2)+3; @@ -4786,7 +4809,7 @@ dissect_rsvp_label(proto_tree *ti, proto_tree *rsvp_object_tree, int mylen, i; const char *name; proto_item *hidden_item; - guint32 unassigned_upstream_label; + uint32_t unassigned_upstream_label; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_item_set_hidden(hidden_item); @@ -4864,7 +4887,7 @@ dissect_rsvp_label_set(proto_item *ti, proto_tree *rsvp_object_tree, int rsvp_class _U_, int type _U_) { int offset2 = offset + 8; - guint8 label_type; + uint8_t label_type; int len, i; len = obj_length - 8; @@ -4876,16 +4899,16 @@ dissect_rsvp_label_set(proto_item *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_label_set, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_label_set_action, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, ": %s", - val_to_str(tvb_get_guint8(tvb, offset+4), + val_to_str(tvb_get_uint8(tvb, offset+4), action_type_vals, "Unknown (%u)")); - label_type = tvb_get_guint8 (tvb, offset+7); + label_type = tvb_get_uint8 (tvb, offset+7); proto_tree_add_uint_format_value(rsvp_object_tree, hf_rsvp_label_set_type, tvb, offset+7, 1, label_type, "%s", (label_type == 1) ? "Packet Label" : "Generalized Label"); proto_item_append_text(ti, ", %s", (label_type == 1) ? "Packet Label: " : "Generalized Label: "); for (i = 0; i < len/4; i++) { - guint32 subchannel = tvb_get_ntohl(tvb, offset2+i*4); + uint32_t subchannel = tvb_get_ntohl(tvb, offset2+i*4); proto_tree_add_uint_format_value(rsvp_object_tree, hf_rsvp_label_set_subchannel, tvb, offset2+i*4, 4, subchannel, "Subchannel %u: %u (0x%x)", i+1, subchannel, subchannel); @@ -4909,8 +4932,8 @@ dissect_rsvp_session_attribute(proto_item *ti, proto_tree *rsvp_object_tree, int rsvp_class _U_, int type) { int offset2 = offset + 4; - guint8 flags; - guint8 name_len; + uint8_t flags; + uint8_t name_len; proto_tree *ti2, *rsvp_sa_flags_tree; proto_item *hidden_item; @@ -4932,7 +4955,7 @@ dissect_rsvp_session_attribute(proto_item *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_object_tree, hf_rsvp_session_attribute_setup_priority, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_session_attribute_hold_priority, tvb, offset2+1, 1, ENC_BIG_ENDIAN); - flags = tvb_get_guint8(tvb, offset2+2); + flags = tvb_get_uint8(tvb, offset2+2); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_session_attribute_flags, tvb, offset2+2, 1, ENC_BIG_ENDIAN); rsvp_sa_flags_tree = proto_item_add_subtree(ti2, TREE(TT_SESSION_ATTRIBUTE_FLAGS)); @@ -4947,12 +4970,12 @@ dissect_rsvp_session_attribute(proto_item *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_sa_flags_tree, hf_rsvp_sa_flags_node, tvb, offset2+2, 1, ENC_BIG_ENDIAN); - name_len = tvb_get_guint8(tvb, offset2+3); + name_len = tvb_get_uint8(tvb, offset2+3); proto_tree_add_item(rsvp_object_tree, hf_rsvp_session_attribute_name_length, tvb, offset2+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_session_attribute_name, tvb, offset2+4, name_len, ENC_NA|ENC_ASCII); proto_item_set_text(ti, "SESSION ATTRIBUTE: SetupPrio %d, HoldPrio %d, %s%s%s%s%s [%s]", - tvb_get_guint8(tvb, offset2), - tvb_get_guint8(tvb, offset2+1), + tvb_get_uint8(tvb, offset2), + tvb_get_uint8(tvb, offset2+1), flags &0x01 ? "Local Protection, " : "", flags &0x02 ? "Label Recording, " : "", flags &0x04 ? "SE Style, " : "", @@ -5004,13 +5027,13 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ /* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ for (i=1, l = 0; l < obj_length - 4; i++) { - type = tvb_get_guint8(tvb, offset + l); + type = tvb_get_uint8(tvb, offset + l); if ((rsvp_class == RSVP_CLASS_EXPLICIT_ROUTE) || (rsvp_class == RSVP_CLASS_EXCLUDE_ROUTE) || (rsvp_class == RSVP_CLASS_SECONDARY_EXPLICIT_ROUTE)) type &= 0x7f; - lbit = tvb_get_guint8(tvb, offset + l) & 0x80; - dbit = tvb_get_guint8(tvb, offset + l + 2) & 0x80; + lbit = tvb_get_uint8(tvb, offset + l) & 0x80; + dbit = tvb_get_uint8(tvb, offset + l + 2) & 0x80; switch(type) { case 1: /* IPv4 */ rsvp_ro_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, @@ -5044,7 +5067,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ lbit ? " [L]" : ""); } if (rsvp_class == RSVP_CLASS_RECORD_ROUTE || rsvp_class == RSVP_CLASS_SECONDARY_RECORD_ROUTE) { - flags = tvb_get_guint8(tvb, offset+l+7); + flags = tvb_get_uint8(tvb, offset+l+7); if (flags&0x20) { proto_item_append_text(ti, " (Node-id)"); proto_item_append_text(ti2, " (Node-id)"); @@ -5096,7 +5119,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ proto_item_append_text(ti, "IPv6 [...]%s", lbit ? " [L]":""); } if (rsvp_class == RSVP_CLASS_RECORD_ROUTE || rsvp_class == RSVP_CLASS_SECONDARY_RECORD_ROUTE) { - flags = tvb_get_guint8(tvb, offset+l+19); + flags = tvb_get_uint8(tvb, offset+l+19); if (flags&0x20) { proto_item_append_text(ti, " (Node-id)"); proto_item_append_text(ti2, " (Node-id)"); @@ -5139,7 +5162,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ type, "3 (Label)"); proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_ero_rro_subobjects_length, tvb, offset+l+1, 1, ENC_BIG_ENDIAN); if (rsvp_class == RSVP_CLASS_RECORD_ROUTE || rsvp_class == RSVP_CLASS_SECONDARY_RECORD_ROUTE) { - flags = tvb_get_guint8(tvb, offset+l+2); + flags = tvb_get_uint8(tvb, offset+l+2); if (flags&0x01) proto_item_append_text(ti2, "The label will be understood if received on any interface"); ti2 = proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_ero_rro_subobjects_flags, tvb, offset+l+2, 1, ENC_BIG_ENDIAN); rsvp_rro_flags_subtree = @@ -5173,7 +5196,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ type, "4 (Unnumbered Interface-ID)"); proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_ero_rro_subobjects_length, tvb, offset+l+1, 1, ENC_BIG_ENDIAN); if (rsvp_class == RSVP_CLASS_RECORD_ROUTE || rsvp_class == RSVP_CLASS_SECONDARY_RECORD_ROUTE) { - flags = tvb_get_guint8(tvb, offset+l+2); + flags = tvb_get_uint8(tvb, offset+l+2); if (flags&0x01) proto_item_append_text(ti2, ", Local Protection Available"); if (flags&0x02) proto_item_append_text(ti2, ", Local Protection In Use"); ti2 = proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_ero_rro_subobjects_flags, tvb, offset+l+2, 1, ENC_BIG_ENDIAN); @@ -5334,9 +5357,9 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ * code in network octet order. */ { - guint8 private_so_len = tvb_get_guint8(tvb, offset+l+1); + uint8_t private_so_len = tvb_get_uint8(tvb, offset+l+1); rsvp_ro_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset+l, - tvb_get_guint8(tvb, offset+l+1), + tvb_get_uint8(tvb, offset+l+1), tree_type, &ti2, "Private Subobject: %d", type); proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_loose_hop, tvb, offset+l, 1, ENC_NA); proto_tree_add_uint_format_value(rsvp_ro_subtree, hf_rsvp_type, tvb, offset+l, 1, @@ -5357,7 +5380,7 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ defaultsub: rsvp_ro_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset+l, - tvb_get_guint8(tvb, offset+l+1), + tvb_get_uint8(tvb, offset+l+1), tree_type, &ti2, "Unknown subobject: %d", type); proto_tree_add_item(rsvp_ro_subtree, hf_rsvp_loose_hop, tvb, offset+l, 1, ENC_NA); @@ -5367,12 +5390,12 @@ dissect_rsvp_ro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ break; } - if (tvb_get_guint8(tvb, offset+l+1) < 1) { + if (tvb_get_uint8(tvb, offset+l+1) < 1) { proto_tree_add_expert_format(rsvp_ro_subtree, pinfo, &ei_rsvp_invalid_length, tvb, offset+l+1, 1, - "Invalid length: %u", tvb_get_guint8(tvb, offset+l+1)); + "Invalid length: %u", tvb_get_uint8(tvb, offset+l+1)); return; } - l += tvb_get_guint8(tvb, offset+l+1); + l += tvb_get_uint8(tvb, offset+l+1); if (l < obj_length - 4) { if (i < 4) proto_item_append_text(ti, ", "); @@ -5495,7 +5518,7 @@ dissect_rsvp_message_id(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_object_tree, hf_rsvp_message_id_message_id, tvb, offset+8, 4, ENC_BIG_ENDIAN); proto_item_set_text(ti, "MESSAGE-ID: %d %s", tvb_get_ntohl(tvb, offset+8), - tvb_get_guint8(tvb, offset+4) & 1 ? "(Ack Desired)" : ""); + tvb_get_uint8(tvb, offset+4) & 1 ? "(Ack Desired)" : ""); break; default: @@ -5628,7 +5651,7 @@ dissect_rsvp_dclass(proto_tree *ti, proto_tree *rsvp_object_tree, for (mylen = 4; mylen < obj_length; mylen += 4) { proto_tree_add_item(rsvp_object_tree, hf_rsvp_dclass_dscp, tvb, offset+mylen+3, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, "%d%s", - tvb_get_guint8(tvb, offset+mylen+3)>>2, + tvb_get_uint8(tvb, offset+mylen+3)>>2, mylen==obj_length-4 ? "": mylen<16 ? ", ": mylen==16 ? ", ..." : ""); @@ -5653,7 +5676,7 @@ dissect_rsvp_admin_status(proto_tree *ti, proto_tree *rsvp_object_tree, int rsvp_class _U_, int type) { int offset2 = offset + 4; - guint32 status; + uint32_t status; static int * const status_flags[] = { &hf_rsvp_filter[RSVPF_ADMIN_STATUS_REFLECT], &hf_rsvp_filter[RSVPF_ADMIN_STATUS_HANDOVER], @@ -5705,8 +5728,8 @@ dissect_rsvp_lsp_attributes(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp int rsvp_class, int type) { int tlv_off; - guint32 attributes; - guint16 tlv_type, tlv_len; + uint32_t attributes; + uint16_t tlv_type, tlv_len; proto_tree *ti2, *rsvp_lsp_attr_subtree; static int * const rsvp_lsp_attr_flags[] = { &hf_rsvp_lsp_attr_e2e, @@ -5814,8 +5837,8 @@ dissect_rsvp_association(proto_tree *ti, proto_tree *rsvp_object_tree, int offset, int obj_length, int rsvp_class _U_, int type) { - guint16 association_type; - guint16 association_id; + uint16_t association_type; + uint16_t association_id; proto_item *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -5880,7 +5903,7 @@ dissect_rsvp_lsp_tunnel_if_id_tlv(proto_tree *rsvp_object_tree, packet_info* pin int subtree_type) { int tlv_off; - guint16 tlv_type; + uint16_t tlv_type; int tlv_len; proto_tree *ti, *rsvp_lsp_tunnel_if_id_subtree; @@ -5929,11 +5952,11 @@ dissect_rsvp_lsp_tunnel_if_id_tlv(proto_tree *rsvp_object_tree, packet_info* pin proto_tree_add_item(rsvp_lsp_tunnel_if_id_subtree, hf_rsvp_lsp_tunnel_if_id_sc_pc_id, tvb, offset+tlv_off+16, 4, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_lsp_tunnel_if_id_subtree, hf_rsvp_lsp_tunnel_if_id_sc_pc_scn_address, tvb, offset+tlv_off+20, 4, ENC_BIG_ENDIAN); proto_item_append_text(ti, "LSP Encoding=%s, Switching Type=%s, Signal Type=%s", - rval_to_str(tvb_get_guint8(tvb,offset+tlv_off+4), + rval_to_str(tvb_get_uint8(tvb,offset+tlv_off+4), gmpls_lsp_enc_rvals, "Unknown (%d)"), - rval_to_str(tvb_get_guint8(tvb,offset+tlv_off+5), + rval_to_str(tvb_get_uint8(tvb,offset+tlv_off+5), gmpls_switching_type_rvals, "Unknown (%d)"), - val_to_str_ext(tvb_get_guint8(tvb,offset+tlv_off+6), + val_to_str_ext(tvb_get_uint8(tvb,offset+tlv_off+6), &gmpls_sonet_signal_type_str_ext, "Unknown (%d)")); break; @@ -6096,12 +6119,12 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_generalized_uni, tvb, offset+3, 1, ENC_BIG_ENDIAN); for (i=1, l = 0; l < mylen; i++) { sobj_len = tvb_get_ntohs(tvb, offset2+l); - j = tvb_get_guint8(tvb, offset2+l+2); + j = tvb_get_uint8(tvb, offset2+l+2); switch(j) { case 1: case 2: /* We do source and destination TNA together */ c = (j==1) ? "Source" : "Destination"; - k = tvb_get_guint8(tvb, offset2+l+3); + k = tvb_get_uint8(tvb, offset2+l+3); switch(k) { case 1: rsvp_gen_uni_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, @@ -6150,7 +6173,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object rsvp_gen_uni_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset2+l, tvb_get_ntohs(tvb, offset2+l), TREE(TT_GEN_UNI_SUBOBJ), NULL, "%s NSAP TNA: ", c); - nsap_len = tvb_get_guint8(tvb, offset2+l+4); + nsap_len = tvb_get_uint8(tvb, offset2+l+4); proto_tree_add_uint_format_value(rsvp_gen_uni_subtree, hf_rsvp_class, tvb, offset2+l+2, 1, j, "%d (%s)", j, c); proto_tree_add_uint_format_value(rsvp_gen_uni_subtree, hf_rsvp_type, tvb, offset2+l+3, 1, @@ -6183,7 +6206,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object break; case 3: /* Diversity subobject */ - k = tvb_get_guint8(tvb, offset2+l+3); + k = tvb_get_uint8(tvb, offset2+l+3); switch(k) { default: case 1: @@ -6196,8 +6219,8 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_tree_add_uint(rsvp_gen_uni_subtree, hf_rsvp_class_length, tvb, offset2+l, 2, sobj_len); proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_class_diversity, tvb, offset2+l+4, 1, ENC_NA); s_len = tvb_get_ntohs(tvb, offset2+l+8); - s_class = tvb_get_guint8(tvb, offset2+l+10); - s_type = tvb_get_guint8(tvb, offset2+l+11); + s_class = tvb_get_uint8(tvb, offset2+l+10); + s_type = tvb_get_uint8(tvb, offset2+l+11); rsvp_session_subtree = proto_tree_add_subtree(rsvp_gen_uni_subtree, tvb, offset2+l+8, s_len, TREE(rsvp_class_to_tree_type(s_class)), &ti2, "Session"); len_item = proto_tree_add_uint(rsvp_session_subtree, hf_rsvp_length, tvb, offset2+l+8, 2, s_len); @@ -6212,8 +6235,8 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object s_len, s_class, s_type, rsvph); offset3 = offset2 + s_len; s_len = tvb_get_ntohs(tvb, offset3+l+8); - s_class = tvb_get_guint8(tvb, offset3+l+10); - s_type = tvb_get_guint8(tvb, offset3+l+11); + s_class = tvb_get_uint8(tvb, offset3+l+10); + s_type = tvb_get_uint8(tvb, offset3+l+11); rsvp_template_subtree = proto_tree_add_subtree(rsvp_gen_uni_subtree, tvb, offset3+l+8, s_len, TREE(rsvp_class_to_tree_type(s_class)), &ti2, "Template"); @@ -6237,7 +6260,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object break; case 4: /* Egress Label */ - k = tvb_get_guint8(tvb, offset2+l+3); + k = tvb_get_uint8(tvb, offset2+l+3); if (k == 1) /* Egress label sub-type */ rsvp_gen_uni_subtree = proto_tree_add_subtree(rsvp_object_tree, tvb, offset2+l, sobj_len, TREE(TT_GEN_UNI_SUBOBJ), &ti2, @@ -6259,9 +6282,9 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_egress_label_type, tvb, offset2+l+7, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_gen_uni_logical_port_id, tvb, offset2+l+8, 4, ENC_BIG_ENDIAN); proto_item_append_text(ti2, ": %s, Label type %d, Port ID %d, Label ", - tvb_get_guint8(tvb, offset2+l+4) & 0x80 ? + tvb_get_uint8(tvb, offset2+l+4) & 0x80 ? "Upstream" : "Downstream", - tvb_get_guint8(tvb, offset2+l+7), + tvb_get_uint8(tvb, offset2+l+7), tvb_get_ntohl(tvb, offset2+l+8)); for (j=12; j < sobj_len; j+=4) { proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_egress_label, tvb, offset2+l+j, 4, ENC_BIG_ENDIAN); @@ -6276,7 +6299,7 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object break; case 5: /* Service Level */ - k = tvb_get_guint8(tvb, offset2+l+3); + k = tvb_get_uint8(tvb, offset2+l+3); switch(k) { default: case 1: @@ -6288,9 +6311,9 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_tree_add_uint(rsvp_gen_uni_subtree, hf_rsvp_type, tvb, offset2+l+3, 1, k); proto_tree_add_uint(rsvp_gen_uni_subtree, hf_rsvp_class_length, tvb, offset2+l, 2, sobj_len); proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_gen_uni_service_level, tvb, offset2+l+4, 1, ENC_BIG_ENDIAN); - proto_item_append_text(ti2, ": %u", tvb_get_guint8(tvb, offset2+l+4)); + proto_item_append_text(ti2, ": %u", tvb_get_uint8(tvb, offset2+l+4)); if (i < 4) { - proto_item_append_text(ti, "Service Level %d", tvb_get_guint8(tvb, offset2+l+4)); + proto_item_append_text(ti, "Service Level %d", tvb_get_uint8(tvb, offset2+l+4)); } break; } @@ -6307,12 +6330,12 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object break; } - if (tvb_get_guint8(tvb, offset2+l+1) < 1) { + if (tvb_get_uint8(tvb, offset2+l+1) < 1) { proto_tree_add_expert_format(rsvp_gen_uni_subtree, pinfo, &ei_rsvp_invalid_length, tvb, offset2+l+1, 1, - "Invalid length: %u", tvb_get_guint8(tvb, offset2+l+1)); + "Invalid length: %u", tvb_get_uint8(tvb, offset2+l+1)); return; } - l += tvb_get_guint8(tvb, offset2+l+1); + l += tvb_get_uint8(tvb, offset2+l+1); if (l < mylen) { if (i < 4) proto_item_append_text(ti, ", "); @@ -6349,7 +6372,7 @@ dissect_rsvp_call_id(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object int rsvp_class _U_, int c_type) { int type = 0; - const guint8 *str; + const uint8_t *str; int offset2 = offset + 4; int offset3, offset4, len; proto_tree *ti2 = NULL, *hidden_item; @@ -6368,7 +6391,7 @@ dissect_rsvp_call_id(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object break; case 1: case 2: - type = tvb_get_guint8 (tvb, offset2); + type = tvb_get_uint8 (tvb, offset2); if (c_type == 1) { offset3 = offset2 + 4; len = obj_length - 16; @@ -6531,7 +6554,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob int offset, int obj_length, int rsvp_class _U_, int c_type) { - guint16 length, ie_type; + uint16_t length, ie_type; proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -6557,7 +6580,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob offset+=2; if ((ie_type == 0)||(ie_type==2)){ - guint8 tft_opcode, tft_n_pkt_flt; + uint8_t tft_opcode, tft_n_pkt_flt; int i; if(ie_type == 0){ @@ -6578,10 +6601,10 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob /* P */ proto_tree_add_item(rsvp_object_tree, hf_rsvp_3gpp_obj_tft_p, tvb, offset, 4, ENC_BIG_ENDIAN); /* TFT Operation Code */ - tft_opcode = tvb_get_guint8(tvb, offset+2); + tft_opcode = tvb_get_uint8(tvb, offset+2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_3gpp_obj_tft_opcode, tvb, offset, 4, ENC_BIG_ENDIAN); /* Number of Packet filters */ - tft_n_pkt_flt = tvb_get_guint8(tvb, offset+3); + tft_n_pkt_flt = tvb_get_uint8(tvb, offset+3); proto_tree_add_item(rsvp_object_tree, hf_rsvp_3gpp_obj_tft_n_pkt_flt, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; /* Packet filter list @@ -6603,8 +6626,8 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob /* Packet Filter List */ for (i = 0; i < tft_n_pkt_flt; i++) { proto_tree *flow_tree, *t2_tree; - guint16 pkt_flt_len, item_len, pf_cont_len; - guint8 pf_comp_type_id; + uint16_t pkt_flt_len, item_len, pf_cont_len; + uint8_t pf_comp_type_id; flow_tree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset, -1, ett_treelist[TT_3GPP_OBJ_FLOW], &ti, "Flow Identifier Num %u",i+1); proto_tree_add_item(flow_tree, hf_rsvp_3gpp_obj_flow_id, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -6628,11 +6651,11 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob proto_tree_add_item(flow_tree, hf_rsvp_3gpp_obj_pf_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Length */ - pf_cont_len = tvb_get_guint8(tvb, offset); + pf_cont_len = tvb_get_uint8(tvb, offset); proto_tree_add_item(flow_tree, hf_rsvp_3gpp_obj_pf_cont_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Packet filter component type identifier */ - pf_comp_type_id = tvb_get_guint8(tvb, offset); + pf_comp_type_id = tvb_get_uint8(tvb, offset); proto_tree_add_item(flow_tree, hf_rsvp_3gpp_obj_pf_comp_type_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* Packet filter component */ @@ -6759,9 +6782,9 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob */ if((tft_opcode == 0x01)||(tft_opcode == 0x06)||(tft_opcode == 0x80)||(tft_opcode == 0x81)||(tft_opcode == 0x83)){ /* QoS List Length */ - gint32 tft_qos_list_len; - guint8 blob_len, item_len, padding_len; - gboolean verbose; + int32_t tft_qos_list_len; + uint8_t blob_len, item_len, padding_len; + bool verbose; proto_tree *qos_tree, *qos_sub_blob_tree, *qos_att_tree; int num = 0, j, num_qos_att_set; @@ -6772,7 +6795,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob if(tft_qos_list_len > 0){ while (tft_qos_list_len>0) { int bit_offset; /* offset in bits */ - guint8 qos_attribute_set_len; + uint8_t qos_attribute_set_len; num++; @@ -6785,7 +6808,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob tft_qos_list_len--; /* R_QOS_SUB_BLOB_LEN 1 */ - blob_len = tvb_get_guint8(tvb, offset); + blob_len = tvb_get_uint8(tvb, offset); proto_tree_add_item(qos_tree, hf_rsvp_3gpp_r_qos_blob_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; tft_qos_list_len--; @@ -6796,7 +6819,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob proto_tree_add_item(qos_sub_blob_tree, hf_rsvp_3gpp_r_qos_blob_flow_pri, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(qos_sub_blob_tree, hf_rsvp_3gpp_r_qos_blob_num_qos_att_set, tvb, offset, 1, ENC_BIG_ENDIAN); - num_qos_att_set = (tvb_get_guint8(tvb, offset) & 0x0e)>>1; + num_qos_att_set = (tvb_get_uint8(tvb, offset) & 0x0e)>>1; /* point to the first bit in the QoS_ATTRIBUTE_SET */ bit_offset = (offset<<3)+7; for (j = 0; j < num_qos_att_set; j++) { @@ -6818,7 +6841,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_ob bit_offset++; - if(verbose == FALSE){ + if(verbose == false){ proto_tree_add_bits_item(qos_att_tree, hf_rsvp_3gpp_qos_attribute_prof_id, tvb, bit_offset, 16, ENC_BIG_ENDIAN); bit_offset+=16; }else{ @@ -6888,7 +6911,7 @@ dissect_rsvp_restart_cap(proto_tree *ti, proto_tree *rsvp_object_tree, int rsvp_class _U_, int type) { int offset2 = offset + 4; - guint restart, recovery; + unsigned restart, recovery; proto_tree *hidden_item; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); @@ -6938,7 +6961,55 @@ dissect_rsvp_link_cap(proto_item *ti, packet_info* pinfo, proto_tree *rsvp_objec default: proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_link_cap, tvb, offset+3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(rsvp_object_tree, hf_rsvp_record_route_data, tvb, offset+4, obj_length - 4, ENC_NA); + proto_tree_add_item(rsvp_object_tree, hf_rsvp_link_cap_data, tvb, offset+4, obj_length - 4, ENC_NA); + break; + } + +} + +/*------------------------------------------------------------------------------ + * Capability Object + *------------------------------------------------------------------------------*/ +static void +dissect_rsvp_capability(proto_item *ti, packet_info* pinfo _U_, proto_tree *rsvp_object_tree, + tvbuff_t *tvb, + int offset, int obj_length, + int rsvp_class _U_, int type) +{ + proto_tree *hidden_item; + + hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_item_set_hidden(hidden_item); + + proto_item_set_text(ti, "Capability: "); + + static int * const flags[] = { + &hf_rsvp_capability_flags_reserved, + &hf_rsvp_capability_flags_f, + &hf_rsvp_capability_flags_i, + &hf_rsvp_capability_flags_t, + &hf_rsvp_capability_flags_r, + &hf_rsvp_capability_flags_s, + NULL + }; + uint64_t cap_flags; + + switch(type) { + case 1: + proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_capability, tvb, offset+3, 1, ENC_BIG_ENDIAN); + + proto_tree_add_bitmask_ret_uint64(rsvp_object_tree, tvb, offset+4, hf_rsvp_capability_flags, TREE(TT_CAPABILITY_FLAGS), flags, ENC_BIG_ENDIAN, &cap_flags); + proto_item_append_text(ti, "%s%s%s%s%s", + cap_flags&0x10 ? "F":UTF8_MIDDLE_DOT, + cap_flags&0x08 ? "I":UTF8_MIDDLE_DOT, + cap_flags&0x04 ? "T":UTF8_MIDDLE_DOT, + cap_flags&0x02 ? "R":UTF8_MIDDLE_DOT, + cap_flags&0x01 ? "S":UTF8_MIDDLE_DOT); + break; + + default: + proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_capability, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rsvp_object_tree, hf_rsvp_capability_data, tvb, offset+4, obj_length - 4, ENC_NA); break; } @@ -6952,7 +7023,7 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, int offset, int obj_length, int rsvp_class _U_, int type) { - guint8 flags1, lsp_flags, link_flags, seg_flags; + uint8_t flags1, lsp_flags, link_flags, seg_flags; proto_tree *ti2, *rsvp_pi_link_flags_tree, *rsvp_pi_lsp_flags_tree, *rsvp_pi_seg_flags_tree; int offset2 = offset + 4; proto_tree *hidden_item; @@ -6964,11 +7035,11 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, switch(type) { case 1: proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_protection_info, tvb, offset+3, 1, ENC_BIG_ENDIAN); - flags1 = tvb_get_guint8(tvb, offset2); + flags1 = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_protection_info_flags_secondary_lsp, tvb, offset2, 1, ENC_BIG_ENDIAN); - link_flags = tvb_get_guint8(tvb, offset2+3); + link_flags = tvb_get_uint8(tvb, offset2+3); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_protection_info_link_flags, tvb, offset2+3, 1, ENC_BIG_ENDIAN); rsvp_pi_link_flags_tree = proto_item_add_subtree(ti2, TREE(TT_PROTECTION_INFO_LINK)); proto_tree_add_item(rsvp_pi_link_flags_tree, hf_rsvp_pi_link_flags_extra_traffic, @@ -6995,7 +7066,7 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, case 2: /* RFC4872 */ proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_protection_info, tvb, offset+3, 1, ENC_BIG_ENDIAN); - flags1 = tvb_get_guint8(tvb, offset2); + flags1 = tvb_get_uint8(tvb, offset2); proto_tree_add_item(rsvp_object_tree, hf_rsvp_rfc4872_secondary, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_rfc4872_protecting, @@ -7005,7 +7076,7 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_object_tree, hf_rsvp_rfc4872_operational, tvb, offset2, 1, ENC_BIG_ENDIAN); - lsp_flags = tvb_get_guint8(tvb, offset2+1); + lsp_flags = tvb_get_uint8(tvb, offset2+1); rsvp_pi_lsp_flags_tree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset2+1, 1, TREE(TT_PROTECTION_INFO_LSP), NULL, "LSP Flags: 0x%02x -%s%s%s%s%s%s", lsp_flags, lsp_flags == 0 ? " Unprotected":"", @@ -7025,7 +7096,7 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_pi_lsp_flags_tree, hf_rsvp_pi_lsp_flags_1plus1_bidirectional, tvb, offset2+1, 1, ENC_BIG_ENDIAN); - link_flags = tvb_get_guint8(tvb, offset2+3); + link_flags = tvb_get_uint8(tvb, offset2+3); rsvp_pi_link_flags_tree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset2+3, 1, TREE(TT_PROTECTION_INFO_LINK), NULL, "Link Flags: 0x%02x -%s%s%s%s%s%s", link_flags, link_flags&0x01 ? " ExtraTraffic":"", @@ -7052,7 +7123,7 @@ dissect_rsvp_protection_info(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_object_tree, hf_rsvp_protection_info_required, tvb, offset2+4, 1, ENC_BIG_ENDIAN); - seg_flags = tvb_get_guint8(tvb, offset2+5); + seg_flags = tvb_get_uint8(tvb, offset2+5); rsvp_pi_seg_flags_tree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset2+5, 1, TREE(TT_PROTECTION_INFO_SEG), NULL, "Segment recovery Flags: 0x%02x - %s%s%s%s%s%s", seg_flags, seg_flags == 0 ? " Unprotected":"", @@ -7107,7 +7178,7 @@ dissect_rsvp_fast_reroute(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_o int offset, int obj_length, int rsvp_class _U_, int type) { - guint8 flags; + uint8_t flags; proto_tree *ti2, *rsvp_frr_flags_tree; proto_tree *hidden_item; @@ -7129,7 +7200,7 @@ dissect_rsvp_fast_reroute(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_o proto_tree_add_item(rsvp_object_tree, hf_rsvp_fast_reroute_hold_priority, tvb, offset+5, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_fast_reroute_hop_limit, tvb, offset+6, 1, ENC_BIG_ENDIAN); - flags = tvb_get_guint8(tvb, offset+7); + flags = tvb_get_uint8(tvb, offset+7); ti2 = proto_tree_add_item(rsvp_object_tree, hf_rsvp_fast_reroute_flags, tvb, offset+7, 1, ENC_BIG_ENDIAN); rsvp_frr_flags_tree = proto_item_add_subtree(ti2, TREE(TT_FAST_REROUTE_FLAGS)); proto_tree_add_item(rsvp_frr_flags_tree, hf_rsvp_frr_flags_one2one_backup, @@ -7262,7 +7333,7 @@ dissect_rsvp_diffserv(proto_tree *ti, proto_tree *rsvp_object_tree, &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT14], &hf_rsvp_filter[RSVPF_DIFFSERV_PHBID_BIT15] }; - gint *etts[] = { + int *etts[] = { &TREE(TT_DIFFSERV_MAP), &TREE(TT_DIFFSERV_MAP_PHBID) }; @@ -7278,7 +7349,7 @@ dissect_rsvp_diffserv(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_diffserv, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(rsvp_object_tree, hf_rsvp_filter[RSVPF_DIFFSERV_MAPNB], tvb, offset + 4, 1, - mapnb = tvb_get_guint8(tvb, offset + 4) & 15); + mapnb = tvb_get_uint8(tvb, offset + 4) & 15); proto_item_append_text(ti, "E-LSP, %u MAP%s", mapnb, (mapnb == 0) ? "" : "s"); offset += 5; @@ -7313,7 +7384,7 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree, { proto_item *hidden_item; int offset2 = offset + 4; - guint8 ct = 0; + uint8_t ct = 0; hidden_item = proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_DSTE], @@ -7325,7 +7396,7 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree, switch(type) { case 1: - ct = tvb_get_guint8(tvb, offset2+3); + ct = tvb_get_uint8(tvb, offset2+3); proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_diffserv_aware_te, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_DSTE_CLASSTYPE], @@ -7446,8 +7517,8 @@ dissect_rsvp_call_attributes(proto_tree *ti _U_, packet_info* pinfo, proto_tree { int offset2 = offset + 4; - guint16 tlv_type; - guint16 tlv_len; + uint16_t tlv_type; + uint16_t tlv_len; tlv_type = tvb_get_ntohs(tvb, offset2); tlv_len = tvb_get_ntohs(tvb, offset2+2); @@ -7500,7 +7571,7 @@ dissect_rsvp_juniper(proto_tree *ti _U_, proto_tree_add_item(rsvp_object_tree, hf_rsvp_ctype_juniper, tvb, offset + 3, 1, ENC_BIG_ENDIAN); offset += 4; if (type == 1) { - guint tlvs, pad; + unsigned tlvs, pad; tlvs = tvb_get_ntohs(tvb, offset); proto_tree_add_item(rsvp_object_tree, hf_rsvp_juniper_numtlvs, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -7510,12 +7581,12 @@ dissect_rsvp_juniper(proto_tree *ti _U_, offset, 2, ENC_BIG_ENDIAN); offset += 2; while (tlvs > 0) { - guint8 t, l; - t = tvb_get_guint8(tvb, offset); + uint8_t t, l; + t = tvb_get_uint8(tvb, offset); proto_tree_add_item(rsvp_object_tree, hf_rsvp_juniper_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - l = tvb_get_guint8(tvb, offset); + l = tvb_get_uint8(tvb, offset); proto_tree_add_item(rsvp_object_tree, hf_rsvp_juniper_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -7590,26 +7661,26 @@ dissect_rsvp_unknown(proto_tree *ti _U_, static void // NOLINTNEXTLINE(misc-no-recursion) dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - int tree_mode, rsvp_conversation_info *rsvph, gboolean e2ei) + int tree_mode, rsvp_conversation_info *rsvph, bool e2ei) { proto_tree *rsvp_tree; proto_tree *rsvp_header_tree; proto_tree *rsvp_object_tree; proto_tree *ti, *len_item; proto_item *hidden_item, *cksum_item; - guint16 cksum, computed_cksum; + uint16_t cksum, computed_cksum; vec_t cksum_vec[1]; int offset = 0; int len; - guint8 message_type; + uint8_t message_type; int session_off, tempfilt_off; int msg_length; int obj_length; - gboolean have_integrity_object = FALSE; + bool have_integrity_object = false; offset = 0; msg_length = tvb_get_ntohs(tvb, 6); - message_type = tvb_get_guint8(tvb, 1); + message_type = tvb_get_uint8(tvb, 1); ti = proto_tree_add_item(tree, proto_rsvp, tvb, offset, msg_length, ENC_NA); @@ -7671,7 +7742,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (rsvp_bundle_dissect) { int len2 = 8; while (len2 < msg_length) { - gint sub_len; + int sub_len; tvbuff_t *tvb_sub; sub_len = tvb_get_ntohs(tvb, len2+6); tvb_sub = tvb_new_subset_length(tvb, len2, sub_len); @@ -7687,12 +7758,12 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } while (len < msg_length) { - guint8 rsvp_class; - guint8 type; + uint8_t rsvp_class; + uint8_t type; obj_length = tvb_get_ntohs(tvb, offset); - rsvp_class = tvb_get_guint8(tvb, offset+2); - type = tvb_get_guint8(tvb, offset+3); + rsvp_class = tvb_get_uint8(tvb, offset+2); + type = tvb_get_uint8(tvb, offset+3); ti = proto_tree_add_item(rsvp_tree, hf_rsvp_filter[rsvp_class_to_filter_num(rsvp_class)], tvb, offset, obj_length, ENC_BIG_ENDIAN); rsvp_object_tree = proto_item_add_subtree(ti, TREE(rsvp_class_to_tree_type(rsvp_class))); @@ -7753,7 +7824,7 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case RSVP_CLASS_INTEGRITY: - have_integrity_object = TRUE; + have_integrity_object = true; dissect_rsvp_integrity(ti, rsvp_object_tree, tvb, offset, obj_length, rsvp_class, type); break; @@ -7854,6 +7925,10 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_rsvp_link_cap(ti, pinfo, rsvp_object_tree, tvb, offset, obj_length, rsvp_class, type); break; + case RSVP_CLASS_CAPABILITY: + dissect_rsvp_capability(ti, pinfo, rsvp_object_tree, tvb, offset, obj_length, rsvp_class, type); + break; + case RSVP_CLASS_PROTECTION: dissect_rsvp_protection_info(ti, rsvp_object_tree, tvb, offset, obj_length, rsvp_class, type); break; @@ -7966,9 +8041,9 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * The main loop *------------------------------------------------------------------------------*/ static void -dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean e2ei) +dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bool e2ei) { - guint8 message_type; + uint8_t message_type; int session_off, tempfilt_off; rsvp_conversation_info *rsvph; @@ -7978,11 +8053,11 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea col_clear(pinfo->cinfo, COL_INFO); - message_type = tvb_get_guint8(tvb, 1); + message_type = tvb_get_uint8(tvb, 1); rsvph = wmem_new0(pinfo->pool, rsvp_conversation_info); - /* Copy over the source and destination addresses from the pinfo strucutre */ + /* Copy over the source and destination addresses from the pinfo structure */ set_address(&rsvph->source, pinfo->src.type, pinfo->src.len, pinfo->src.data); set_address(&rsvph->destination, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); @@ -8144,7 +8219,7 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ { col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSVP"); - dissect_rsvp_common(tvb, pinfo, tree, FALSE); + dissect_rsvp_common(tvb, pinfo, tree, false); return tvb_captured_length(tvb); } @@ -8153,7 +8228,7 @@ dissect_rsvp_e2ei(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat { col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSVP-E2EI"); - dissect_rsvp_common(tvb, pinfo, tree, TRUE); + dissect_rsvp_common(tvb, pinfo, tree, true); return tvb_captured_length(tvb); } @@ -8172,15 +8247,15 @@ register_rsvp_prefs(void) rsvp_module, "generalized_label_options", "Dissect generalized labels as", "Specifies how Wireshark should dissect generalized labels", - (gint *)&rsvp_generalized_label_option, + (int *)&rsvp_generalized_label_option, rsvp_generalized_label_options, - FALSE); + false); } void proto_register_rsvp(void) { - gint i; + int i; static hf_register_info rsvpf_info[] = { @@ -8301,6 +8376,12 @@ proto_register_rsvp(void) NULL, HFILL } }, + {&hf_rsvp_ctype_capability, + { "C-type", "rsvp.ctype.capability", + FT_UINT32, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + {&hf_rsvp_ctype_protection_info, { "C-type", "rsvp.ctype.protection_info", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -8381,7 +8462,7 @@ proto_register_rsvp(void) {&hf_rsvp_parameter_length, { "Parameter length", "rsvp.parameter_length", - FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_word_not_including_header, 0x0, + FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&units_word_not_including_header), 0x0, NULL, HFILL } }, @@ -8578,6 +8659,12 @@ proto_register_rsvp(void) NULL, HFILL } }, + {&hf_rsvp_filter[RSVPF_CAPABILITY], + { "Capability", "rsvp.capability", + FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + {&hf_rsvp_filter[RSVPF_LABEL_REQUEST], { "LABEL REQUEST", "rsvp.label_request", FT_NONE, BASE_NONE, NULL, 0x0, @@ -9756,7 +9843,7 @@ proto_register_rsvp(void) }, { &hf_rsvp_3gpp_qos_attribute_verbose, { "VERBOSE", "rsvp.3gpp_obj.r_qos_blob.verbose", - FT_BOOLEAN, 8, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_rsvp_3gpp_qos_attribute_prof_id, @@ -9983,7 +10070,7 @@ proto_register_rsvp(void) { &hf_rsvp_data_length, { "Data length", "rsvp.data_length", - FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_word_not_including_header, 0, + FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&units_word_not_including_header), 0, NULL, HFILL } }, @@ -10236,6 +10323,15 @@ proto_register_rsvp(void) { &hf_rsvp_call_id_national_segment, { "National Segment", "rsvp.call_id.national_segment", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_call_id_local_identifier, { "Local Identifier", "rsvp.call_id.local_identifier", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_restart_cap_data, { "Data", "rsvp.restart_cap.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_rsvp_link_cap_data, { "Data", "rsvp.link_cap.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_rsvp_capability_flags, { "Flags", "rsvp.capability.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_rsvp_capability_flags_reserved, { "Reserved", "rsvp.capability.flags.reserved", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFE0, NULL, HFILL }}, + { &hf_rsvp_capability_flags_f, { "Per-Peer Flow-Control (F)", "rsvp.capability.flags.f", FT_BOOLEAN, 32, TFS(&tfs_capable_not_capable), 0x00000010, NULL, HFILL }}, + { &hf_rsvp_capability_flags_i, { "RI-RSVP (I)", "rsvp.capability.flags.i", FT_BOOLEAN, 32, TFS(&tfs_capable_not_capable), 0x00000008, NULL, HFILL }}, + { &hf_rsvp_capability_flags_t, { "RecoveryPath Transmit (T)", "rsvp.capability.flags.t", FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000004, NULL, HFILL }}, + { &hf_rsvp_capability_flags_r, { "RecoveryPath (R)", "rsvp.capability.flags.r", FT_BOOLEAN, 32, TFS(&tfs_desired_not_desired), 0x00000002, NULL, HFILL }}, + { &hf_rsvp_capability_flags_s, { "RecoveryPath Srefresh (S)", "rsvp.capability.flags.s", FT_BOOLEAN, 32, TFS(&tfs_capable_not_capable), 0x00000001, NULL, HFILL }}, + { &hf_rsvp_capability_data, { "Data", "rsvp.capability.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_protection_info_link_flags, { "Link Flags", "rsvp.protection_info.link_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_protection_info_data, { "Data", "rsvp.protection_info.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_fast_reroute_setup_priority, { "Setup Priority", "rsvp.fast_reroute.setup_priority", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -10271,8 +10367,8 @@ proto_register_rsvp(void) { &hf_rsvp_gen_uni_data, { "Data", "rsvp.gen_uni.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_gen_uni_logical_port_id, { "Logical Port ID", "rsvp.gen_uni.logical_port_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_gen_uni_service_level, { "Service Level", "rsvp.gen_uni.service_level", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_rsvp_restart_cap_restart_time, { "Restart Time", "rsvp.restart_cap.restart_time", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_milliseconds, 0x0, NULL, HFILL }}, - { &hf_rsvp_restart_cap_recovery_time, { "Recovery Time", "rsvp.restart_cap.recovery_time", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_milliseconds, 0x0, NULL, HFILL }}, + { &hf_rsvp_restart_cap_restart_time, { "Restart Time", "rsvp.restart_cap.restart_time", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&units_milliseconds), 0x0, NULL, HFILL }}, + { &hf_rsvp_restart_cap_recovery_time, { "Recovery Time", "rsvp.restart_cap.recovery_time", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&units_milliseconds), 0x0, NULL, HFILL }}, { &hf_rsvp_detour_plr_id, { "PLR ID", "rsvp.detour.plr_id", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_detour_avoid_node_id, { "Avoid Node ID", "rsvp.detour.avoid_node_id", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_message_checksum, { "Message Checksum", "rsvp.message_checksum", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, @@ -10291,7 +10387,7 @@ proto_register_rsvp(void) { &hf_rsvp_wavelength_channel_spacing, { "Channel Spacing", "rsvp.wavelength.channel_spacing", FT_UINT8, BASE_DEC, NULL, 0x1E, NULL, HFILL }}, { &hf_rsvp_wavelength_n, { "Central Frequency", "rsvp.wavelength.n", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_wavelength_m, { "Channel Width (m)", "rsvp.wavelength.m", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_rsvp_wavelength_wavelength, { "Wavelength", "rsvp.wavelength.wavelength", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_nanometers, 0x0, NULL, HFILL }}, + { &hf_rsvp_wavelength_wavelength, { "Wavelength", "rsvp.wavelength.wavelength", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&units_nanometers), 0x0, NULL, HFILL }}, { &hf_rsvp_sonet_s, { "S", "rsvp.sonet.s", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_rsvp_sonet_u, { "U", "rsvp.sonet.u", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }}, { &hf_rsvp_sonet_k, { "K", "rsvp.sonet.k", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }}, @@ -10325,11 +10421,10 @@ proto_register_rsvp(void) expert_module_t* expert_rsvp; - gint *ett_tree[TT_MAX]; + int *ett_tree[TT_MAX]; /* Build the tree array */ for (i=0; i<TT_MAX; i++) { - ett_treelist[i] = -1; ett_tree[i] = &(ett_treelist[i]); } proto_rsvp = proto_register_protocol("Resource ReserVation Protocol (RSVP)", "RSVP", "rsvp"); @@ -10347,7 +10442,9 @@ proto_register_rsvp(void) rsvp_request_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), rsvp_hash, rsvp_equal); - register_conversation_table(proto_rsvp, TRUE, rsvp_conversation_packet, rsvp_endpoint_packet); + register_conversation_table(proto_rsvp, true, rsvp_conversation_packet, rsvp_endpoint_packet); + + rsvp_tap = register_tap("rsvp"); } void @@ -10356,7 +10453,6 @@ proto_reg_handoff_rsvp(void) dissector_add_uint("ip.proto", IP_PROTO_RSVP, rsvp_handle); dissector_add_uint("ip.proto", IP_PROTO_RSVPE2EI, rsvpe2ei_handle); dissector_add_uint_with_preference("udp.port", UDP_PORT_PRSVP, rsvp_handle); - rsvp_tap = register_tap("rsvp"); } /* |