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

DNP3: Add Octet string length to item text 

The Octet string is an outlier amongst DNP3 objects as the variation
doesn't define a specific type of string but the length.

Presiously the length was not displayed in the packet details,
this change adds the length to the object header.
This commit is contained in:
Graham Bloice 2021-07-01 18:55:35 +01:00
parent b8a489e2e3
commit 1ca1473de8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-dnp.c
View File

@ -1719,6 +1719,13 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset,
expert_add_info(pinfo, object_item, &ei_dnp3_unknown_group0_variation);
}
}
else if ((AL_OBJ_GROUP(al_obj) == AL_OBJ_GROUP(AL_OBJ_OCT)) || (AL_OBJ_GROUP(al_obj) == AL_OBJ_GROUP(AL_OBJ_OCT_EVT))) {
/* For octet strings the variation is the length */
object_item = proto_tree_add_uint_format(robj_tree, hf_dnp3_al_obj, tvb, offset, 2, al_obj,
"Object(s): %s (0x%04x), Length: %d",
val_to_str_ext_const(al_obj, &dnp3_al_obj_vals_ext, "Unknown Object\\Variation"),
al_obj, al_oct_len);
}
else {
object_item = proto_tree_add_uint_format(robj_tree, hf_dnp3_al_obj, tvb, offset, 2, al_obj,
"Object(s): %s (0x%04x)",