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

[thrift] fix a minor bug; Also: use col_clear() 

Change-Id: I07dc57583f2e78b6b841a7adb5470e57fa314786
Reviewed-on: https://code.wireshark.org/review/8969
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Bill Meier 2015-06-17 15:36:00 -04:00 committed by Anders Broman
parent aa8fcb30a5
commit 4d3abcc9cc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,9 @@ dissect_thrift_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree)
int length = tvb_reported_length(tvb);
guint8 type;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "THRIFT");
col_clear(pinfo->cinfo, COL_INFO);
version = tvb_get_ntohs(tvb, 0);
mtype = tvb_get_guint8(tvb, 3);
str_len = tvb_get_ntohl(tvb, 4);
@ -248,7 +251,6 @@ dissect_thrift_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree)
seq_id,
method_str);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "THRIFT");
col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", val_to_str(mtype, thrift_mtype_vals, "%d"), method_str);
if (tree){
@ -304,7 +306,7 @@ dissect_thrift_heur(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void *d
header = tvb_get_ntohl(tvb, offset);
if ((header & THRIFT_VERSION_1) != THRIFT_VERSION_1){
if ((header & THRIFT_VERSION_MASK) != THRIFT_VERSION_1){
return FALSE;
}