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

THRIFT: add dissection of T_MAP 

Change-Id: I58192af77c8e9af94183e5d82d282e22dc91b49e
Reviewed-on: https://code.wireshark.org/review/13659
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jason Heimann 2016-02-02 00:40:28 -08:00 committed by Anders Broman
parent 9c846024fd
commit 8dd13f4520
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
epan/dissectors/packet-thrift.c
View File

@ -49,6 +49,7 @@ static int hf_thrift_i16 = -1;
static int hf_thrift_i32 = -1;
static int hf_thrift_utf7str = -1;
static int hf_thrift_num_list_item = -1;
static int hf_thrift_num_map_item = -1;
static int hf_thrift_bool = -1;
static int hf_thrift_byte = -1;
static int hf_thrift_i64 = -1;
@ -135,6 +136,7 @@ dissect_thrift_list(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int
return offset;
}
static int
dissect_thrift_struct(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int offset, int length)
{
@ -144,8 +146,14 @@ dissect_thrift_struct(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, i
int start_offset = offset, struct_len;
sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, &ti, "Struct");
while (offset < length){
/*Read type and field id */
if (offset >= length) {
/* ensure this function is never a non-op */
return length;
}
while (offset < length) {
/* Read type and field id */
type = tvb_get_guint8(tvb, offset);
proto_tree_add_item(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
@ -163,6 +171,34 @@ dissect_thrift_struct(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, i
return offset;
}
static int
dissect_thrift_map(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int offset, int length)
{
proto_tree *sub_tree;
proto_item *ti;
guint32 ktype;
guint32 vtype;
guint32 map_len;
int start_offset = offset, i;
sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, &ti, "Map");
proto_tree_add_item_ret_uint(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN, &ktype);
offset++;
proto_tree_add_item_ret_uint(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN, &vtype);
offset++;
proto_tree_add_item_ret_uint(sub_tree, hf_thrift_num_map_item, tvb, offset, 4, ENC_BIG_ENDIAN, &map_len);
offset += 4;
for (i = 0; i < (int)map_len; ++i) {
offset = dissect_thrift_type(tvb, pinfo, sub_tree, ktype, offset, length);
offset = dissect_thrift_type(tvb, pinfo, sub_tree, vtype, offset, length);
}
map_len = offset - start_offset;
proto_item_set_len(ti, map_len);
return offset;
}
static int
dissect_thrift_type(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int type, int offset, int length)
{
@ -210,6 +246,10 @@ dissect_thrift_type(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int
/* T_STRUCT */
offset = dissect_thrift_struct(tvb, pinfo, tree, offset, length);
break;
case 13:
/* T_MAP */
offset = dissect_thrift_map(tvb, pinfo, tree, offset, length);
break;
case 15:
/* T_LIST */
offset = dissect_thrift_list(tvb, pinfo, tree, offset, length);
@ -391,6 +431,11 @@ void proto_register_thrift(void) {
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_thrift_num_map_item,
{ "Number of Map Items", "thrift.num_map_item",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_thrift_bool,
{ "Boolean", "thrift.bool",
FT_UINT8, BASE_DEC, VALS(thrift_bool_vals), 0x0,