diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-05-27 08:25:55 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-27 13:30:32 +0000 |
| commit | b3514e84849fb6a33b8b7dda486ea1774b1b4cc5 (patch) | |
| tree | 5d565d27a344e72d5360fdd4e6e3da8b1799eb1f /epan | |
| parent | 19c0b8bbfd9712ff3182a119f5daeac33a7732d5 (diff) | |
Create a "placeholder" NFS CB protocol for ONC-RPC stats.
In GTK GUI, "NFS" shows up twice in the ONC-RPC Service Response Time
Programs list. That's probably confusing enough to users. In Qt
the "second" NFS wasn't showing up at all (or getting overwritten)
because it was hashing on program name.
Make NFS programs unique with a "stubbed" protocol.
Bug: 12478
Change-Id: Ic4ebdab8ba8b70e6026e1fb0f8e8defd4532b0f2
Reviewed-on: https://code.wireshark.org/review/15587
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-nfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index f69d258c24..07bc25b4cd 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -55,6 +55,7 @@ static int proto_nfs_ontap_gx_v3 = -1; static int proto_nfs_celerra_vnx = -1; static int proto_nfs_gluster = -1; static int proto_nfs_dcache = -1; +static int proto_nfs_cb = -1; static int hf_nfs_access_check = -1; static int hf_nfs_access_supported = -1; static int hf_nfs_access_rights = -1; @@ -13884,6 +13885,9 @@ proto_register_nfs(void) proto_nfs_gluster = proto_register_protocol("GLUSTER", "gluster", "nfs.gluster"); proto_nfs_dcache = proto_register_protocol("dCache", "dcache", "nfs.dcache"); + /* "protocols" registered just for ONC-RPC Service Response Time */ + proto_nfs_cb = proto_register_protocol("Network File System CB", "NFS CB", "nfs.cb"); + proto_register_field_array(proto_nfs, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_nfs = expert_register_protocol(proto_nfs); @@ -13943,7 +13947,7 @@ proto_reg_handoff_nfs(void) G_N_ELEMENTS(nfs_vers_info), nfs_vers_info); /* Register the CB protocol as RPC */ - rpc_init_prog(proto_nfs, NFS_CB_PROGRAM, ett_nfs, + rpc_init_prog(proto_nfs_cb, NFS_CB_PROGRAM, ett_nfs, G_N_ELEMENTS(nfs_cb_vers_info), nfs_cb_vers_info); fhandle_handle = create_dissector_handle(dissect_fhandle_data_SVR4, proto_nfs_svr4); |