diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-07-06 04:13:54 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-07-06 04:13:54 +0000 |
| commit | a13bf525a85936cbed5ebebf2b986faf20435521 (patch) | |
| tree | d54968c08c6b9498169d365b9b967efe80967f86 /epan/dissectors/packet-rpc.c | |
| parent | 3bef8584a480998ea588098f180ea5cc14ce3f96 (diff) | |
From Ian Schorr:
NFSv4 usability enhancements (Info column summaries, filterable fields).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4975
svn path=/trunk/; revision=33442
Diffstat (limited to 'epan/dissectors/packet-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 51300e0b60..9da6edb4f6 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -2062,15 +2062,22 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "Procedure: %s (%u)", procname, proc); } + /* Print the program version, procedure name, and message type (call or reply). */ if (check_col(pinfo->cinfo, COL_INFO)) { if (first_pdu) col_clear(pinfo->cinfo, COL_INFO); else col_append_str(pinfo->cinfo, COL_INFO, " ; "); - col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s %s", - vers, - procname, - msg_type_name); + /* Special case for NFSv4 - if the type is COMPOUND, do not print the procedure name */ + if (vers==4 && prog==NFS_PROGRAM && !strcmp(procname, "COMPOUND")) + col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s", + vers, + msg_type_name); + else + col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s %s", + vers, + procname, + msg_type_name); } /* Keep track of the address whence the call came, and the @@ -2268,15 +2275,22 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } + /* Print the program version, procedure name, and message type (call or reply). */ if (check_col(pinfo->cinfo, COL_INFO)) { if (first_pdu) col_clear(pinfo->cinfo, COL_INFO); else col_append_str(pinfo->cinfo, COL_INFO, " ; "); - col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s %s", - vers, - procname, - msg_type_name); + /* Special case for NFSv4 - if the type is COMPOUND, do not print the procedure name */ + if (vers==4 && prog==NFS_PROGRAM && !strcmp(procname, "COMPOUND")) + col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s", + vers, + msg_type_name); + else + col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s %s", + vers, + procname, + msg_type_name); } if (rpc_tree) { |