From a6ee179427d48658040439a96386d3101d9042bc Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 29 Aug 2022 19:19:59 -0700 Subject: conversation: speak of the "conversation key" as just address/port endpoints. It's not a general key for looking up arbitrary conversations - that's what an array of conversation elements is for - it's just a pair of address/port endpoints. (It's not even hijacked for conversations identified by a circuit ID any more.) --- epan/packet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/packet.c') diff --git a/epan/packet.c b/epan/packet.c index 679475cb92..f9c8b908eb 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -590,8 +590,8 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, clear_address(&edt->pi.dst); edt->pi.noreassembly_reason = ""; edt->pi.ptype = PT_NONE; - edt->pi.use_endpoint = FALSE; - edt->pi.conv_key = NULL; + edt->pi.use_conv_addr_port_endpoints = FALSE; + edt->pi.conv_addr_port_endpoints = NULL; edt->pi.conv_elements = NULL; edt->pi.p2p_dir = P2P_DIR_UNKNOWN; edt->pi.link_dir = LINK_DIR_UNKNOWN; @@ -664,8 +664,8 @@ dissect_file(epan_dissect_t *edt, wtap_rec *rec, clear_address(&edt->pi.dst); edt->pi.noreassembly_reason = ""; edt->pi.ptype = PT_NONE; - edt->pi.use_endpoint = FALSE; - edt->pi.conv_key = NULL; + edt->pi.use_conv_addr_port_endpoints = FALSE; + edt->pi.conv_addr_port_endpoints = NULL; edt->pi.conv_elements = NULL; edt->pi.p2p_dir = P2P_DIR_UNKNOWN; edt->pi.link_dir = LINK_DIR_UNKNOWN; -- cgit v1.2.3