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

Protobuf: add 'preload_protos' preference 

If check the 'preload_protos' on, the .proto files will be loaded
on startup. That make tshark can use 'protobuf fields as wireshark
fields' feature by providing protobuf field name in display filter
(-Y option).

close #17036
This commit is contained in:
Huang Qiangxiong 2020-11-23 23:49:40 +08:00 committed by Wireshark GitLab Utility
parent 358377bd43
commit 4190ddfb7c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-protobuf.c
View File

@ -150,6 +150,7 @@ static gboolean dissect_bytes_as_string = FALSE;
static gboolean old_dissect_bytes_as_string = FALSE;
static gboolean show_details = FALSE;
static gboolean pbf_as_hf = FALSE; /* dissect protobuf fields as header fields of wireshark */
static gboolean preload_protos = FALSE;
enum add_default_value_policy_t {
ADD_DEFAULT_VALUE_NONE,
@ -1950,6 +1951,12 @@ proto_register_protobuf(void)
protobuf_module = prefs_register_protocol(proto_protobuf, proto_reg_handoff_protobuf);
prefs_register_bool_preference(protobuf_module, "preload_protos",
"Load .proto files on startup.",
"Load .proto files when Wireshark starts. By default, the .proto files are loaded only"
" when the Protobuf dissector is called for the first time.",
&preload_protos);
protobuf_search_paths_uat = uat_new("Protobuf Search Paths",
sizeof(protobuf_search_path_t),
"protobuf_search_paths",
@ -2059,6 +2066,9 @@ proto_reg_handoff_protobuf(void)
update_header_fields( /* if bytes_as_string preferences changed, we force reload header fields */
(old_dissect_bytes_as_string && !dissect_bytes_as_string) || (!old_dissect_bytes_as_string && dissect_bytes_as_string)
);
} else if (preload_protos) {
protobuf_dissector_called = TRUE;
protobuf_reinit(PREFS_UPDATE_ALL);
}
old_dissect_bytes_as_string = dissect_bytes_as_string;
dissector_add_string("grpc_message_type", "application/grpc", protobuf_handle);