osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert "Temporarily break up complicated expression into a bunch of separate ifs." 

This reverts commit db7c628616.

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>
This commit is contained in:
Peter Wu 2016-12-06 16:31:32 +00:00 committed by Guy Harris
parent 49fcee3fcb
commit 37eead0f60
1 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
epan/dissectors/packet-cops.c
View File

@ -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 {