split call id's with a #, if more than one DCE/RPC call is in a data PDU

svn path=/trunk/; revision=15841

diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 9fdd82c9de77f164cd92e8d54b08f601d06a436b..7b37127fadee4134fe45bfd71b9303e1d15407b1 100644 (file)
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -3880,7 +3880,13 @@ dissect_dcerpc_cn (tvbuff_t *tvb, int offset, packet_info *pinfo,
     offset += 4;
 
     if (check_col (pinfo->cinfo, COL_DCE_CALL)) {
-        col_append_fstr (pinfo->cinfo, COL_DCE_CALL, "%u", hdr.call_id);
+               if(pinfo->dcectxid == 0) {
+                       col_append_fstr (pinfo->cinfo, COL_DCE_CALL, "%u", hdr.call_id);
+               } else {
+                       /* this is not the first DCE-RPC request/response in this (TCP?-)PDU, 
+                        * prepend a delimiter */
+                       col_append_fstr (pinfo->cinfo, COL_DCE_CALL, "#%u", hdr.call_id);
+               }
     }
 
     if (can_desegment && pinfo->can_desegment