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

scylla: fix tree sizes and offsets 

The following sizes and offsets were incorrect:
 - negotiation frame size (negotiation header size was used)
 - response frame size (response frame header size was used)
 - request frame size (response(sic!) frame header size was used)
 - mutation subtree offset (resulting in wrong subtree size too)
 - partition key subtree offset (resulting in wrong subtree size too)

Also, negotiation/response frames were not dissected correctly if they were
shorter than request header size (28) - they are correctly handled now.
Additionally, Seastar RPC magic sequence (SSTARRPC) is explicitly
added to the negotiation tree in order to explicitly show each part
of the frame.

Change-Id: Ibc5024b329113e98a363cfeb40223d61b9473fb2
Reviewed-on: https://code.wireshark.org/review/37186
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
This commit is contained in:
Piotr Sarna 2020-05-13 08:08:06 +02:00 committed by Martin Mathieson
parent da8c28dc67
commit 90d1a9de43
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
epan/dissectors/packet-scylla.c
View File

@ -55,6 +55,7 @@ static int hf_scylla_len = -1;
static int hf_scylla_response = -1;
static int hf_scylla_response_size = -1;
static int hf_scylla_response_request_frame = -1;
static int hf_scylla_negotiation_magic = -1;
static int hf_scylla_negotiation_size = -1;
static int hf_scylla_payload = -1; // TODO: dissect everything, so that generic "payload" is not needed
@ -192,7 +193,7 @@ looks_like_rpc_negotiation(tvbuff_t *tvb, const gint offset) {
static gboolean
looks_like_response(guint64 verb_type, guint32 len) {
return verb_type > LAST || len > 64*1024*1024;
return verb_type >= LAST || len > 64*1024*1024;
}
typedef struct {
@ -204,11 +205,17 @@ typedef struct {
static guint
get_scylla_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
{
guint64 verb_type = tvb_get_letoh64(tvb, offset + SCYLLA_HEADER_VERB_OFFSET);
guint32 plen = tvb_get_letohl(tvb, offset + SCYLLA_HEADER_LEN_OFFSET);
guint64 verb_type = LAST;
guint32 plen = 0;
if (looks_like_rpc_negotiation(tvb, offset)) {
return tvb_get_letohl(tvb, offset + SCYLLA_NEGOTIATION_LEN_OFFSET) + SCYLLA_NEGOTIATION_SIZE;
} else if (looks_like_response(verb_type, plen)) {
}
if (tvb_reported_length(tvb) >= SCYLLA_HEADER_SIZE) {
plen = tvb_get_letohl(tvb, offset + SCYLLA_HEADER_LEN_OFFSET);
verb_type = tvb_get_letoh64(tvb, offset + SCYLLA_HEADER_VERB_OFFSET);
}
if (looks_like_response(verb_type, plen)) {
return tvb_get_letohl(tvb, offset + SCYLLA_RESPONSE_LEN_OFFSET) + SCYLLA_RESPONSE_SIZE;
}
return plen + SCYLLA_HEADER_SIZE;
@ -218,10 +225,11 @@ static int
dissect_scylla_negotiation_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *scylla_tree)
{
gint offset = 0;
guint32 len = tvb_get_letohl(tvb, offset + SCYLLA_NEGOTIATION_LEN_OFFSET) + SCYLLA_NEGOTIATION_SIZE;
proto_tree *scylla_negotiation_tree = proto_tree_add_subtree(scylla_tree, tvb, offset,
SCYLLA_NEGOTIATION_SIZE, ett_scylla_negotiation, NULL, "Protocol negotiation");
guint32 len = tvb_get_letohl(tvb, offset + SCYLLA_NEGOTIATION_LEN_OFFSET);
len, ett_scylla_negotiation, NULL, "Protocol negotiation");
proto_tree_add_item(scylla_negotiation_tree, hf_scylla_negotiation_magic, tvb, offset, 8, ENC_ASCII|ENC_NA);
gint negotiation_offset = 8;
proto_tree_add_item(scylla_negotiation_tree, hf_scylla_negotiation_size, tvb, offset + negotiation_offset, 4, ENC_LITTLE_ENDIAN);
negotiation_offset += 4;
@ -236,22 +244,21 @@ static int
dissect_scylla_response_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *scylla_tree, request_response_t *req_resp)
{
gint offset = 0;
guint32 len = tvb_get_letohl(tvb, offset + SCYLLA_RESPONSE_LEN_OFFSET) + SCYLLA_RESPONSE_SIZE;
/* Add response subtree */
proto_item *response_ti = proto_tree_add_string_format(scylla_tree, hf_scylla_response,
tvb, offset, SCYLLA_RESPONSE_SIZE,
"", "Response");
tvb, offset, len, "", "Response");
proto_tree *scylla_response_tree = proto_item_add_subtree(response_ti, ett_scylla_response);
gint resp_offset = 0;
guint32 len = tvb_get_letohl(tvb, offset + SCYLLA_RESPONSE_LEN_OFFSET);
guint64 msg_id;
proto_tree_add_item_ret_uint64(scylla_response_tree, hf_scylla_msg_id, tvb, offset + resp_offset, 8, ENC_LITTLE_ENDIAN, &msg_id);
resp_offset += 8;
proto_tree_add_item(scylla_response_tree, hf_scylla_response_size, tvb, offset + resp_offset, 4, ENC_LITTLE_ENDIAN);
resp_offset += 4;
proto_tree_add_item(scylla_response_tree, hf_scylla_payload, tvb, offset + resp_offset, len, ENC_NA);
proto_tree_add_item(scylla_response_tree, hf_scylla_payload, tvb, offset + resp_offset, len - resp_offset, ENC_NA);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Scylla");
if (req_resp) {
@ -282,7 +289,7 @@ dissect_scylla_msg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *scylla_tre
/* Add request subtree */
proto_item *request_ti = proto_tree_add_string_format(scylla_tree, hf_scylla_request,
tvb, offset, SCYLLA_RESPONSE_SIZE,
tvb, offset, SCYLLA_HEADER_SIZE,
"", "Header for %s",
val64_to_str(verb_type, packettypenames, "Unknown (0x%02x)"));
proto_tree *scylla_header_tree = proto_item_add_subtree(request_ti, ett_scylla_response);
@ -302,9 +309,8 @@ dissect_scylla_msg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *scylla_tre
switch (verb_type) {
case MUTATION: {
guint32 mut_len = len - SCYLLA_HEADER_SIZE;
proto_tree* scylla_mut_tree = proto_tree_add_subtree(scylla_tree, tvb, offset,
mut_len, ett_scylla_mut, NULL, "Mutation");
len, ett_scylla_mut, NULL, "Mutation");
gint mut_offset = 0;
guint32 len_keys;
guint32 num_keys;
@ -318,8 +324,8 @@ dissect_scylla_msg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *scylla_tre
mut_offset += 16;
proto_tree_add_item_ret_uint(scylla_mut_tree, hf_scylla_mut_len_pkeys, tvb, offset + mut_offset, 4, ENC_LITTLE_ENDIAN, &len_keys);
mut_offset += 4;
proto_tree* scylla_mut_pkey_tree = proto_tree_add_subtree(scylla_mut_tree, tvb, offset,
mut_len - mut_offset, ett_scylla_mut_pkey, NULL, "Partition key");
proto_tree* scylla_mut_pkey_tree = proto_tree_add_subtree(scylla_mut_tree, tvb, offset + mut_offset,
len - mut_offset, ett_scylla_mut_pkey, NULL, "Partition key");
proto_tree_add_item_ret_uint(scylla_mut_pkey_tree, hf_scylla_mut_num_pkeys, tvb, offset + mut_offset, 4, ENC_LITTLE_ENDIAN, &num_keys);
mut_offset += 4;
guint i;
@ -335,9 +341,8 @@ dissect_scylla_msg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *scylla_tre
}
break;
case READ_DATA: {
guint32 rd_len = len - SCYLLA_HEADER_SIZE;
proto_tree* scylla_read_tree = proto_tree_add_subtree(scylla_tree, tvb, offset,
rd_len, ett_scylla_read_data, NULL, "Read data");
len, ett_scylla_read_data, NULL, "Read data");
gint rd_offset = 0;
proto_tree_add_item(scylla_read_tree, hf_scylla_read_data_timeout, tvb, offset + rd_offset, 4, ENC_LITTLE_ENDIAN);
@ -405,8 +410,17 @@ dissect_scylla_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
proto_item *ti = proto_tree_add_item(tree, proto_scylla, tvb, 0, -1, ENC_NA);
proto_tree *scylla_tree = proto_item_add_subtree(ti, ett_scylla);
guint64 verb_type = tvb_get_letoh64(tvb, offset + SCYLLA_HEADER_VERB_OFFSET);
guint32 len = tvb_get_letohl(tvb, offset + SCYLLA_HEADER_LEN_OFFSET);
guint64 verb_type = LAST;
guint32 len = 0;
if (looks_like_rpc_negotiation(tvb, offset)) {
return dissect_scylla_negotiation_pdu(tvb, pinfo, scylla_tree);
}
if (tvb_reported_length(tvb) >= SCYLLA_HEADER_SIZE) {
verb_type = tvb_get_letoh64(tvb, offset + SCYLLA_HEADER_VERB_OFFSET);
len = tvb_get_letohl(tvb, offset + SCYLLA_HEADER_LEN_OFFSET);
}
conversation = find_or_create_conversation(pinfo);
conv_map = (wmem_map_t *)conversation_get_proto_data(conversation, proto_scylla);
@ -415,9 +429,7 @@ dissect_scylla_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
conversation_add_proto_data(conversation, proto_scylla, conv_map);
}
if (looks_like_rpc_negotiation(tvb, offset)) {
return dissect_scylla_negotiation_pdu(tvb, pinfo, scylla_tree);
} else if (looks_like_response(verb_type, len)) {
if (looks_like_response(verb_type, len)) {
void *req_resp;
guint64 msg_id;
msg_id = tvb_get_letoh64(tvb, offset + SCYLLA_RESPONSE_MSG_ID_OFFSET);
@ -447,7 +459,7 @@ dissect_scylla_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
static int
dissect_scylla(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
tcp_dissect_pdus(tvb, pinfo, tree, scylla_desegment, SCYLLA_HEADER_SIZE,
tcp_dissect_pdus(tvb, pinfo, tree, scylla_desegment, SCYLLA_NEGOTIATION_SIZE,
get_scylla_pdu_len, dissect_scylla_pdu, data);
return tvb_reported_length(tvb);
}
@ -467,6 +479,7 @@ proto_register_scylla(void)
{ &hf_scylla_response, { "response", "scylla.response", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
{ &hf_scylla_response_size, { "response size", "scylla.response.size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_scylla_response_request_frame, { "Request frame", "scylla.response.request", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_REQUEST), 0x0, NULL, HFILL } },
{ &hf_scylla_negotiation_magic, { "negotiation magic sequence", "scylla.negotiation.magic", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
{ &hf_scylla_negotiation_size, { "negotiation size", "scylla.negotiation.size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
// mutation verb
{ &hf_scylla_mut_size1, { "mutation size 1", "scylla.mut.size1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },