aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tcp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-10-28 13:26:51 -0400
committerMichael Mann <mmann78@netscape.net>2017-10-28 19:22:24 +0000
commit7dbc520d57b8567738a15f617a11d9b5b70f40a7 (patch)
tree4b39448bd5f2243275f1d0590e0e1f0b4a3469dc /epan/dissectors/packet-tcp.c
parentdb3be9f850446c1a1c4894f5d08d67a370abf94a (diff)
Privatize the conversation_key structure
The intention is to make it more transparent when making a switch to an "endpoint" over address/port combination. Change-Id: Ic424c32095ecb103bcb4f7f4079c549de2c8d9c4 Reviewed-on: https://code.wireshark.org/review/24148 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
-rw-r--r--epan/dissectors/packet-tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 66f2312c09..9ddd88e020 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -1557,9 +1557,9 @@ add_tcp_process_info(guint32 frame_num, address *local_addr, address *remote_add
return;
}
- if (cmp_address(local_addr, &conv->key_ptr->addr1) == 0 && local_port == conv->key_ptr->port1) {
+ if (cmp_address(local_addr, conversation_key_addr1(conv->key_ptr)) == 0 && local_port == conversation_key_port1(conv->key_ptr)) {
flow = &tcpd->flow1;
- } else if (cmp_address(remote_addr, &conv->key_ptr->addr1) == 0 && remote_port == conv->key_ptr->port1) {
+ } else if (cmp_address(remote_addr, conversation_key_addr1(conv->key_ptr)) == 0 && remote_port == conversation_key_port1(conv->key_ptr)) {
flow = &tcpd->flow2;
}
if (!flow || (flow->process_info && flow->process_info->command)) {