osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

couchbase: detect XERROR responses and dissect them as JSON 

Change-Id: Ia2565090f8dc30e17cd6a16614136d237577d282
Reviewed-on: https://code.wireshark.org/review/23535
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Sergey Avseyev 2017-09-14 13:37:42 +03:00 committed by Michael Mann
parent afb9ff7982
commit c52a702ae8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-couchbase.c
View File

@ -1917,6 +1917,15 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
}
static gboolean
is_xerror(guint8 datatype, guint16 status)
{
if ((datatype & DT_JSON) && status != PROTOCOL_BINARY_RESPONSE_SUBDOC_MULTI_PATH_FAILURE) {
return TRUE;
}
return FALSE;
}
static int
dissect_couchbase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
@ -2030,7 +2039,7 @@ dissect_couchbase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
} else if (bodylen) {
proto_tree_add_item(couchbase_tree, hf_value, tvb, offset, bodylen,
ENC_ASCII | ENC_NA);
if (status == PROTOCOL_BINARY_RESPONSE_NOT_MY_VBUCKET) {
if (status == PROTOCOL_BINARY_RESPONSE_NOT_MY_VBUCKET || is_xerror(datatype, status)) {
tvbuff_t *json_tvb;
json_tvb = tvb_new_subset_length_caplen(tvb, offset, bodylen, bodylen);
call_dissector(json_handle, json_tvb, pinfo, couchbase_tree);