diff options
Diffstat (limited to 'epan/dissectors/packet-ceph.c')
| -rw-r--r-- | epan/dissectors/packet-ceph.c | 1649 |
1 files changed, 819 insertions, 830 deletions
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 6aa0b73626..b40c27608e 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -64,768 +64,768 @@ void proto_register_ceph(void); static dissector_handle_t ceph_handle; /* Initialize the protocol and registered fields */ -static int proto_ceph = -1; -static int hf_filter_data = -1; -static int hf_node_id = -1; -static int hf_node_type = -1; -static int hf_node_nonce = -1; -static int hf_entityinst_name = -1; -static int hf_entityinst_addr = -1; -static int hf_EntityName = -1; -static int hf_EntityName_type = -1; -static int hf_EntityName_id = -1; -static int hf_src_slug = -1; -static int hf_src_type = -1; -static int hf_dst_type = -1; -static int hf_dst_slug = -1; -static int hf_banner = -1; -static int hf_client_info = -1; -static int hf_server_info = -1; -static int hf_sockaddr = -1; -static int hf_inet_family = -1; -static int hf_port = -1; -static int hf_addr_ipv4 = -1; -static int hf_addr_ipv6 = -1; -static int hf_data_data = -1; -static int hf_data_size = -1; -static int hf_string_data = -1; -static int hf_string_size = -1; -static int hf_keepalive_time = -1; -static int hf_encoded_ver = -1; -static int hf_encoded_compat = -1; -static int hf_encoded_size = -1; -static int hf_version = -1; -static int hf_epoch = -1; -static int hf_pool = -1; -static int hf_key = -1; -static int hf_namespace = -1; -static int hf_hash = -1; -static int hf_pgid_ver = -1; -static int hf_pgid_pool = -1; -static int hf_pgid_seed = -1; -static int hf_pgid_preferred = -1; -static int hf_pg_create_epoch = -1; -static int hf_pg_create_parent = -1; -static int hf_pg_create_splitbits = -1; -static int hf_path_ver = -1; -static int hf_path_inode = -1; -static int hf_path_rel = -1; -static int hf_mds_release_inode = -1; -static int hf_mds_release_capid = -1; -static int hf_mds_release_new = -1; -static int hf_mds_release_wanted = -1; -static int hf_mds_release_seq = -1; -static int hf_mds_release_seq_issue = -1; -static int hf_mds_release_mseq = -1; -static int hf_mds_release_dname_seq = -1; -static int hf_mds_release_dname = -1; -static int hf_hitset_params = -1; -static int hf_hitset_params_type = -1; -static int hf_hitset_params_exphash_count = -1; -static int hf_hitset_params_exphash_hit = -1; -static int hf_snapinfo = -1; -static int hf_snapinfo_id = -1; -static int hf_snapinfo_time = -1; -static int hf_snapinfo_name = -1; -static int hf_pgpool = -1; -static int hf_pgpool_type = -1; -static int hf_pgpool_size = -1; -static int hf_pgpool_crush_ruleset = -1; -static int hf_pgpool_hash = -1; -static int hf_pgpool_pgnum = -1; -static int hf_pgpool_pgpnum = -1; -static int hf_pgpool_changed = -1; -static int hf_pgpool_snapseq = -1; -static int hf_pgpool_snapepoch = -1; -static int hf_pgpool_snap = -1; -static int hf_pgpool_snap_id = -1; -static int hf_pgpool_snapdel = -1; -static int hf_pgpool_snapdel_from = -1; -static int hf_pgpool_snapdel_to = -1; -static int hf_pgpool_uid = -1; -static int hf_pgpool_flags_low = -1; -static int hf_pgpool_flags_high = -1; -static int hf_pgpool_crash_reply_interval = -1; -static int hf_pgpool_min_size = -1; -static int hf_pgpool_quota_bytes = -1; -static int hf_pgpool_quota_objects = -1; -static int hf_pgpool_tier = -1; -static int hf_pgpool_tierof = -1; -static int hf_pgpool_cachemode = -1; -static int hf_pgpool_readtier = -1; -static int hf_pgpool_writetier = -1; -static int hf_pgpool_property = -1; -static int hf_pgpool_property_key = -1; -static int hf_pgpool_property_val = -1; -static int hf_pgpool_hitset_period = -1; -static int hf_pgpool_hitset_count = -1; -static int hf_pgpool_stripewidth = -1; -static int hf_pgpool_targetmaxsize = -1; -static int hf_pgpool_targetmaxobj = -1; -static int hf_pgpool_cache_targetdirtyratio = -1; -static int hf_pgpool_cache_targetfullratio = -1; -static int hf_pgpool_cache_flushage_min = -1; -static int hf_pgpool_cache_evictage_min = -1; -static int hf_pgpool_erasurecode_profile = -1; -static int hf_pgpool_lastforceresend = -1; -static int hf_pgpool_flag_hashpool = -1; -static int hf_pgpool_flag_full = -1; -static int hf_pgpool_flag_fake_ec_pool = -1; -static int hf_monmap = -1; -static int hf_monmap_fsid = -1; -static int hf_monmap_epoch = -1; -static int hf_monmap_address = -1; -static int hf_monmap_address_name = -1; -static int hf_monmap_address_addr = -1; -static int hf_monmap_changed = -1; -static int hf_monmap_created = -1; -static int hf_pg_stat_ver = -1; -static int hf_pg_stat_seq = -1; -static int hf_pg_stat_epoch = -1; -static int hf_pg_stat_state = -1; -static int hf_pg_stat_logstart = -1; -static int hf_pg_stat_logstartondisk = -1; -static int hf_pg_stat_created = -1; -static int hf_pg_stat_lastepochclean = -1; -static int hf_pg_stat_parent = -1; -static int hf_pg_stat_parent_splitbits = -1; -static int hf_pg_stat_lastscrub = -1; -static int hf_pg_stat_lastscrubstamp = -1; -static int hf_pg_stat_stats = -1; -static int hf_pg_stat_logsize = -1; -static int hf_pg_stat_logsizeondisk = -1; -static int hf_pg_stat_up = -1; -static int hf_pg_stat_acting = -1; -static int hf_pg_stat_lastfresh = -1; -static int hf_pg_stat_lastchange = -1; -static int hf_pg_stat_lastactive = -1; -static int hf_pg_stat_lastclean = -1; -static int hf_pg_stat_lastunstale = -1; -static int hf_pg_stat_mappingepoch = -1; -static int hf_pg_stat_lastdeepscrub = -1; -static int hf_pg_stat_lastdeepscrubstamp = -1; -static int hf_pg_stat_statsinvalid = -1; -static int hf_pg_stat_lastcleanscrubstamp = -1; -static int hf_pg_stat_lastbecameactive = -1; -static int hf_pg_stat_dirtystatsinvalid = -1; -static int hf_pg_stat_upprimary = -1; -static int hf_pg_stat_actingprimary = -1; -static int hf_pg_stat_omapstatsinvalid = -1; -static int hf_pg_stat_hitsetstatsinvalid = -1; -static int hf_crush = -1; -static int hf_osd_peerstat = -1; -static int hf_osd_peerstat_timestamp = -1; -static int hf_featureset_mask = -1; -static int hf_featureset_name = -1; -static int hf_featureset_name_val = -1; -static int hf_featureset_name_name = -1; -static int hf_compatset = -1; -static int hf_compatset_compat = -1; -static int hf_compatset_compatro = -1; -static int hf_compatset_incompat = -1; -static int hf_osd_superblock = -1; -static int hf_osd_superblock_clusterfsid = -1; -static int hf_osd_superblock_role = -1; -static int hf_osd_superblock_epoch = -1; -static int hf_osd_superblock_map_old = -1; -static int hf_osd_superblock_map_new = -1; -static int hf_osd_superblock_weight = -1; -static int hf_osd_superblock_mounted = -1; -static int hf_osd_superblock_osdfsid = -1; -static int hf_osd_superblock_clean = -1; -static int hf_osd_superblock_full = -1; -static int hf_osdinfo_ver = -1; -static int hf_osdinfo_lastclean_begin = -1; -static int hf_osdinfo_lastclean_end = -1; -static int hf_osdinfo_up_from = -1; -static int hf_osdinfo_up_through = -1; -static int hf_osdinfo_downat = -1; -static int hf_osdinfo_lostat = -1; -static int hf_osdxinfo_down = -1; -static int hf_osdxinfo_laggy_probability = -1; -static int hf_osdxinfo_laggy_interval = -1; -static int hf_osdxinfo_oldweight = -1; -static int hf_perfstat_commitlatency = -1; -static int hf_perfstat_applylatency = -1; -static int hf_osdstat = -1; -static int hf_osdstat_kb = -1; -static int hf_osdstat_kbused = -1; -static int hf_osdstat_kbavail = -1; -static int hf_osdstat_trimqueue = -1; -static int hf_osdstat_trimming = -1; -static int hf_osdstat_hbin = -1; -static int hf_osdstat_hbout = -1; -static int hf_osdstat_opqueue = -1; -static int hf_osdstat_fsperf = -1; -static int hf_osdmap = -1; -static int hf_osdmap_client = -1; -static int hf_osdmap_fsid = -1; -static int hf_osdmap_epoch = -1; -static int hf_osdmap_created = -1; -static int hf_osdmap_modified = -1; -static int hf_osdmap_pool = -1; -static int hf_osdmap_pool_id = -1; -static int hf_osdmap_poolname_item = -1; -static int hf_osdmap_poolname = -1; -static int hf_osdmap_poolmax = -1; -static int hf_osdmap_flags = -1; -static int hf_osdmap_osdmax = -1; -static int hf_osdmap_osd_state = -1; -static int hf_osdmap_osd_weight = -1; -static int hf_osdmap_osd_addr = -1; -static int hf_osdmap_pgtmp = -1; -static int hf_osdmap_pgtmp_pg = -1; -static int hf_osdmap_pgtmp_val = -1; -static int hf_osdmap_primarytmp = -1; -static int hf_osdmap_primarytmp_pg = -1; -static int hf_osdmap_primarytmp_val = -1; -static int hf_osdmap_osd_primaryaffinity = -1; -static int hf_osdmap_erasurecodeprofile = -1; -static int hf_osdmap_erasurecodeprofile_name = -1; -static int hf_osdmap_erasurecodeprofile_prop = -1; -static int hf_osdmap_erasurecodeprofile_k = -1; -static int hf_osdmap_erasurecodeprofile_v = -1; -static int hf_osdmap_osd = -1; -static int hf_osdmap_hbaddr_back = -1; -static int hf_osdmap_osd_info = -1; -static int hf_osdmap_blacklist = -1; -static int hf_osdmap_blacklist_addr = -1; -static int hf_osdmap_blacklist_time = -1; -static int hf_osdmap_cluster_addr = -1; -static int hf_osdmap_cluster_snapepoch = -1; -static int hf_osdmap_cluster_snap = -1; -static int hf_osdmap_osd_uuid = -1; -static int hf_osdmap_osd_xinfo = -1; -static int hf_osdmap_hbaddr_front = -1; -static int hf_osdmap_inc = -1; -static int hf_osdmap_inc_client = -1; -static int hf_osdmap_inc_fsid = -1; -static int hf_osdmap_inc_osd = -1; -static int hf_features_high = -1; -static int hf_features_low = -1; -static int hf_feature_uid = -1; -static int hf_feature_nosrcaddr = -1; -static int hf_feature_monclockcheck = -1; -static int hf_feature_flock = -1; -static int hf_feature_subscribe2 = -1; -static int hf_feature_monnames = -1; -static int hf_feature_reconnect_seq = -1; -static int hf_feature_dirlayouthash = -1; -static int hf_feature_objectlocator = -1; -static int hf_feature_pgid64 = -1; -static int hf_feature_incsubosdmap = -1; -static int hf_feature_pgpool3 = -1; -static int hf_feature_osdreplymux = -1; -static int hf_feature_osdenc = -1; -static int hf_feature_omap = -1; -static int hf_feature_monenc = -1; -static int hf_feature_query_t = -1; -static int hf_feature_indep_pg_map = -1; -static int hf_feature_crush_tunables = -1; -static int hf_feature_chunky_scrub = -1; -static int hf_feature_mon_nullroute = -1; -static int hf_feature_mon_gv = -1; -static int hf_feature_backfill_reservation = -1; -static int hf_feature_msg_auth = -1; -static int hf_feature_recovery_reservation = -1; -static int hf_feature_crush_tunables2 = -1; -static int hf_feature_createpoolid = -1; -static int hf_feature_reply_create_inode = -1; -static int hf_feature_osd_hbmsgs = -1; -static int hf_feature_mdsenc = -1; -static int hf_feature_osdhashpspool = -1; -static int hf_feature_mon_single_paxos = -1; -static int hf_feature_osd_snapmapper = -1; -static int hf_feature_mon_scrub = -1; -static int hf_feature_osd_packed_recovery = -1; -static int hf_feature_osd_cachepool = -1; -static int hf_feature_crush_v2 = -1; -static int hf_feature_export_peer = -1; -static int hf_feature_osd_erasure_codes = -1; -static int hf_feature_osd_tmap2omap = -1; -static int hf_feature_osdmap_enc = -1; -static int hf_feature_mds_inline_data = -1; -static int hf_feature_crush_tunables3 = -1; -static int hf_feature_osd_primary_affinity = -1; -static int hf_feature_msgr_keepalive2 = -1; -static int hf_feature_reserved = -1; -static int hf_connect_host_type = -1; -static int hf_connect_seq_global = -1; -static int hf_connect_seq = -1; -static int hf_connect_proto_ver = -1; -static int hf_connect_auth_proto = -1; -static int hf_connect_auth_size = -1; -static int hf_connect_auth = -1; -static int hf_flags = -1; -static int hf_flag_lossy = -1; -static int hf_osd_flags = -1; -static int hf_osd_flag_ack = -1; -static int hf_osd_flag_onnvram = -1; -static int hf_osd_flag_ondisk = -1; -static int hf_osd_flag_retry = -1; -static int hf_osd_flag_read = -1; -static int hf_osd_flag_write = -1; -static int hf_osd_flag_ordersnap = -1; -static int hf_osd_flag_peerstat_old = -1; -static int hf_osd_flag_balance_reads = -1; -static int hf_osd_flag_parallelexec = -1; -static int hf_osd_flag_pgop = -1; -static int hf_osd_flag_exec = -1; -static int hf_osd_flag_exec_public = -1; -static int hf_osd_flag_localize_reads = -1; -static int hf_osd_flag_rwordered = -1; -static int hf_osd_flag_ignore_cache = -1; -static int hf_osd_flag_skiprwlocks = -1; -static int hf_osd_flag_ignore_overlay = -1; -static int hf_osd_flag_flush = -1; -static int hf_osd_flag_map_snap_clone = -1; -static int hf_osd_flag_enforce_snapc = -1; -static int hf_osd_op_type = -1; -static int hf_osd_op_data = -1; -static int hf_osd_op_extent_off = -1; -static int hf_osd_op_extent_size = -1; -static int hf_osd_op_extent_trunc_size = -1; -static int hf_osd_op_extent_trunc_seq = -1; -static int hf_osd_op_payload_size = -1; -static int hf_osd_redirect_oloc = -1; -static int hf_osd_redirect_obj = -1; -static int hf_osd_redirect_osdinstr = -1; -static int hf_osd_redirect_osdinstr_data = -1; -static int hf_osd_redirect_osdinstr_len = -1; -static int hf_statsum_bytes = -1; -static int hf_statsum_objects = -1; -static int hf_statsum_clones = -1; -static int hf_statsum_copies = -1; -static int hf_statsum_missing = -1; -static int hf_statsum_degraded = -1; -static int hf_statsum_unfound = -1; -static int hf_statsum_read_bytes = -1; -static int hf_statsum_read_kbytes = -1; -static int hf_statsum_written_bytes = -1; -static int hf_statsum_written_kbytes = -1; -static int hf_statsum_scrub_errors = -1; -static int hf_statsum_recovered = -1; -static int hf_statsum_bytes_recovered = -1; -static int hf_statsum_keys_recovered = -1; -static int hf_statsum_shallow_scrub_errors = -1; -static int hf_statsum_deep_scrub_errors = -1; -static int hf_statsum_dirty = -1; -static int hf_statsum_whiteouts = -1; -static int hf_statsum_omap = -1; -static int hf_statsum_hitset_archive = -1; -static int hf_connect = -1; -static int hf_connect_reply = -1; -static int hf_tag = -1; -static int hf_ack = -1; -static int hf_seq_existing = -1; -static int hf_seq_new = -1; -static int hf_head = -1; -static int hf_head_seq = -1; -static int hf_head_tid = -1; -static int hf_head_type = -1; -static int hf_head_priority = -1; -static int hf_head_version = -1; -static int hf_head_front_size = -1; -static int hf_head_middle_size = -1; -static int hf_head_data_size = -1; -static int hf_head_data_off = -1; -static int hf_head_srcname = -1; -static int hf_head_compat_version = -1; -static int hf_head_reserved = -1; -static int hf_head_crc = -1; -static int hf_foot = -1; -static int hf_foot_front_crc = -1; -static int hf_foot_middle_crc = -1; -static int hf_foot_data_crc = -1; -static int hf_foot_signature = -1; -static int hf_msg_front = -1; -static int hf_msg_middle = -1; -static int hf_msg_data = -1; -static int hf_statcollection = -1; -static int hf_paxos = -1; -static int hf_paxos_ver = -1; -static int hf_paxos_mon = -1; -static int hf_paxos_mon_tid = -1; -static int hf_msg_mon_map = -1; -static int hf_msg_statfs = -1; -static int hf_msg_statfs_fsid = -1; -static int hf_msg_statfsreply = -1; -static int hf_msg_statfsreply_fsid = -1; -static int hf_msg_statfsreply_ver = -1; -static int hf_msg_statfsreply_kb = -1; -static int hf_msg_statfsreply_kbused = -1; -static int hf_msg_statfsreply_kbavail = -1; -static int hf_msg_statfsreply_obj = -1; -static int hf_msg_mon_sub = -1; -static int hf_msg_mon_sub_item = -1; -static int hf_msg_mon_sub_item_len = -1; -static int hf_msg_mon_sub_what = -1; -static int hf_msg_mon_sub_start = -1; -static int hf_msg_mon_sub_flags = -1; -static int hf_msg_mon_sub_flags_onetime = -1; -static int hf_msg_mon_sub_ack = -1; -static int hf_msg_mon_sub_ack_interval = -1; -static int hf_msg_mon_sub_ack_fsid = -1; -static int hf_msg_auth = -1; -static int hf_msg_auth_proto = -1; -static int hf_msg_auth_supportedproto = -1; -static int hf_msg_auth_supportedproto_ver = -1; -static int hf_msg_auth_supportedproto_proto = -1; -static int hf_msg_auth_supportedproto_gid = -1; -static int hf_msg_auth_cephx = -1; -static int hf_msg_auth_cephx_req_type = -1; -static int hf_msg_auth_monmap_epoch = -1; -static int hf_msg_auth_reply = -1; -static int hf_msg_auth_reply_proto = -1; -static int hf_msg_auth_reply_result = -1; -static int hf_msg_auth_reply_global_id = -1; -static int hf_msg_auth_reply_msg = -1; -static int hf_msg_mon_getversion = -1; -static int hf_msg_mon_getversion_tid = -1; -static int hf_msg_mon_getversion_what = -1; -static int hf_msg_mon_getversionreply = -1; -static int hf_msg_mon_getversionreply_tid = -1; -static int hf_msg_mon_getversionreply_ver = -1; -static int hf_msg_mon_getversionreply_veroldest = -1; -static int hf_msg_mds_map = -1; -static int hf_msg_mds_map_fsid = -1; -static int hf_msg_mds_map_epoch = -1; -static int hf_msg_mds_map_datai = -1; -static int hf_msg_mds_map_data = -1; -static int hf_msg_mds_map_data_size = -1; -static int hf_msg_client_sess = -1; -static int hf_msg_client_sess_op = -1; -static int hf_msg_client_sess_seq = -1; -static int hf_msg_client_sess_time = -1; -static int hf_msg_client_sess_caps_max = -1; -static int hf_msg_client_sess_leases_max = -1; -static int hf_msg_client_req = -1; -static int hf_msg_client_req_oldest_tid = -1; -static int hf_msg_client_req_mdsmap_epoch = -1; -static int hf_msg_client_req_flags = -1; -static int hf_msg_client_req_retry = -1; -static int hf_msg_client_req_forward = -1; -static int hf_msg_client_req_releases = -1; -static int hf_msg_client_req_op = -1; -static int hf_msg_client_req_caller_uid = -1; -static int hf_msg_client_req_caller_gid = -1; -static int hf_msg_client_req_inode = -1; -static int hf_msg_client_req_path_src = -1; -static int hf_msg_client_req_path_dst = -1; -static int hf_msg_client_req_release = -1; -static int hf_msg_client_req_time = -1; -static int hf_msg_client_reqfwd = -1; -static int hf_msg_client_reqfwd_dst = -1; -static int hf_msg_client_reqfwd_fwd = -1; -static int hf_msg_client_reqfwd_resend = -1; -static int hf_msg_client_reply = -1; -static int hf_msg_client_reply_op = -1; -static int hf_msg_client_reply_result = -1; -static int hf_msg_client_reply_mdsmap_epoch = -1; -static int hf_msg_client_reply_safe = -1; -static int hf_msg_client_reply_isdentry = -1; -static int hf_msg_client_reply_istarget = -1; -static int hf_msg_client_reply_trace = -1; -static int hf_msg_client_reply_extra = -1; -static int hf_msg_client_reply_snaps = -1; -static int hf_msg_osd_map = -1; -static int hf_msg_osd_map_fsid = -1; -static int hf_msg_osd_map_inc = -1; -static int hf_msg_osd_map_inc_len = -1; -static int hf_msg_osd_map_map = -1; -static int hf_msg_osd_map_map_len = -1; -static int hf_msg_osd_map_epoch = -1; -static int hf_msg_osd_map_oldest = -1; -static int hf_msg_osd_map_newest = -1; -static int hf_msg_osd_op = -1; -static int hf_msg_osd_op_client_inc = -1; -static int hf_msg_osd_op_osdmap_epoch = -1; -static int hf_msg_osd_op_mtime = -1; -static int hf_msg_osd_op_reassert_version = -1; -static int hf_msg_osd_op_oloc = -1; -static int hf_msg_osd_op_pgid = -1; -static int hf_msg_osd_op_oid = -1; -static int hf_msg_osd_op_ops_len = -1; -static int hf_msg_osd_op_op = -1; -static int hf_msg_osd_op_snap_id = -1; -static int hf_msg_osd_op_snap_seq = -1; -static int hf_msg_osd_op_snaps_len = -1; -static int hf_msg_osd_op_snap = -1; -static int hf_msg_osd_op_retry_attempt = -1; -static int hf_msg_osd_op_payload = -1; -static int hf_msg_osd_opreply = -1; -static int hf_msg_osd_opreply_oid = -1; -static int hf_msg_osd_opreply_pgid = -1; -static int hf_msg_osd_opreply_result = -1; -static int hf_msg_osd_opreply_bad_replay_ver = -1; -static int hf_msg_osd_opreply_osdmap_epoch = -1; -static int hf_msg_osd_opreply_ops_len = -1; -static int hf_msg_osd_opreply_op = -1; -static int hf_msg_osd_opreply_retry_attempt = -1; -static int hf_msg_osd_opreply_rval = -1; -static int hf_msg_osd_opreply_replay_ver = -1; -static int hf_msg_osd_opreply_user_ver = -1; -static int hf_msg_osd_opreply_redirect = -1; -static int hf_msg_osd_opreply_payload = -1; -static int hf_msg_poolopreply = -1; -static int hf_msg_poolopreply_fsid = -1; -static int hf_msg_poolopreply_code = -1; -static int hf_msg_poolopreply_epoch = -1; -static int hf_msg_poolopreply_datai = -1; -static int hf_msg_poolopreply_data = -1; -static int hf_msg_poolopreply_data_size = -1; -static int hf_msg_poolop = -1; -static int hf_msg_poolop_fsid = -1; -static int hf_msg_poolop_pool = -1; -static int hf_msg_poolop_type = -1; -static int hf_msg_poolop_auid = -1; -static int hf_msg_poolop_snapid = -1; -static int hf_msg_poolop_name = -1; -static int hf_msg_poolop_crush_rule = -1; -static int hf_msg_poolop_crush_rule8 = -1; -static int hf_msg_mon_cmd = -1; -static int hf_msg_mon_cmd_fsid = -1; -static int hf_msg_mon_cmd_arg = -1; -static int hf_msg_mon_cmd_arg_len = -1; -static int hf_msg_mon_cmd_str = -1; -static int hf_msg_mon_cmd_ack = -1; -static int hf_msg_mon_cmd_ack_code = -1; -static int hf_msg_mon_cmd_ack_res = -1; -static int hf_msg_mon_cmd_ack_arg = -1; -static int hf_msg_mon_cmd_ack_arg_len = -1; -static int hf_msg_mon_cmd_ack_arg_str = -1; -static int hf_msg_mon_cmd_ack_data = -1; -static int hf_msg_poolstats = -1; -static int hf_msg_poolstats_fsid = -1; -static int hf_msg_poolstats_pool = -1; -static int hf_msg_poolstatsreply = -1; -static int hf_msg_poolstatsreply_fsid = -1; -static int hf_msg_poolstatsreply_stat = -1; -static int hf_msg_poolstatsreply_pool = -1; -static int hf_msg_poolstatsreply_log_size = -1; -static int hf_msg_poolstatsreply_log_size_ondisk = -1; -static int hf_msg_mon_globalid_max = -1; -static int hf_msg_mon_election = -1; -static int hf_msg_mon_election_fsid = -1; -static int hf_msg_mon_election_op = -1; -static int hf_msg_mon_election_epoch = -1; -static int hf_msg_mon_election_quorum = -1; -static int hf_msg_mon_election_quorum_features = -1; -static int hf_msg_mon_election_defunct_one = -1; -static int hf_msg_mon_election_defunct_two = -1; -static int hf_msg_mon_election_sharing = -1; -static int hf_msg_mon_election_sharing_data = -1; -static int hf_msg_mon_election_sharing_size = -1; -static int hf_msg_mon_paxos = -1; -static int hf_msg_mon_paxos_epoch = -1; -static int hf_msg_mon_paxos_op = -1; -static int hf_msg_mon_paxos_first = -1; -static int hf_msg_mon_paxos_last = -1; -static int hf_msg_mon_paxos_pnfrom = -1; -static int hf_msg_mon_paxos_pn = -1; -static int hf_msg_mon_paxos_pnuncommitted = -1; -static int hf_msg_mon_paxos_lease = -1; -static int hf_msg_mon_paxos_sent = -1; -static int hf_msg_mon_paxos_latest_ver = -1; -static int hf_msg_mon_paxos_latest_val = -1; -static int hf_msg_mon_paxos_latest_val_data = -1; -static int hf_msg_mon_paxos_latest_val_size = -1; -static int hf_msg_mon_paxos_value = -1; -static int hf_msg_mon_paxos_ver = -1; -static int hf_msg_mon_paxos_val = -1; -static int hf_msg_mon_paxos_val_data = -1; -static int hf_msg_mon_paxos_val_size = -1; -static int hf_msg_mon_probe = -1; -static int hf_msg_mon_probe_fsid = -1; -static int hf_msg_mon_probe_type = -1; -static int hf_msg_mon_probe_name = -1; -static int hf_msg_mon_probe_quorum = -1; -static int hf_msg_mon_probe_paxos_first_ver = -1; -static int hf_msg_mon_probe_paxos_last_ver = -1; -static int hf_msg_mon_probe_ever_joined = -1; -static int hf_msg_mon_probe_req_features = -1; -static int hf_msg_osd_ping = -1; -static int hf_msg_osd_ping_fsid = -1; -static int hf_msg_osd_ping_mapepoch = -1; -static int hf_msg_osd_ping_peerepoch = -1; -static int hf_msg_osd_ping_op = -1; -static int hf_msg_osd_ping_time = -1; -static int hf_msg_osd_boot = -1; -static int hf_msg_osd_boot_addr_back = -1; -static int hf_msg_osd_boot_addr_cluster = -1; -static int hf_msg_osd_boot_epoch = -1; -static int hf_msg_osd_boot_addr_front = -1; -static int hf_msg_osd_boot_metadata = -1; -static int hf_msg_osd_boot_metadata_k = -1; -static int hf_msg_osd_boot_metadata_v = -1; -static int hf_msg_pgstats = -1; -static int hf_msg_pgstats_fsid = -1; -static int hf_msg_pgstats_pgstat = -1; -static int hf_msg_pgstats_pgstat_pg = -1; -static int hf_msg_pgstats_pgstat_stat = -1; -static int hf_msg_pgstats_epoch = -1; -static int hf_msg_pgstats_mapfor = -1; -static int hf_msg_osd_pg_create = -1; -static int hf_msg_osd_pg_create_epoch = -1; -static int hf_msg_osd_pg_create_mkpg = -1; -static int hf_msg_osd_pg_create_mkpg_pg = -1; -static int hf_msg_osd_pg_create_mkpg_create = -1; -static int hf_msg_client_caps = -1; -static int hf_msg_client_caps_op = -1; -static int hf_msg_client_caps_inode = -1; -static int hf_msg_client_caps_relam = -1; -static int hf_msg_client_caps_cap_id = -1; -static int hf_msg_client_caps_seq = -1; -static int hf_msg_client_caps_seq_issue = -1; -static int hf_msg_client_caps_new = -1; -static int hf_msg_client_caps_wanted = -1; -static int hf_msg_client_caps_dirty = -1; -static int hf_msg_client_caps_seq_migrate = -1; -static int hf_msg_client_caps_snap_follows = -1; -static int hf_msg_client_caps_uid = -1; -static int hf_msg_client_caps_gid = -1; -static int hf_msg_client_caps_mode = -1; -static int hf_msg_client_caps_nlink = -1; -static int hf_msg_client_caps_xattr_ver = -1; -static int hf_msg_client_caps_snap = -1; -static int hf_msg_client_caps_flock = -1; -static int hf_msg_client_caps_inline_ver = -1; -static int hf_msg_client_caps_inline_data = -1; -static int hf_msg_client_caps_xattr = -1; -static int hf_msg_client_caprel = -1; -static int hf_msg_client_caprel_cap = -1; -static int hf_msg_client_caprel_cap_inode = -1; -static int hf_msg_client_caprel_cap_id = -1; -static int hf_msg_client_caprel_cap_migrate = -1; -static int hf_msg_client_caprel_cap_seq = -1; -static int hf_msg_timecheck = -1; -static int hf_msg_timecheck_op = -1; -static int hf_msg_timecheck_epoch = -1; -static int hf_msg_timecheck_round = -1; -static int hf_msg_timecheck_time = -1; -static int hf_msg_timecheck_skew = -1; -static int hf_msg_timecheck_skew_node = -1; -static int hf_msg_timecheck_skew_skew = -1; -static int hf_msg_timecheck_latency = -1; -static int hf_msg_timecheck_latency_node = -1; -static int hf_msg_timecheck_latency_latency = -1; +static int proto_ceph; +static int hf_filter_data; +static int hf_node_id; +static int hf_node_type; +static int hf_node_nonce; +static int hf_entityinst_name; +static int hf_entityinst_addr; +static int hf_EntityName; +static int hf_EntityName_type; +static int hf_EntityName_id; +static int hf_src_slug; +static int hf_src_type; +static int hf_dst_type; +static int hf_dst_slug; +static int hf_banner; +static int hf_client_info; +static int hf_server_info; +static int hf_sockaddr; +static int hf_inet_family; +static int hf_port; +static int hf_addr_ipv4; +static int hf_addr_ipv6; +static int hf_data_data; +static int hf_data_size; +static int hf_string_data; +static int hf_string_size; +static int hf_keepalive_time; +static int hf_encoded_ver; +static int hf_encoded_compat; +static int hf_encoded_size; +static int hf_version; +static int hf_epoch; +static int hf_pool; +static int hf_key; +static int hf_namespace; +static int hf_hash; +static int hf_pgid_ver; +static int hf_pgid_pool; +static int hf_pgid_seed; +static int hf_pgid_preferred; +static int hf_pg_create_epoch; +static int hf_pg_create_parent; +static int hf_pg_create_splitbits; +static int hf_path_ver; +static int hf_path_inode; +static int hf_path_rel; +static int hf_mds_release_inode; +static int hf_mds_release_capid; +static int hf_mds_release_new; +static int hf_mds_release_wanted; +static int hf_mds_release_seq; +static int hf_mds_release_seq_issue; +static int hf_mds_release_mseq; +static int hf_mds_release_dname_seq; +static int hf_mds_release_dname; +static int hf_hitset_params; +static int hf_hitset_params_type; +static int hf_hitset_params_exphash_count; +static int hf_hitset_params_exphash_hit; +static int hf_snapinfo; +static int hf_snapinfo_id; +static int hf_snapinfo_time; +static int hf_snapinfo_name; +static int hf_pgpool; +static int hf_pgpool_type; +static int hf_pgpool_size; +static int hf_pgpool_crush_ruleset; +static int hf_pgpool_hash; +static int hf_pgpool_pgnum; +static int hf_pgpool_pgpnum; +static int hf_pgpool_changed; +static int hf_pgpool_snapseq; +static int hf_pgpool_snapepoch; +static int hf_pgpool_snap; +static int hf_pgpool_snap_id; +static int hf_pgpool_snapdel; +static int hf_pgpool_snapdel_from; +static int hf_pgpool_snapdel_to; +static int hf_pgpool_uid; +static int hf_pgpool_flags_low; +static int hf_pgpool_flags_high; +static int hf_pgpool_crash_reply_interval; +static int hf_pgpool_min_size; +static int hf_pgpool_quota_bytes; +static int hf_pgpool_quota_objects; +static int hf_pgpool_tier; +static int hf_pgpool_tierof; +static int hf_pgpool_cachemode; +static int hf_pgpool_readtier; +static int hf_pgpool_writetier; +static int hf_pgpool_property; +static int hf_pgpool_property_key; +static int hf_pgpool_property_val; +static int hf_pgpool_hitset_period; +static int hf_pgpool_hitset_count; +static int hf_pgpool_stripewidth; +static int hf_pgpool_targetmaxsize; +static int hf_pgpool_targetmaxobj; +static int hf_pgpool_cache_targetdirtyratio; +static int hf_pgpool_cache_targetfullratio; +static int hf_pgpool_cache_flushage_min; +static int hf_pgpool_cache_evictage_min; +static int hf_pgpool_erasurecode_profile; +static int hf_pgpool_lastforceresend; +static int hf_pgpool_flag_hashpool; +static int hf_pgpool_flag_full; +static int hf_pgpool_flag_fake_ec_pool; +static int hf_monmap; +static int hf_monmap_fsid; +static int hf_monmap_epoch; +static int hf_monmap_address; +static int hf_monmap_address_name; +static int hf_monmap_address_addr; +static int hf_monmap_changed; +static int hf_monmap_created; +static int hf_pg_stat_ver; +static int hf_pg_stat_seq; +static int hf_pg_stat_epoch; +static int hf_pg_stat_state; +static int hf_pg_stat_logstart; +static int hf_pg_stat_logstartondisk; +static int hf_pg_stat_created; +static int hf_pg_stat_lastepochclean; +static int hf_pg_stat_parent; +static int hf_pg_stat_parent_splitbits; +static int hf_pg_stat_lastscrub; +static int hf_pg_stat_lastscrubstamp; +static int hf_pg_stat_stats; +static int hf_pg_stat_logsize; +static int hf_pg_stat_logsizeondisk; +static int hf_pg_stat_up; +static int hf_pg_stat_acting; +static int hf_pg_stat_lastfresh; +static int hf_pg_stat_lastchange; +static int hf_pg_stat_lastactive; +static int hf_pg_stat_lastclean; +static int hf_pg_stat_lastunstale; +static int hf_pg_stat_mappingepoch; +static int hf_pg_stat_lastdeepscrub; +static int hf_pg_stat_lastdeepscrubstamp; +static int hf_pg_stat_statsinvalid; +static int hf_pg_stat_lastcleanscrubstamp; +static int hf_pg_stat_lastbecameactive; +static int hf_pg_stat_dirtystatsinvalid; +static int hf_pg_stat_upprimary; +static int hf_pg_stat_actingprimary; +static int hf_pg_stat_omapstatsinvalid; +static int hf_pg_stat_hitsetstatsinvalid; +static int hf_crush; +static int hf_osd_peerstat; +static int hf_osd_peerstat_timestamp; +static int hf_featureset_mask; +static int hf_featureset_name; +static int hf_featureset_name_val; +static int hf_featureset_name_name; +static int hf_compatset; +static int hf_compatset_compat; +static int hf_compatset_compatro; +static int hf_compatset_incompat; +static int hf_osd_superblock; +static int hf_osd_superblock_clusterfsid; +static int hf_osd_superblock_role; +static int hf_osd_superblock_epoch; +static int hf_osd_superblock_map_old; +static int hf_osd_superblock_map_new; +static int hf_osd_superblock_weight; +static int hf_osd_superblock_mounted; +static int hf_osd_superblock_osdfsid; +static int hf_osd_superblock_clean; +static int hf_osd_superblock_full; +static int hf_osdinfo_ver; +static int hf_osdinfo_lastclean_begin; +static int hf_osdinfo_lastclean_end; +static int hf_osdinfo_up_from; +static int hf_osdinfo_up_through; +static int hf_osdinfo_downat; +static int hf_osdinfo_lostat; +static int hf_osdxinfo_down; +static int hf_osdxinfo_laggy_probability; +static int hf_osdxinfo_laggy_interval; +static int hf_osdxinfo_oldweight; +static int hf_perfstat_commitlatency; +static int hf_perfstat_applylatency; +static int hf_osdstat; +static int hf_osdstat_kb; +static int hf_osdstat_kbused; +static int hf_osdstat_kbavail; +static int hf_osdstat_trimqueue; +static int hf_osdstat_trimming; +static int hf_osdstat_hbin; +static int hf_osdstat_hbout; +static int hf_osdstat_opqueue; +static int hf_osdstat_fsperf; +static int hf_osdmap; +static int hf_osdmap_client; +static int hf_osdmap_fsid; +static int hf_osdmap_epoch; +static int hf_osdmap_created; +static int hf_osdmap_modified; +static int hf_osdmap_pool; +static int hf_osdmap_pool_id; +static int hf_osdmap_poolname_item; +static int hf_osdmap_poolname; +static int hf_osdmap_poolmax; +static int hf_osdmap_flags; +static int hf_osdmap_osdmax; +static int hf_osdmap_osd_state; +static int hf_osdmap_osd_weight; +static int hf_osdmap_osd_addr; +static int hf_osdmap_pgtmp; +static int hf_osdmap_pgtmp_pg; +static int hf_osdmap_pgtmp_val; +static int hf_osdmap_primarytmp; +static int hf_osdmap_primarytmp_pg; +static int hf_osdmap_primarytmp_val; +static int hf_osdmap_osd_primaryaffinity; +static int hf_osdmap_erasurecodeprofile; +static int hf_osdmap_erasurecodeprofile_name; +static int hf_osdmap_erasurecodeprofile_prop; +static int hf_osdmap_erasurecodeprofile_k; +static int hf_osdmap_erasurecodeprofile_v; +static int hf_osdmap_osd; +static int hf_osdmap_hbaddr_back; +static int hf_osdmap_osd_info; +static int hf_osdmap_blacklist; +static int hf_osdmap_blacklist_addr; +static int hf_osdmap_blacklist_time; +static int hf_osdmap_cluster_addr; +static int hf_osdmap_cluster_snapepoch; +static int hf_osdmap_cluster_snap; +static int hf_osdmap_osd_uuid; +static int hf_osdmap_osd_xinfo; +static int hf_osdmap_hbaddr_front; +static int hf_osdmap_inc; +static int hf_osdmap_inc_client; +static int hf_osdmap_inc_fsid; +static int hf_osdmap_inc_osd; +static int hf_features_high; +static int hf_features_low; +static int hf_feature_uid; +static int hf_feature_nosrcaddr; +static int hf_feature_monclockcheck; +static int hf_feature_flock; +static int hf_feature_subscribe2; +static int hf_feature_monnames; +static int hf_feature_reconnect_seq; +static int hf_feature_dirlayouthash; +static int hf_feature_objectlocator; +static int hf_feature_pgid64; +static int hf_feature_incsubosdmap; +static int hf_feature_pgpool3; +static int hf_feature_osdreplymux; +static int hf_feature_osdenc; +static int hf_feature_omap; +static int hf_feature_monenc; +static int hf_feature_query_t; +static int hf_feature_indep_pg_map; +static int hf_feature_crush_tunables; +static int hf_feature_chunky_scrub; +static int hf_feature_mon_nullroute; +static int hf_feature_mon_gv; +static int hf_feature_backfill_reservation; +static int hf_feature_msg_auth; +static int hf_feature_recovery_reservation; +static int hf_feature_crush_tunables2; +static int hf_feature_createpoolid; +static int hf_feature_reply_create_inode; +static int hf_feature_osd_hbmsgs; +static int hf_feature_mdsenc; +static int hf_feature_osdhashpspool; +static int hf_feature_mon_single_paxos; +static int hf_feature_osd_snapmapper; +static int hf_feature_mon_scrub; +static int hf_feature_osd_packed_recovery; +static int hf_feature_osd_cachepool; +static int hf_feature_crush_v2; +static int hf_feature_export_peer; +static int hf_feature_osd_erasure_codes; +static int hf_feature_osd_tmap2omap; +static int hf_feature_osdmap_enc; +static int hf_feature_mds_inline_data; +static int hf_feature_crush_tunables3; +static int hf_feature_osd_primary_affinity; +static int hf_feature_msgr_keepalive2; +static int hf_feature_reserved; +static int hf_connect_host_type; +static int hf_connect_seq_global; +static int hf_connect_seq; +static int hf_connect_proto_ver; +static int hf_connect_auth_proto; +static int hf_connect_auth_size; +static int hf_connect_auth; +static int hf_flags; +static int hf_flag_lossy; +static int hf_osd_flags; +static int hf_osd_flag_ack; +static int hf_osd_flag_onnvram; +static int hf_osd_flag_ondisk; +static int hf_osd_flag_retry; +static int hf_osd_flag_read; +static int hf_osd_flag_write; +static int hf_osd_flag_ordersnap; +static int hf_osd_flag_peerstat_old; +static int hf_osd_flag_balance_reads; +static int hf_osd_flag_parallelexec; +static int hf_osd_flag_pgop; +static int hf_osd_flag_exec; +static int hf_osd_flag_exec_public; +static int hf_osd_flag_localize_reads; +static int hf_osd_flag_rwordered; +static int hf_osd_flag_ignore_cache; +static int hf_osd_flag_skiprwlocks; +static int hf_osd_flag_ignore_overlay; +static int hf_osd_flag_flush; +static int hf_osd_flag_map_snap_clone; +static int hf_osd_flag_enforce_snapc; +static int hf_osd_op_type; +static int hf_osd_op_data; +static int hf_osd_op_extent_off; +static int hf_osd_op_extent_size; +static int hf_osd_op_extent_trunc_size; +static int hf_osd_op_extent_trunc_seq; +static int hf_osd_op_payload_size; +static int hf_osd_redirect_oloc; +static int hf_osd_redirect_obj; +static int hf_osd_redirect_osdinstr; +static int hf_osd_redirect_osdinstr_data; +static int hf_osd_redirect_osdinstr_len; +static int hf_statsum_bytes; +static int hf_statsum_objects; +static int hf_statsum_clones; +static int hf_statsum_copies; +static int hf_statsum_missing; +static int hf_statsum_degraded; +static int hf_statsum_unfound; +static int hf_statsum_read_bytes; +static int hf_statsum_read_kbytes; +static int hf_statsum_written_bytes; +static int hf_statsum_written_kbytes; +static int hf_statsum_scrub_errors; +static int hf_statsum_recovered; +static int hf_statsum_bytes_recovered; +static int hf_statsum_keys_recovered; +static int hf_statsum_shallow_scrub_errors; +static int hf_statsum_deep_scrub_errors; +static int hf_statsum_dirty; +static int hf_statsum_whiteouts; +static int hf_statsum_omap; +static int hf_statsum_hitset_archive; +static int hf_connect; +static int hf_connect_reply; +static int hf_tag; +static int hf_ack; +static int hf_seq_existing; +static int hf_seq_new; +static int hf_head; +static int hf_head_seq; +static int hf_head_tid; +static int hf_head_type; +static int hf_head_priority; +static int hf_head_version; +static int hf_head_front_size; +static int hf_head_middle_size; +static int hf_head_data_size; +static int hf_head_data_off; +static int hf_head_srcname; +static int hf_head_compat_version; +static int hf_head_reserved; +static int hf_head_crc; +static int hf_foot; +static int hf_foot_front_crc; +static int hf_foot_middle_crc; +static int hf_foot_data_crc; +static int hf_foot_signature; +static int hf_msg_front; +static int hf_msg_middle; +static int hf_msg_data; +static int hf_statcollection; +static int hf_paxos; +static int hf_paxos_ver; +static int hf_paxos_mon; +static int hf_paxos_mon_tid; +static int hf_msg_mon_map; +static int hf_msg_statfs; +static int hf_msg_statfs_fsid; +static int hf_msg_statfsreply; +static int hf_msg_statfsreply_fsid; +static int hf_msg_statfsreply_ver; +static int hf_msg_statfsreply_kb; +static int hf_msg_statfsreply_kbused; +static int hf_msg_statfsreply_kbavail; +static int hf_msg_statfsreply_obj; +static int hf_msg_mon_sub; +static int hf_msg_mon_sub_item; +static int hf_msg_mon_sub_item_len; +static int hf_msg_mon_sub_what; +static int hf_msg_mon_sub_start; +static int hf_msg_mon_sub_flags; +static int hf_msg_mon_sub_flags_onetime; +static int hf_msg_mon_sub_ack; +static int hf_msg_mon_sub_ack_interval; +static int hf_msg_mon_sub_ack_fsid; +static int hf_msg_auth; +static int hf_msg_auth_proto; +static int hf_msg_auth_supportedproto; +static int hf_msg_auth_supportedproto_ver; +static int hf_msg_auth_supportedproto_proto; +static int hf_msg_auth_supportedproto_gid; +static int hf_msg_auth_cephx; +static int hf_msg_auth_cephx_req_type; +static int hf_msg_auth_monmap_epoch; +static int hf_msg_auth_reply; +static int hf_msg_auth_reply_proto; +static int hf_msg_auth_reply_result; +static int hf_msg_auth_reply_global_id; +static int hf_msg_auth_reply_msg; +static int hf_msg_mon_getversion; +static int hf_msg_mon_getversion_tid; +static int hf_msg_mon_getversion_what; +static int hf_msg_mon_getversionreply; +static int hf_msg_mon_getversionreply_tid; +static int hf_msg_mon_getversionreply_ver; +static int hf_msg_mon_getversionreply_veroldest; +static int hf_msg_mds_map; +static int hf_msg_mds_map_fsid; +static int hf_msg_mds_map_epoch; +static int hf_msg_mds_map_datai; +static int hf_msg_mds_map_data; +static int hf_msg_mds_map_data_size; +static int hf_msg_client_sess; +static int hf_msg_client_sess_op; +static int hf_msg_client_sess_seq; +static int hf_msg_client_sess_time; +static int hf_msg_client_sess_caps_max; +static int hf_msg_client_sess_leases_max; +static int hf_msg_client_req; +static int hf_msg_client_req_oldest_tid; +static int hf_msg_client_req_mdsmap_epoch; +static int hf_msg_client_req_flags; +static int hf_msg_client_req_retry; +static int hf_msg_client_req_forward; +static int hf_msg_client_req_releases; +static int hf_msg_client_req_op; +static int hf_msg_client_req_caller_uid; +static int hf_msg_client_req_caller_gid; +static int hf_msg_client_req_inode; +static int hf_msg_client_req_path_src; +static int hf_msg_client_req_path_dst; +static int hf_msg_client_req_release; +static int hf_msg_client_req_time; +static int hf_msg_client_reqfwd; +static int hf_msg_client_reqfwd_dst; +static int hf_msg_client_reqfwd_fwd; +static int hf_msg_client_reqfwd_resend; +static int hf_msg_client_reply; +static int hf_msg_client_reply_op; +static int hf_msg_client_reply_result; +static int hf_msg_client_reply_mdsmap_epoch; +static int hf_msg_client_reply_safe; +static int hf_msg_client_reply_isdentry; +static int hf_msg_client_reply_istarget; +static int hf_msg_client_reply_trace; +static int hf_msg_client_reply_extra; +static int hf_msg_client_reply_snaps; +static int hf_msg_osd_map; +static int hf_msg_osd_map_fsid; +static int hf_msg_osd_map_inc; +static int hf_msg_osd_map_inc_len; +static int hf_msg_osd_map_map; +static int hf_msg_osd_map_map_len; +static int hf_msg_osd_map_epoch; +static int hf_msg_osd_map_oldest; +static int hf_msg_osd_map_newest; +static int hf_msg_osd_op; +static int hf_msg_osd_op_client_inc; +static int hf_msg_osd_op_osdmap_epoch; +static int hf_msg_osd_op_mtime; +static int hf_msg_osd_op_reassert_version; +static int hf_msg_osd_op_oloc; +static int hf_msg_osd_op_pgid; +static int hf_msg_osd_op_oid; +static int hf_msg_osd_op_ops_len; +static int hf_msg_osd_op_op; +static int hf_msg_osd_op_snap_id; +static int hf_msg_osd_op_snap_seq; +static int hf_msg_osd_op_snaps_len; +static int hf_msg_osd_op_snap; +static int hf_msg_osd_op_retry_attempt; +static int hf_msg_osd_op_payload; +static int hf_msg_osd_opreply; +static int hf_msg_osd_opreply_oid; +static int hf_msg_osd_opreply_pgid; +static int hf_msg_osd_opreply_result; +static int hf_msg_osd_opreply_bad_replay_ver; +static int hf_msg_osd_opreply_osdmap_epoch; +static int hf_msg_osd_opreply_ops_len; +static int hf_msg_osd_opreply_op; +static int hf_msg_osd_opreply_retry_attempt; +static int hf_msg_osd_opreply_rval; +static int hf_msg_osd_opreply_replay_ver; +static int hf_msg_osd_opreply_user_ver; +static int hf_msg_osd_opreply_redirect; +static int hf_msg_osd_opreply_payload; +static int hf_msg_poolopreply; +static int hf_msg_poolopreply_fsid; +static int hf_msg_poolopreply_code; +static int hf_msg_poolopreply_epoch; +static int hf_msg_poolopreply_datai; +static int hf_msg_poolopreply_data; +static int hf_msg_poolopreply_data_size; +static int hf_msg_poolop; +static int hf_msg_poolop_fsid; +static int hf_msg_poolop_pool; +static int hf_msg_poolop_type; +static int hf_msg_poolop_auid; +static int hf_msg_poolop_snapid; +static int hf_msg_poolop_name; +static int hf_msg_poolop_crush_rule; +static int hf_msg_poolop_crush_rule8; +static int hf_msg_mon_cmd; +static int hf_msg_mon_cmd_fsid; +static int hf_msg_mon_cmd_arg; +static int hf_msg_mon_cmd_arg_len; +static int hf_msg_mon_cmd_str; +static int hf_msg_mon_cmd_ack; +static int hf_msg_mon_cmd_ack_code; +static int hf_msg_mon_cmd_ack_res; +static int hf_msg_mon_cmd_ack_arg; +static int hf_msg_mon_cmd_ack_arg_len; +static int hf_msg_mon_cmd_ack_arg_str; +static int hf_msg_mon_cmd_ack_data; +static int hf_msg_poolstats; +static int hf_msg_poolstats_fsid; +static int hf_msg_poolstats_pool; +static int hf_msg_poolstatsreply; +static int hf_msg_poolstatsreply_fsid; +static int hf_msg_poolstatsreply_stat; +static int hf_msg_poolstatsreply_pool; +static int hf_msg_poolstatsreply_log_size; +static int hf_msg_poolstatsreply_log_size_ondisk; +static int hf_msg_mon_globalid_max; +static int hf_msg_mon_election; +static int hf_msg_mon_election_fsid; +static int hf_msg_mon_election_op; +static int hf_msg_mon_election_epoch; +static int hf_msg_mon_election_quorum; +static int hf_msg_mon_election_quorum_features; +static int hf_msg_mon_election_defunct_one; +static int hf_msg_mon_election_defunct_two; +static int hf_msg_mon_election_sharing; +static int hf_msg_mon_election_sharing_data; +static int hf_msg_mon_election_sharing_size; +static int hf_msg_mon_paxos; +static int hf_msg_mon_paxos_epoch; +static int hf_msg_mon_paxos_op; +static int hf_msg_mon_paxos_first; +static int hf_msg_mon_paxos_last; +static int hf_msg_mon_paxos_pnfrom; +static int hf_msg_mon_paxos_pn; +static int hf_msg_mon_paxos_pnuncommitted; +static int hf_msg_mon_paxos_lease; +static int hf_msg_mon_paxos_sent; +static int hf_msg_mon_paxos_latest_ver; +static int hf_msg_mon_paxos_latest_val; +static int hf_msg_mon_paxos_latest_val_data; +static int hf_msg_mon_paxos_latest_val_size; +static int hf_msg_mon_paxos_value; +static int hf_msg_mon_paxos_ver; +static int hf_msg_mon_paxos_val; +static int hf_msg_mon_paxos_val_data; +static int hf_msg_mon_paxos_val_size; +static int hf_msg_mon_probe; +static int hf_msg_mon_probe_fsid; +static int hf_msg_mon_probe_type; +static int hf_msg_mon_probe_name; +static int hf_msg_mon_probe_quorum; +static int hf_msg_mon_probe_paxos_first_ver; +static int hf_msg_mon_probe_paxos_last_ver; +static int hf_msg_mon_probe_ever_joined; +static int hf_msg_mon_probe_req_features; +static int hf_msg_osd_ping; +static int hf_msg_osd_ping_fsid; +static int hf_msg_osd_ping_mapepoch; +static int hf_msg_osd_ping_peerepoch; +static int hf_msg_osd_ping_op; +static int hf_msg_osd_ping_time; +static int hf_msg_osd_boot; +static int hf_msg_osd_boot_addr_back; +static int hf_msg_osd_boot_addr_cluster; +static int hf_msg_osd_boot_epoch; +static int hf_msg_osd_boot_addr_front; +static int hf_msg_osd_boot_metadata; +static int hf_msg_osd_boot_metadata_k; +static int hf_msg_osd_boot_metadata_v; +static int hf_msg_pgstats; +static int hf_msg_pgstats_fsid; +static int hf_msg_pgstats_pgstat; +static int hf_msg_pgstats_pgstat_pg; +static int hf_msg_pgstats_pgstat_stat; +static int hf_msg_pgstats_epoch; +static int hf_msg_pgstats_mapfor; +static int hf_msg_osd_pg_create; +static int hf_msg_osd_pg_create_epoch; +static int hf_msg_osd_pg_create_mkpg; +static int hf_msg_osd_pg_create_mkpg_pg; +static int hf_msg_osd_pg_create_mkpg_create; +static int hf_msg_client_caps; +static int hf_msg_client_caps_op; +static int hf_msg_client_caps_inode; +static int hf_msg_client_caps_relam; +static int hf_msg_client_caps_cap_id; +static int hf_msg_client_caps_seq; +static int hf_msg_client_caps_seq_issue; +static int hf_msg_client_caps_new; +static int hf_msg_client_caps_wanted; +static int hf_msg_client_caps_dirty; +static int hf_msg_client_caps_seq_migrate; +static int hf_msg_client_caps_snap_follows; +static int hf_msg_client_caps_uid; +static int hf_msg_client_caps_gid; +static int hf_msg_client_caps_mode; +static int hf_msg_client_caps_nlink; +static int hf_msg_client_caps_xattr_ver; +static int hf_msg_client_caps_snap; +static int hf_msg_client_caps_flock; +static int hf_msg_client_caps_inline_ver; +static int hf_msg_client_caps_inline_data; +static int hf_msg_client_caps_xattr; +static int hf_msg_client_caprel; +static int hf_msg_client_caprel_cap; +static int hf_msg_client_caprel_cap_inode; +static int hf_msg_client_caprel_cap_id; +static int hf_msg_client_caprel_cap_migrate; +static int hf_msg_client_caprel_cap_seq; +static int hf_msg_timecheck; +static int hf_msg_timecheck_op; +static int hf_msg_timecheck_epoch; +static int hf_msg_timecheck_round; +static int hf_msg_timecheck_time; +static int hf_msg_timecheck_skew; +static int hf_msg_timecheck_skew_node; +static int hf_msg_timecheck_skew_skew; +static int hf_msg_timecheck_latency; +static int hf_msg_timecheck_latency_node; +static int hf_msg_timecheck_latency_latency; /* Initialize the expert items. */ -static expert_field ei_unused = EI_INIT; -static expert_field ei_overrun = EI_INIT; -static expert_field ei_tag_unknown = EI_INIT; -static expert_field ei_msg_unknown = EI_INIT; -static expert_field ei_union_unknown = EI_INIT; -static expert_field ei_ver_tooold = EI_INIT; -static expert_field ei_ver_toonew = EI_INIT; -static expert_field ei_oloc_both = EI_INIT; -/* static expert_field ei_banner_invalid = EI_INIT; */ -static expert_field ei_sizeillogical = EI_INIT; +static expert_field ei_unused; +static expert_field ei_overrun; +static expert_field ei_tag_unknown; +static expert_field ei_msg_unknown; +static expert_field ei_union_unknown; +static expert_field ei_ver_tooold; +static expert_field ei_ver_toonew; +static expert_field ei_oloc_both; +/* static expert_field ei_banner_invalid; */ +static expert_field ei_sizeillogical; /* Initialize the subtree pointers */ -static gint ett_ceph = -1; -static gint ett_data = -1; -static gint ett_str = -1; -static gint ett_blob = -1; -static gint ett_sockaddr = -1; -static gint ett_entityaddr = -1; -static gint ett_entityname = -1; -static gint ett_EntityName = -1; -static gint ett_entityinst = -1; -static gint ett_kv = -1; -static gint ett_eversion = -1; -static gint ett_objectlocator = -1; -static gint ett_pg = -1; -static gint ett_pg_create = -1; -static gint ett_filepath = -1; -static gint ett_mds_release = -1; -static gint ett_hitset_params = -1; -static gint ett_snapinfo = -1; -static gint ett_pgpool = -1; -static gint ett_pgpool_snap = -1; -static gint ett_pgpool_snapdel = -1; -static gint ett_pgpool_property = -1; -static gint ett_mon_map = -1; -static gint ett_mon_map_address = -1; -static gint ett_osd_peerstat = -1; -static gint ett_featureset = -1; -static gint ett_featureset_name = -1; -static gint ett_compatset = -1; -static gint ett_osd_superblock = -1; -static gint ett_osd_info = -1; -static gint ett_osd_xinfo = -1; -static gint ett_perfstat = -1; -static gint ett_osdstat = -1; -static gint ett_pg_stat = -1; -static gint ett_osd_map = -1; -static gint ett_osd_map_client = -1; -static gint ett_osd_map_pool = -1; -static gint ett_osd_map_poolname = -1; -static gint ett_osd_map_pgtmp = -1; -static gint ett_osd_map_primarytmp = -1; -static gint ett_osd_map_erasurecodeprofile = -1; -static gint ett_osd_map_osd = -1; -static gint ett_osd_map_blacklist = -1; -static gint ett_osd_map_inc = -1; -static gint ett_osd_map_inc_client = -1; -static gint ett_osd_map_inc_osd = -1; -static gint ett_osd_op = -1; -static gint ett_redirect = -1; -static gint ett_statcollection = -1; -static gint ett_paxos = -1; -static gint ett_msg_mon_map = -1; -static gint ett_msg_statfs = -1; -static gint ett_msg_statfsreply = -1; -static gint ett_msg_mon_sub = -1; -static gint ett_msg_mon_sub_item = -1; -static gint ett_msg_mon_sub_flags = -1; -static gint ett_msg_mon_sub_ack = -1; -static gint ett_msg_auth = -1; -static gint ett_msg_auth_supportedproto = -1; -static gint ett_msg_auth_cephx = -1; -static gint ett_msg_authreply = -1; -static gint ett_msg_mon_getversion = -1; -static gint ett_msg_mon_getversionreply = -1; -static gint ett_msg_mds_map = -1; -static gint ett_msg_client_sess = -1; -static gint ett_msg_client_req = -1; -static gint ett_msg_client_reqfwd = -1; -static gint ett_msg_client_reply = -1; -static gint ett_msg_osd_map = -1; -static gint ett_msg_osd_map_inc = -1; -static gint ett_msg_osd_map_full = -1; -static gint ett_msg_osd_op = -1; -static gint ett_msg_osd_opreply = -1; -static gint ett_msg_poolopreply = -1; -static gint ett_msg_poolop = -1; -static gint ett_msg_mon_cmd = -1; -static gint ett_msg_mon_cmd_arg = -1; -static gint ett_msg_mon_cmdack = -1; -static gint ett_msg_mon_cmdack_arg = -1; -static gint ett_msg_poolstats = -1; -static gint ett_msg_poolstatsreply = -1; -static gint ett_msg_poolstatsreply_stat = -1; -static gint ett_msg_mon_election = -1; -static gint ett_msg_mon_paxos = -1; -static gint ett_msg_mon_paxos_value = -1; -static gint ett_msg_mon_probe = -1; -static gint ett_msg_osd_ping = -1; -static gint ett_msg_osd_boot = -1; -static gint ett_msg_pgstats = -1; -static gint ett_msg_pgstats_pgstat = -1; -static gint ett_msg_osd_pg_create = -1; -static gint ett_msg_osd_pg_create_mkpg = -1; -static gint ett_msg_client_caps = -1; -static gint ett_msg_client_caprel = -1; -static gint ett_msg_client_caprel_cap = -1; -static gint ett_msg_timecheck = -1; -static gint ett_msg_timecheck_skew = -1; -static gint ett_msg_timecheck_latency = -1; -static gint ett_head = -1; -static gint ett_foot = -1; -static gint ett_connect = -1; -static gint ett_connect_reply = -1; -static gint ett_filter_data = -1; +static gint ett_ceph; +static gint ett_data; +static gint ett_str; +static gint ett_blob; +static gint ett_sockaddr; +static gint ett_entityaddr; +static gint ett_entityname; +static gint ett_EntityName; +static gint ett_entityinst; +static gint ett_kv; +static gint ett_eversion; +static gint ett_objectlocator; +static gint ett_pg; +static gint ett_pg_create; +static gint ett_filepath; +static gint ett_mds_release; +static gint ett_hitset_params; +static gint ett_snapinfo; +static gint ett_pgpool; +static gint ett_pgpool_snap; +static gint ett_pgpool_snapdel; +static gint ett_pgpool_property; +static gint ett_mon_map; +static gint ett_mon_map_address; +static gint ett_osd_peerstat; +static gint ett_featureset; +static gint ett_featureset_name; +static gint ett_compatset; +static gint ett_osd_superblock; +static gint ett_osd_info; +static gint ett_osd_xinfo; +static gint ett_perfstat; +static gint ett_osdstat; +static gint ett_pg_stat; +static gint ett_osd_map; +static gint ett_osd_map_client; +static gint ett_osd_map_pool; +static gint ett_osd_map_poolname; +static gint ett_osd_map_pgtmp; +static gint ett_osd_map_primarytmp; +static gint ett_osd_map_erasurecodeprofile; +static gint ett_osd_map_osd; +static gint ett_osd_map_blacklist; +static gint ett_osd_map_inc; +static gint ett_osd_map_inc_client; +static gint ett_osd_map_inc_osd; +static gint ett_osd_op; +static gint ett_redirect; +static gint ett_statcollection; +static gint ett_paxos; +static gint ett_msg_mon_map; +static gint ett_msg_statfs; +static gint ett_msg_statfsreply; +static gint ett_msg_mon_sub; +static gint ett_msg_mon_sub_item; +static gint ett_msg_mon_sub_flags; +static gint ett_msg_mon_sub_ack; +static gint ett_msg_auth; +static gint ett_msg_auth_supportedproto; +static gint ett_msg_auth_cephx; +static gint ett_msg_authreply; +static gint ett_msg_mon_getversion; +static gint ett_msg_mon_getversionreply; +static gint ett_msg_mds_map; +static gint ett_msg_client_sess; +static gint ett_msg_client_req; +static gint ett_msg_client_reqfwd; +static gint ett_msg_client_reply; +static gint ett_msg_osd_map; +static gint ett_msg_osd_map_inc; +static gint ett_msg_osd_map_full; +static gint ett_msg_osd_op; +static gint ett_msg_osd_opreply; +static gint ett_msg_poolopreply; +static gint ett_msg_poolop; +static gint ett_msg_mon_cmd; +static gint ett_msg_mon_cmd_arg; +static gint ett_msg_mon_cmdack; +static gint ett_msg_mon_cmdack_arg; +static gint ett_msg_poolstats; +static gint ett_msg_poolstatsreply; +static gint ett_msg_poolstatsreply_stat; +static gint ett_msg_mon_election; +static gint ett_msg_mon_paxos; +static gint ett_msg_mon_paxos_value; +static gint ett_msg_mon_probe; +static gint ett_msg_osd_ping; +static gint ett_msg_osd_boot; +static gint ett_msg_pgstats; +static gint ett_msg_pgstats_pgstat; +static gint ett_msg_osd_pg_create; +static gint ett_msg_osd_pg_create_mkpg; +static gint ett_msg_client_caps; +static gint ett_msg_client_caprel; +static gint ett_msg_client_caprel_cap; +static gint ett_msg_timecheck; +static gint ett_msg_timecheck_skew; +static gint ett_msg_timecheck_latency; +static gint ett_head; +static gint ett_foot; +static gint ett_connect; +static gint ett_connect_reply; +static gint ett_filter_data; static const guint8 *C_BANNER = (const guint8*)"ceph v"; @@ -1520,7 +1520,7 @@ c_pkt_data_init(c_pkt_data *d, packet_info *pinfo, guint off) proto_ceph, off); DISSECTOR_ASSERT_HINT(d->convd, "Frame visited, but no saved state."); /* Make a copy and use that so we don't mess up the original. */ - d->convd = c_conv_data_copy(d->convd, wmem_new(wmem_packet_scope(), c_conv_data)); + d->convd = c_conv_data_copy(d->convd, wmem_new(pinfo->pool, c_conv_data)); } else { @@ -1610,20 +1610,11 @@ void c_set_type(c_pkt_data *data, const char *type) proto_item_append_text(data->item_root, " %s", type); } -static -void c_append_text(c_pkt_data *data, proto_item *ti, const char *fmt, ...) -{ - va_list ap; - char buf[ITEM_LABEL_LENGTH]; - va_start(ap, fmt); - - g_vsnprintf(buf, sizeof(buf), fmt, ap); - - proto_item_append_text(ti, "%s", buf); - proto_item_append_text(data->item_root, "%s", buf); - - va_end(ap); -} +#define c_append_text(data, ti, ...) \ + do { \ + proto_item_append_text(ti, __VA_ARGS__); \ + proto_item_append_text(data->item_root, __VA_ARGS__); \ + } while (0); /** Format a timespec. * @@ -1787,7 +1778,7 @@ guint c_dissect_blob(proto_tree *root, int hf, int hf_data, int hf_len, ti = proto_tree_add_item(root, hf, tvb, off, size+4, ENC_NA); tree = proto_item_add_subtree(ti, ett_data); - proto_item_append_text(ti, ", Size: %"G_GINT32_MODIFIER"u", size); + proto_item_append_text(ti, ", Size: %"PRIu32, size); if (size) { proto_item_append_text(ti, ", Data: %s", @@ -1836,16 +1827,14 @@ guint c_dissect_str(proto_tree *root, int hf, c_str *out, d.str = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, off+4, d.size, ENC_ASCII); - ti = proto_tree_add_string_format_value(root, hf, tvb, off, 4+d.size, - d.str, - "%s", d.str); + ti = proto_tree_add_string(root, hf, tvb, off, 4+d.size, d.str); tree = proto_item_add_subtree(ti, ett_str); proto_tree_add_item(tree, hf_string_size, tvb, off, 4, ENC_LITTLE_ENDIAN); off += 4; proto_tree_add_item(tree, hf_string_data, - tvb, off, d.size, ENC_UTF_8|ENC_NA); + tvb, off, d.size, ENC_UTF_8); off += d.size; if (out) *out = d; @@ -1924,7 +1913,7 @@ guint c_dissect_sockaddr(proto_tree *root, c_sockaddr *out, } off += C_SIZE_SOCKADDR_STORAGE; /* Skip over sockaddr_storage. */ - d.str = wmem_strdup_printf(wmem_packet_scope(), "%s:%"G_GINT16_MODIFIER"u", + d.str = wmem_strdup_printf(wmem_packet_scope(), "%s:%"PRIu16, d.addr_str, d.port); proto_item_append_text(ti, ": %s", d.str); @@ -2015,7 +2004,7 @@ guint c_dissect_entityname(proto_tree *root, int hf, c_entityname *out, } else { - d.slug = wmem_strdup_printf(wmem_packet_scope(), "%s%"G_GINT64_MODIFIER"u", + d.slug = wmem_strdup_printf(wmem_packet_scope(), "%s%"PRIu64, d.type_str, d.id); } @@ -2330,8 +2319,8 @@ guint c_dissect_eversion(proto_tree *root, gint hf, off += 4; proto_item_append_text(ti, - ", Version: %"G_GINT64_MODIFIER"d" - ", Epoch: %"G_GINT32_MODIFIER"d", + ", Version: %"PRId64 + ", Epoch: %"PRId32, ver, epoch); proto_item_set_end(ti, tvb, off); @@ -2354,7 +2343,7 @@ guint c_dissect_object_locator(proto_tree *root, gint hf, off = c_dissect_encoded(tree, &enchdr, 3, 6, tvb, off, data); - proto_item_append_text(ti, ", Pool: %"G_GINT64_MODIFIER"d", + proto_item_append_text(ti, ", Pool: %"PRId64, tvb_get_letohi64(tvb, off)); proto_tree_add_item(tree, hf_pool, tvb, off, 8, ENC_LITTLE_ENDIAN); off += 8; @@ -2382,7 +2371,7 @@ guint c_dissect_object_locator(proto_tree *root, gint hf, if (hash >= 0) { proto_tree_add_item(tree, hf_hash, tvb, off, 8, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti, ", Hash: %"G_GINT64_MODIFIER"d", hash); + proto_item_append_text(ti, ", Hash: %"PRId64, hash); } off += 8; } @@ -2420,19 +2409,19 @@ guint c_dissect_pg(proto_tree *root, gint hf, c_warn_ver(ti2, ver, 1, 1, data); off += 1; - proto_item_append_text(ti, ", Pool: %"G_GINT64_MODIFIER"d", + proto_item_append_text(ti, ", Pool: %"PRId64, tvb_get_letoh64(tvb, off)); proto_tree_add_item(tree, hf_pgid_pool, tvb, off, 8, ENC_LITTLE_ENDIAN); off += 8; - proto_item_append_text(ti, ", Seed: %08"G_GINT32_MODIFIER"X", + proto_item_append_text(ti, ", Seed: %08"PRIX32, tvb_get_letohl(tvb, off)); proto_tree_add_item(tree, hf_pgid_seed, tvb, off, 4, ENC_LITTLE_ENDIAN); off += 4; preferred = tvb_get_letohl(tvb, off); if (preferred >= 0) - proto_item_append_text(ti, ", Prefer: %"G_GINT32_MODIFIER"d", preferred); + proto_item_append_text(ti, ", Prefer: %"PRId32, preferred); proto_tree_add_item(tree, hf_pgid_preferred, tvb, off, 4, ENC_LITTLE_ENDIAN); off += 4; @@ -2501,7 +2490,7 @@ guint c_dissect_path(proto_tree *root, gint hf, off = c_dissect_str(tree, hf_path_rel, &rel, tvb, off); if (inode) - proto_item_append_text(ti, ", Inode: 0x%016"G_GINT64_MODIFIER"u", inode); + proto_item_append_text(ti, ", Inode: 0x%016"PRIu64, inode); if (rel.size) proto_item_append_text(ti, ", Rel: \"%s\"", rel.str); @@ -2558,7 +2547,7 @@ guint c_dissect_mds_release(proto_tree *root, gint hf, off = c_dissect_str(tree, hf_mds_release_dname, NULL, tvb, off); - proto_item_append_text(ti, ", Inode: 0x%016"G_GINT64_MODIFIER"u", inode); + proto_item_append_text(ti, ", Inode: 0x%016"PRIu64, inode); proto_item_set_end(ti, tvb, off); return off; @@ -2654,7 +2643,7 @@ guint c_dissect_snapinfo(proto_tree *root, off = c_dissect_str(tree, hf_snapinfo_name, &name, tvb, off); - proto_item_set_text(ti, ", ID: 0x%016"G_GINT64_MODIFIER"X" + proto_item_set_text(ti, ", ID: 0x%016"PRIX64 ", Name: %s, Date: %s", id, name.str, @@ -3025,12 +3014,12 @@ guint c_dissect_featureset(proto_tree *root, int hf, off = c_dissect_str(subtree, hf_featureset_name_name, &name, tvb, off); - proto_item_append_text(ti2, ", Value: %"G_GINT64_MODIFIER"u, Name: %s", + proto_item_append_text(ti2, ", Value: %"PRIu64", Name: %s", val, name.str); proto_item_set_end(ti2, tvb, off); } - proto_item_append_text(ti, ", Features: 0x%016"G_GINT64_MODIFIER"X", features); + proto_item_append_text(ti, ", Features: 0x%016"PRIX64, features); proto_item_set_end(ti, tvb, off); return off; } @@ -3112,8 +3101,8 @@ guint c_dissect_osd_superblock(proto_tree *root, tvb, off, 4, ENC_LITTLE_ENDIAN); off += 4; - proto_item_append_text(ti, ", Role: %"G_GINT32_MODIFIER"d, Weight: %lf" - ", Boot Epoch: %"G_GINT32_MODIFIER"d", + proto_item_append_text(ti, ", Role: %"PRId32", Weight: %lf" + ", Boot Epoch: %"PRId32, role, weight, epoch); if (enc.version >= 4) { @@ -3424,7 +3413,7 @@ guint c_dissect_osdmap(proto_tree *root, off = c_dissect_pgpool(pooltree, tvb, off, data); - proto_item_append_text(poolti, ", ID: 0x%016"G_GINT64_MODIFIER"X", id); + proto_item_append_text(poolti, ", ID: 0x%016"PRIX64, id); proto_item_set_end(poolti, tvb, off); } @@ -3450,7 +3439,7 @@ guint c_dissect_osdmap(proto_tree *root, off = c_dissect_str(nametree, hf_osdmap_poolname, &name, tvb, off); proto_item_append_text(nameti, - ", ID: 0x%016"G_GINT64_MODIFIER"X, Name: %s", + ", ID: 0x%016"PRIX64", Name: %s", id, name.str); proto_item_set_end(nameti, tvb, off); } @@ -3866,11 +3855,11 @@ guint c_dissect_osd_op(proto_tree *root, gint hf, c_osd_op *out, proto_tree_add_item(tree, hf_osd_op_extent_trunc_seq, tvb, off+24, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti, ", Offset: %"G_GINT64_MODIFIER"u" - ", Size: %"G_GINT64_MODIFIER"u", + proto_item_append_text(ti, ", Offset: %"PRIu64 + ", Size: %"PRIu64, offset, size); if (trunc_seq) - proto_item_append_text(ti, ", Truncate To: %"G_GINT64_MODIFIER"u", + proto_item_append_text(ti, ", Truncate To: %"PRIu64, trunc_size); break; default: @@ -3881,7 +3870,7 @@ guint c_dissect_osd_op(proto_tree *root, gint hf, c_osd_op *out, off += 28; d.payload_size = tvb_get_letohl(tvb, off); - proto_item_append_text(ti, ", Data Length: %"G_GINT32_MODIFIER"d", + proto_item_append_text(ti, ", Data Length: %"PRId32, d.payload_size); proto_tree_add_item(tree, hf_osd_op_payload_size, tvb, off, 4, ENC_LITTLE_ENDIAN); @@ -4444,7 +4433,7 @@ guint c_dissect_msg_mon_sub(proto_tree *root, c_append_text(data, ti, "%s%s", str.str, len? ",":""); - proto_item_append_text(subti, " What: %s, Starting: %"G_GUINT64_FORMAT, + proto_item_append_text(subti, " What: %s, Starting: %"PRIu64, str.str, tvb_get_letoh64(tvb, off)); @@ -4675,7 +4664,7 @@ guint c_dissect_msg_mon_getversion(proto_tree *root, off = c_dissect_str(tree, hf_msg_mon_getversion_what, &what, tvb, off); - c_append_text(data, ti, ", TID: %"G_GINT64_MODIFIER"u, What: %s", + c_append_text(data, ti, ", TID: %"PRIu64", What: %s", tid, what.str); return off; @@ -4719,9 +4708,9 @@ guint c_dissect_msg_mon_getversionreply(proto_tree *root, tvb, off, 8, ENC_LITTLE_ENDIAN); off += 8; - c_append_text(data, ti, ", TID: %"G_GINT64_MODIFIER"u" - ", Version: %"G_GINT64_MODIFIER"u" - ", Oldest Version: %"G_GINT64_MODIFIER"u", + c_append_text(data, ti, ", TID: %"PRIu64 + ", Version: %"PRIu64 + ", Oldest Version: %"PRIu64, tid, ver, veroldest); return off; @@ -4927,8 +4916,8 @@ guint c_dissect_msg_client_reqfwd(proto_tree *root, tvb, off, 1, ENC_LITTLE_ENDIAN); off += 1; - c_append_text(data, ti, ", To: mds%"G_GINT32_MODIFIER"u, Resend: %s, " - "Forwards: %"G_GINT32_MODIFIER"u", + c_append_text(data, ti, ", To: mds%"PRIu32", Resend: %s, " + "Forwards: %"PRIu32, to, resend? "True":"False", fwd); return off; @@ -5032,7 +5021,7 @@ guint c_dissect_msg_osd_map(proto_tree *root, off = c_dissect_osdmap_inc(subtree, tvb, off, data); - proto_item_append_text(ti2, ", For Epoch: %"G_GINT32_MODIFIER"u", epoch); + proto_item_append_text(ti2, ", For Epoch: %"PRIu32, epoch); proto_item_set_end(ti2, tvb, off); } @@ -5055,7 +5044,7 @@ guint c_dissect_msg_osd_map(proto_tree *root, off = c_dissect_osdmap(subtree, tvb, off, data); - proto_item_append_text(ti2, ", For Epoch: %"G_GINT32_MODIFIER"u", epoch); + proto_item_append_text(ti2, ", For Epoch: %"PRIu32, epoch); proto_item_set_end(ti2, tvb, off); } @@ -5118,7 +5107,7 @@ guint c_dissect_msg_osd_op(proto_tree *root, off = c_dissect_str(tree, hf_msg_osd_op_oid, &str, tvb, off); opslen = tvb_get_letohs(tvb, off); - c_append_text(data, ti, ", Operations: %"G_GINT32_MODIFIER"d", opslen); + c_append_text(data, ti, ", Operations: %"PRId32, opslen); ti2 = proto_tree_add_item(tree, hf_msg_osd_op_ops_len, tvb, off, 2, ENC_LITTLE_ENDIAN); off += 2; @@ -5329,7 +5318,7 @@ guint c_dissect_msg_poolopreply(proto_tree *root, hf_msg_poolopreply_data, hf_msg_poolopreply_data_size, tvb, off); - c_append_text(data, ti, ", Response Code: %"G_GINT32_MODIFIER"u", code); + c_append_text(data, ti, ", Response Code: %"PRIu32, code); return off; } @@ -5402,7 +5391,7 @@ guint c_dissect_msg_poolop(proto_tree *root, } c_append_text(data, ti, - ", Type: %s, Name: %s, Pool: %"G_GINT32_MODIFIER"d", + ", Type: %s, Name: %s, Pool: %"PRId32, c_poolop_type_string(type), name.str, pool); @@ -5501,7 +5490,7 @@ guint c_dissect_msg_mon_cmd_ack(proto_tree *root, c_warn_size(tree, tvb, off, front_len, data); proto_tree_add_item(tree, hf_msg_mon_cmd_ack_data, - tvb, front_len, data_len, ENC_UTF_8|ENC_NA); + tvb, front_len, data_len, ENC_UTF_8); return front_len+data_len; } @@ -5782,11 +5771,11 @@ guint c_dissect_msg_mon_paxos(proto_tree *root, hf_msg_mon_paxos_val_data, hf_msg_mon_paxos_val_size, tvb, off); - proto_item_append_text(ti2, ", Version: %"G_GINT64_MODIFIER"u", ver); + proto_item_append_text(ti2, ", Version: %"PRIu64, ver); proto_item_set_end(ti2, tvb, off); } - c_append_text(data, ti, ", Op: %s, Proposal Number: %"G_GINT64_MODIFIER"u", + c_append_text(data, ti, ", Op: %s, Proposal Number: %"PRIu64, c_mon_paxos_op_string(op), pn); return off; @@ -6194,8 +6183,8 @@ guint c_dissect_msg_client_caps(proto_tree *root, tvb, front_len, middle_len, ENC_NA); proto_item_append_text(ti, ", Op: %s" - ", Inode: 0x%016"G_GINT64_MODIFIER"X" - ", Relam: 0x%"G_GINT64_MODIFIER"X", + ", Inode: 0x%016"PRIX64 + ", Relam: 0x%"PRIX64, c_cap_op_type_string(op), inode, relam); @@ -6222,7 +6211,7 @@ guint c_dissect_msg_client_caprel(proto_tree *root, tree = proto_item_add_subtree(ti, ett_msg_client_caprel); i = (c_cap_op_type)tvb_get_letohl(tvb, off); - proto_item_append_text(ti, ", Caps: %"G_GINT32_MODIFIER"u", i); + proto_item_append_text(ti, ", Caps: %"PRIu32, i); off += 4; while (i--) { @@ -6287,8 +6276,8 @@ guint c_dissect_msg_timecheck(proto_tree *root, tvb, off, 8, ENC_LITTLE_ENDIAN); off += 8; - c_append_text(data, ti, ", Operation: %s, Epoch: %"G_GINT64_MODIFIER"u" - ", Round: %"G_GINT64_MODIFIER"u", + c_append_text(data, ti, ", Operation: %s, Epoch: %"PRIu64 + ", Round: %"PRIu64, c_timecheck_op_string(op), epoch, round); @@ -6717,7 +6706,7 @@ guint c_dissect_new(proto_tree *tree, if (bansize != C_BANNER_SIZE) /* Note -1 != C_BANNER_SIZE */ return C_INVALID; - proto_tree_add_item(tree, hf_banner, tvb, off, bansize, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_banner, tvb, off, bansize, ENC_ASCII); off += bansize; c_set_type(data, "Connect"); @@ -6865,7 +6854,7 @@ guint c_dissect_pdu(proto_tree *root, break; case C_STATE_SEQ: c_set_type(data, "Sequence Number"); - proto_item_append_text(data->item_root, ", Seq: %"G_GINT64_MODIFIER"u", + proto_item_append_text(data->item_root, ", Seq: %"PRIu64, tvb_get_letoh64(tvb, off)); proto_tree_add_item(tree, hf_seq_new, tvb, off, 8, ENC_LITTLE_ENDIAN); off += 8; @@ -7118,7 +7107,7 @@ proto_register_ceph(void) } }, { &hf_node_type, { "Source Node Type", "ceph.node_type", - FT_UINT8, BASE_HEX, VALS(c_node_type_strings), 0, + FT_UINT32, BASE_HEX, VALS(c_node_type_strings), 0, "The type of source node.", HFILL } }, { &hf_node_nonce, { @@ -7625,17 +7614,17 @@ proto_register_ceph(void) } }, { &hf_pgpool_flag_hashpool, { "Hash Seed and Pool Together", "ceph.pgpool.flag.hashpool", - FT_BOOLEAN, 32, TFS(&tfs_true_false), C_PGPOOL_FLAG_HASHPSPOOL, + FT_BOOLEAN, 32, NULL, C_PGPOOL_FLAG_HASHPSPOOL, NULL, HFILL } }, { &hf_pgpool_flag_full, { "Pool Full", "ceph.pgpool.flag.full", - FT_BOOLEAN, 32, TFS(&tfs_true_false), C_PGPOOL_FLAG_FULL, + FT_BOOLEAN, 32, NULL, C_PGPOOL_FLAG_FULL, NULL, HFILL } }, { &hf_pgpool_flag_fake_ec_pool, { "Fake Erasure-Coded Pool", "ceph.pgpool.flag.fake_ec_pool", - FT_BOOLEAN, 32, TFS(&tfs_true_false), C_PGPOOL_FLAG_FAKE_EC_POOL, + FT_BOOLEAN, 32, NULL, C_PGPOOL_FLAG_FAKE_EC_POOL, NULL, HFILL } }, { &hf_monmap, { @@ -9301,7 +9290,7 @@ proto_register_ceph(void) } }, { &hf_msg_client_req_flags, { "Flags", "ceph.msg.client_req.flags", - FT_UINT8, BASE_HEX, NULL, 0, + FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_msg_client_req_retry, { @@ -9601,7 +9590,7 @@ proto_register_ceph(void) } }, { &hf_msg_osd_opreply_ops_len, { "Operation Count", "ceph.msg.osd_opreply.ops_len", - FT_UINT16, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_msg_osd_opreply_op, { @@ -10506,13 +10495,13 @@ proto_register_ceph(void) proto_register_subtree_array(ett, array_length(ett)); expert_ceph = expert_register_protocol(proto_ceph); expert_register_field_array(expert_ceph, ei, array_length(ei)); + + ceph_handle = register_dissector("ceph", dissect_ceph_old, proto_ceph); } void proto_reg_handoff_ceph(void) { - ceph_handle = create_dissector_handle(dissect_ceph_old, proto_ceph); - heur_dissector_add("tcp", dissect_ceph_heur, "Ceph over TCP", "ceph_tcp", proto_ceph, HEURISTIC_ENABLE); } |