aboutsummaryrefslogtreecommitdiffstats
path: root/epan/packet.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2022-08-29 19:19:59 -0700
committerGuy Harris <gharris@sonic.net>2022-08-29 19:19:59 -0700
commita6ee179427d48658040439a96386d3101d9042bc (patch)
tree15d7bf01909c9f19a42b5573df30c6d6c21b1fba /epan/packet.c
parent5243ffa4c292ed3b1277f86dd2a9d5b8aaf74312 (diff)
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.)
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c8
1 files changed, 4 insertions, 4 deletions
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;