diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-01 14:45:03 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-01 14:45:03 +0000 |
| commit | 0334c5b425d185635f2654e21c5fb06aff197311 (patch) | |
| tree | 7b7885391055681dfc03ffc44bdb53a8171a89dd /epan/dissectors/packet-dcerpc-frstrans.c | |
| parent | c6371f0f6d31a42d2cd8a918a96775cf430667e9 (diff) | |
Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804).
I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here.
I will be sending the "PIDL source" (non dissector files) to the samba team.
svn path=/trunk/; revision=52313
Diffstat (limited to 'epan/dissectors/packet-dcerpc-frstrans.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-frstrans.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index de8e08c7a1..0c693f05e5 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -1584,7 +1584,7 @@ frstrans_dissect_CheckConnectivity_response(tvbuff_t *tvb _U_, int offset _U_, p pinfo->dcerpc_procedure_name="CheckConnectivity"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1688,7 +1688,7 @@ frstrans_dissect_EstablishConnection_response(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1738,7 +1738,7 @@ frstrans_dissect_EstablishSession_response(tvbuff_t *tvb _U_, int offset _U_, pa pinfo->dcerpc_procedure_name="EstablishSession"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -1953,7 +1953,7 @@ frstrans_dissect_RequestUpdates_response(tvbuff_t *tvb _U_, int offset _U_, pack offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2045,7 +2045,7 @@ frstrans_dissect_RequestVersionVector_response(tvbuff_t *tvb _U_, int offset _U_ pinfo->dcerpc_procedure_name="RequestVersionVector"; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2110,7 +2110,7 @@ frstrans_dissect_AsyncPoll_response(tvbuff_t *tvb _U_, int offset _U_, packet_in offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; @@ -2445,7 +2445,7 @@ frstrans_dissect_InitializeFileTransferAsync_response(tvbuff_t *tvb _U_, int off offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_frstrans_werror, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown DOS error 0x%08x")); return offset; |