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

coap: Add items for block payload and block length 

Add items for block_payload and block_length to be used for block
analysis when reassembly is not complete.

Change-Id: I969cac9a50903431c727a2fc424eca464f0167d7
Reviewed-on: https://code.wireshark.org/review/37622
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2020-06-30 19:26:36 +02:00
parent 47a1b736bd
commit 90d63ba075
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/dissectors/packet-coap.c
View File

@ -58,6 +58,9 @@ static int hf_coap_oscore_kid = -1;
static int hf_coap_oscore_kid_context = -1;
static int hf_coap_oscore_piv = -1;
static int hf_block_payload = -1;
static int hf_block_length = -1;
static int hf_blocks = -1;
static int hf_block = -1;
static int hf_block_overlap = -1;
@ -1417,6 +1420,13 @@ dissect_coap_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
dissect_coap_payload(tvb, pinfo, coap_tree, parent_tree, offset, coap_length,
code_class, coinfo, &dissect_coap_hf, FALSE);
} else {
proto_item *it;
proto_tree_add_bytes_format(coap_tree, hf_block_payload, tvb, offset,
coap_length - offset, NULL, "Block Payload");
it = proto_tree_add_uint(coap_tree, hf_block_length, tvb, offset, 0, coap_length - offset);
proto_item_set_generated(it);
fragment_head *frag_msg = fragment_add_seq_check(&coap_block_reassembly_table, tvb, offset,
pinfo, 0, NULL, coinfo->block_number,
coap_length - offset, coinfo->block_mflag);
@ -1532,6 +1542,16 @@ proto_register_coap(void)
{ "OSCORE Partial IV", "coap.oscore_piv", FT_BYTES, BASE_NONE, NULL, 0x0,
"Matched OSCORE Partial IV", HFILL }
},
{ &hf_block_payload,
{ "Block Payload", "coap.block_payload",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_block_length,
{ "Block Length", "coap.block_length",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_blocks,
{ "Blocks", "coap.blocks",
FT_NONE, BASE_NONE, NULL, 0x00,