diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-05-31 19:00:28 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-05-31 19:00:28 +0000 |
| commit | 7d17d600b56d4898e41f1120652bfa1c7ba147da (patch) | |
| tree | 948b6c8e811f4b72f6f080aa69cea387c649c245 /epan/dissectors/packet-dcerpc.c | |
| parent | 64a4df1963983d2aa39bb90ed7fda918ac7a898c (diff) | |
Report the operation number in all places where we note that we don't
know about a given operation number.
svn path=/trunk/; revision=49653
Diffstat (limited to 'epan/dissectors/packet-dcerpc.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index c06344ab65..24106f709d 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2552,13 +2552,15 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree, } } - if (!name) - name = "Unknown?!"; - col_set_str(pinfo->cinfo, COL_PROTOCOL, sub_proto->name); - col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", - name, (info->ptype == PDU_REQ) ? "request" : "response"); + if (!name) + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown operation %u %s", + info->call_data->opnum, + (info->ptype == PDU_REQ) ? "request" : "response"); + else + col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", + name, (info->ptype == PDU_REQ) ? "request" : "response"); sub_dissect = (info->ptype == PDU_REQ) ? proc->dissect_rqst : proc->dissect_resp; @@ -2570,7 +2572,11 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree, if (sub_item) { sub_tree = proto_item_add_subtree(sub_item, sub_proto->ett); - proto_item_append_text(sub_item, ", %s", name); + if (!name) + proto_item_append_text(sub_item, ", unknown operation %u", + info->call_data->opnum); + else + proto_item_append_text(sub_item, ", %s", name); } /* @@ -2581,12 +2587,14 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree, proto_tree_add_uint_format(sub_tree, sub_proto->opnum_hf, tvb, 0, 0, info->call_data->opnum, "Operation: %s (%u)", - name, info->call_data->opnum); + name ? name : "Unknown operation", + info->call_data->opnum); else proto_tree_add_uint_format(sub_tree, hf_dcerpc_op, tvb, 0, 0, info->call_data->opnum, "Operation: %s (%u)", - name, info->call_data->opnum); + name ? name : "Unknown operation", + info->call_data->opnum); if ((info->ptype == PDU_REQ) && (info->call_data->rep_frame != 0)) { pi = proto_tree_add_uint(sub_tree, hf_dcerpc_response_in, |