Skip to content

Draft: epan: Ressurect some really old, dead conversation code.

Gerald Combs requested to merge geraldcombs/wireshark:conversation-dead-code into master

As #8010 points out, we have dead code whereever we have

if (!(conversation->options & NO_ADDR_B) ...

or

if (!(conversation->options & NO_PORT_B) ...

since at those points "conversation" points to entries in one of the "no_addr2" or "no_port2" tables.

The suggested fix is to check the search options instead of the conversation options. We originally did that, but commit 6bdffa49 switched to conversation options.

Partially revert 6bdffa49 to revive the dead code and use non-negative logic where we can.

Fixes #8010.

Edited by Gerald Combs

Merge request reports