osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

glusterfs: Add support for getvolumeinfo procedure 

Bug: 14347
Change-Id: Ib8fcaa5f0af06d1f1141dbb51696d88fde7d71ba
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: https://code.wireshark.org/review/25335
Tested-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Prashanth Pai 2018-01-16 14:42:42 +05:30 committed by Dario Lombardo
parent a6e64bfc78
commit dcacea5c15
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-gluster.h
View File

@ -251,7 +251,7 @@ enum gf_brick_procnum {
GF_BRICK_MAXVALUE
};
/* GLUSTER_HNDSK_PROGRAM for nersion 1 and 2*/
/* GLUSTER_HNDSK_PROGRAM for version 1 and 2*/
enum gluster_prog_hndsk_procs {
GF_HNDSK_NULL = 0,
GF_HNDSK_SETVOLUME,
@ -259,6 +259,7 @@ enum gluster_prog_hndsk_procs {
GF_HNDSK_PING,
GF_HNDSK_SET_LK_VER,
GF_HNDSK_EVENT_NOTIFY,
GF_HNDSK_GET_VOLUME_INFO,
GF_HNDSK_MAXVALUE
};

32
epan/dissectors/packet-glusterfs_hndsk.c
View File

@ -55,6 +55,7 @@ static gint hf_gluster_hndsk_spec = -1; /* GETSPEC Reply */
static gint hf_gluster_hndsk_key = -1; /* GETSPEC Call */
static gint hf_gluster_hndsk_event_op = -1; /* EVENT NOTIFY call */
static gint hf_gluster_hndsk_uid = -1; /* LOCK VERSION*/
static gint hf_gluster_hndsk_op_errstr = -1; /* GETVOLUMEINFO */
static gint hf_gluster_hndsk_lk_ver= -1;
static gint hf_gluster_hndsk_flags = -1;
@ -201,6 +202,26 @@ gluster_hndsk_2_event_notify_reply(tvbuff_t *tvb,
return offset;
}
static int
gluster_hndsk_2_get_volume_info_call(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, void* data _U_)
{
return gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, 0);
}
static int
gluster_hndsk_2_get_volume_info_reply(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, void* data)
{
int offset = 0;
offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data);
offset = dissect_rpc_string(tvb, tree, hf_gluster_hndsk_op_errstr, offset,
NULL);
offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict,
offset);
return offset;
}
static int
glusterfs_rpc_dissect_upcall_flags(proto_tree *tree, tvbuff_t *tvb, int offset)
{
@ -300,6 +321,11 @@ static const vsff gluster_hndsk_2_proc[] = {
gluster_hndsk_2_event_notify_call,
gluster_hndsk_2_event_notify_reply
},
{
GF_HNDSK_GET_VOLUME_INFO, "GETVOLUMEINFO",
gluster_hndsk_2_get_volume_info_call,
gluster_hndsk_2_get_volume_info_reply
},
{ 0, NULL, NULL, NULL }
};
@ -317,6 +343,7 @@ static const value_string gluster_hndsk_proc_vals[] = {
{ GF_HNDSK_PING, "PING" },
{ GF_HNDSK_SET_LK_VER, "LOCK VERSION" },
{ GF_HNDSK_EVENT_NOTIFY, "EVENTNOTIFY" },
{ GF_HNDSK_GET_VOLUME_INFO, "GETVOLUMEINFO" },
{ 0, NULL }
};
@ -360,6 +387,11 @@ proto_register_gluster_hndsk(void)
{ &hf_gluster_hndsk_flags,
{ "Flags", "glusterfs.hndsk.flags", FT_UINT32, BASE_OCT,
NULL, 0, NULL, HFILL }
},
/* For handshake getvolumeinfo */
{ &hf_gluster_hndsk_op_errstr,
{ "Op Errstr", "glusterfs.hndsk.getvolumeinfo.op_errstr", FT_STRING,
BASE_NONE, NULL, 0, NULL, HFILL }
}
};