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

Mark RPC fragments as such in the Protocol and Info columns. 

Otherwise, they just look like TCP segments.

Change-Id: I2f7601316012811d64c903bf3b2ff4ac4c8f6ce2
Reviewed-on: https://code.wireshark.org/review/13864
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-02-09 20:44:41 -08:00
parent 8bb1e58cbc
commit f00a5003cb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/dissectors/packet-rpc.c
View File

@ -3484,6 +3484,8 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
* Show it as a record marker plus data, under * Show it as a record marker plus data, under
* a top-level tree for this protocol. * a top-level tree for this protocol.
*/ */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC");
col_set_str(pinfo->cinfo, COL_INFO, "Fragment");
make_frag_tree(frag_tvb, tree, proto, ett,rpc_rm); make_frag_tree(frag_tvb, tree, proto, ett,rpc_rm);
/* /*
@ -3551,6 +3553,8 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
* a top-level tree for this protocol, * a top-level tree for this protocol,
* but don't hand it to the dissector * but don't hand it to the dissector
*/ */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC");
col_set_str(pinfo->cinfo, COL_INFO, "Fragment");
make_frag_tree(frag_tvb, tree, proto, ett, rpc_rm); make_frag_tree(frag_tvb, tree, proto, ett, rpc_rm);
/* /*
@ -3581,6 +3585,8 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
* a top-level tree for this protocol, * a top-level tree for this protocol,
* but don't show it to the dissector. * but don't show it to the dissector.
*/ */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC");
col_set_str(pinfo->cinfo, COL_INFO, "Fragment");
make_frag_tree(frag_tvb, tree, proto, ett, rpc_rm); make_frag_tree(frag_tvb, tree, proto, ett, rpc_rm);
/* /*
@ -3858,12 +3864,13 @@ dissect_rpc_tcp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break; break;
} }
/* Set a fence so whatever the subdissector put in the /* Set fences so whatever the subdissector put in the
* Info column stays there. This is useful when the * Protocol and Info columns stay there. This is useful
* subdissector clears the column (which it might have to do * when the subdissector clears the column (which it
* if it runs over some other protocol too) and there are * might have to do if it runs over some other protocol
* multiple PDUs in one frame. * too) and there are multiple PDUs in one frame.
*/ */
col_set_fence(pinfo->cinfo, COL_PROTOCOL);
col_set_fence(pinfo->cinfo, COL_INFO); col_set_fence(pinfo->cinfo, COL_INFO);
/* PDU tracking /* PDU tracking