diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-12-06 16:31:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-12-07 21:58:38 +0000 |
| commit | 37eead0f603e8129702384a0798410d6c0b0884b (patch) | |
| tree | 5c7d4af4d3d7559c9417054377fadc909b1704b1 /epan/dissectors/packet-cops.c | |
| parent | 49fcee3fcb997036f8677af081a5cbecab7c07e0 (diff) | |
Revert "Temporarily break up complicated expression into a bunch of separate ifs."
This reverts commit db7c6286169015a727024e86eb270722127125bb.
As pointed out in bug 13044, the warning is really coming from checking
"cops_call->solicited", no need to expand the whole expression.
Ping-Bug: 13044
Change-Id: Ib376ce6d0ec9fcf896e6081adae7664f19d9f759
Reviewed-on: https://code.wireshark.org/review/19115
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 10a663d7ba..f441402888 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1099,7 +1099,6 @@ DISSECTOR_ASSERT(cops_call->magic == 0xbeeff00d); if (nstime_cmp(&pinfo->abs_ts, &cops_call->req_time) <= 0 || cops_call->rsp_num != 0) continue; -#if 0 if ( ( (cops_call->op_code == COPS_MSG_REQ) && (op_code == COPS_MSG_DEC && is_solicited) ) || @@ -1118,68 +1117,6 @@ DISSECTOR_ASSERT(cops_call->magic == 0xbeeff00d); cops_call->rsp_num = pinfo->num; break; } -#else - if (cops_call->op_code == COPS_MSG_REQ) { - if (op_code == COPS_MSG_DEC) { - if (is_solicited) { - cops_call->rsp_num = pinfo->num; - break; - } - } - } - else if (cops_call->op_code == COPS_MSG_DEC) { - if (op_code == COPS_MSG_RPT) { - if (is_solicited) { - cops_call->rsp_num = pinfo->num; - break; - } - } - else if (op_code == COPS_MSG_DRQ) { - if (is_solicited) { - cops_call->rsp_num = pinfo->num; - break; - } - } - } - else if (cops_call->op_code == COPS_MSG_SSQ) { - if (op_code == COPS_MSG_RPT) { - if (is_solicited) { - cops_call->rsp_num = pinfo->num; - break; - } - } - else if (op_code == COPS_MSG_DRQ) { - if (is_solicited) { - cops_call->rsp_num = pinfo->num; - break; - } - } - else if (op_code == COPS_MSG_SSC) { - cops_call->rsp_num = pinfo->num; - break; - } - } - else if (cops_call->op_code == COPS_MSG_OPN) { - if (op_code == COPS_MSG_CAT) { - cops_call->rsp_num = pinfo->num; - break; - } - else if (op_code == COPS_MSG_CC) { - cops_call->rsp_num = pinfo->num; - break; - } - } - else if (cops_call->op_code == COPS_MSG_KA) { - if (!(cops_call->solicited)) { - if (op_code == COPS_MSG_KA) { - if (is_solicited) { - cops_call->rsp_num = pinfo->num; - break; - } - } - } - } -#endif } } else { |