diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2018-08-01 11:14:30 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-08-01 17:22:06 +0000 |
| commit | 925baf8c8c8883d072f58562b5a3e4c3d824e7b5 (patch) | |
| tree | 9acd72fba406f83475ef6ff1e3f427bc80ff1348 /epan/dissectors/file-rfc7468.c | |
| parent | 5ee4b03c33b749c2cc3c6aa0cb22e8ccf0dbd3b3 (diff) | |
rfc7468: Usability improvements
Put base64 decoded data on top level tree. Set COL_PROTOCOL and
add label to COL_INFO.
Change-Id: Iea68523c9b2cee0f62fd86510c216b9c00f39f2a
Reviewed-on: https://code.wireshark.org/review/28921
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/file-rfc7468.c')
| -rw-r--r-- | epan/dissectors/file-rfc7468.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/file-rfc7468.c b/epan/dissectors/file-rfc7468.c index 8ce58145bf..7688cc7f7b 100644 --- a/epan/dissectors/file-rfc7468.c +++ b/epan/dissectors/file-rfc7468.c @@ -144,6 +144,8 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data rfc7468_item = proto_tree_add_item(tree, proto_rfc7468, tvb, offset, -1, ENC_NA); rfc7468_tree = proto_item_add_subtree(rfc7468_item, ett_rfc7468); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "rfc7468"); + /* * First, process the text lines prior to the pre-encapsulation * boundary; they're explanatory text lines. @@ -200,6 +202,8 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_tree_add_item(preeb_tree, hf_rfc7468_preeb_label, tvb, offset + preeb_prefix_len, labellen, ENC_ASCII|ENC_NA); + col_add_fstr(pinfo->cinfo, COL_INFO, "Label: %s", label); + /* * Step to the next line. */ @@ -324,13 +328,13 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data * Try to decode it based on the label. */ if (dissector_try_string(rfc7468_label_table, label, data_tvb, pinfo, - rfc7468_tree, NULL) == 0) { + tree, NULL) == 0) { proto_tree *data_tree; /* * No known dissector; decode it as BER. */ - ti = proto_tree_add_item(rfc7468_tree, hf_rfc7468_ber_data, data_tvb, 0, -1, ENC_NA); + ti = proto_tree_add_item(tree, hf_rfc7468_ber_data, data_tvb, 0, -1, ENC_NA); data_tree = proto_item_add_subtree(ti, ett_rfc7468_data); call_dissector(ber_handle, data_tvb, pinfo, data_tree); } |