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.)

4 files changed, 11 insertions, 10 deletions

diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c
index 8f58392bc4..e3060bff0b 100644
--- a/epan/dissectors/packet-dvb-s2-bb.c
+++ b/epan/dissectors/packet-dvb-s2-bb.c
@@ -1628,7 +1628,7 @@ static int dissect_dvb_s2_bb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
     if (conv) {
         virtual_id = virtual_stream_lookup(conv, isi);
         /* DVB Base Band streams are unidirectional. Differentiate by direction
-         * for the unlikely case of two streams between the same endpoints in
+         * for the unlikely case of two streams between the same endpointss in
          * the opposite direction.
          */
         if (addresses_equal(&pinfo->src, conversation_key_addr1(conv->key_ptr))) {
@@ -1646,14 +1646,15 @@ static int dissect_dvb_s2_bb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
         subcircuit = conversation_new_by_id(pinfo->num, CONVERSATION_DVBBBF, virtual_id);
     }
 
-    /* conversation_set_elements_by_address_port_pairs() could be useful for the subdissectors
+    /* conversation_set_conv_addr_port_endpoints() could be useful for the subdissectors
      * this calls (whether GSE or TS, and replace passing the packet data
      * below), but it could cause problems when the subdissectors of those
      * subdissectors try and call find_or_create_conversation().
-     * pinfo->use_endpoint doesn't affect reassembly tables in the default
-     * reassembly functions, either. So maybe the eventual approach is
-     * to create an endpoint but set pinfo->use_endpoint back to FALSE, and
-     * also make the GSE and MP2T dissectors more (DVB BBF) endpoint aware,
+     * pinfo->use_conv_addr_port_endpoints doesn't affect reassembly tables
+     * in the default reassembly functions, either. So maybe the eventual
+     * approach is to create a conversation key but set
+     * pinfo->use_conv_addr_port_endpoints back to FALSE, and also make the
+     * GSE and MP2T dissectors more (DVB BBF) conversation key aware,
      * including in their reassembly functions.
      */
 
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 719b027434..bbffb490aa 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -722,9 +722,9 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
     if(!is_ifcp){
         set_address_tvb (&pinfo->dst, AT_FC, 3, tvb, offset+1);
         set_address_tvb (&pinfo->src, AT_FC, 3, tvb, offset+5);
-        conversation_set_elements_by_address_port_pairs(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_EXCHG, 0, 0);
+        conversation_set_conv_addr_port_endpoints(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_EXCHG, 0, 0);
     } else {
-        conversation_set_elements_by_address_port_pairs(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_EXCHG, pinfo->srcport, pinfo->destport);
+        conversation_set_conv_addr_port_endpoints(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_EXCHG, pinfo->srcport, pinfo->destport);
     }
     set_address(&fchdr->d_id, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data);
     set_address(&fchdr->s_id, pinfo->src.type, pinfo->src.len, pinfo->src.data);
diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c
index e31b79aee8..3bad31b0b9 100644
--- a/epan/dissectors/packet-tdmop.c
+++ b/epan/dissectors/packet-tdmop.c
@@ -104,7 +104,7 @@ static int dissect_tdmop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
     offset += 1;
 
     /*conversation*/
-    conversation_set_elements_by_address_port_pairs(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_TDMOP, srcch, dstch);
+    conversation_set_conv_addr_port_endpoints(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_TDMOP, srcch, dstch);
 
     /*flags*/
     proto_tree_add_item(tdmop_tree, hf_tdmop_Flags, tvb, offset, 1, ENC_NA);
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index 2d3bb218cd..e21b52cf40 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -2291,7 +2291,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 		proto_tree_add_item_ret_uint(tipc_tree, hf_tipc_dst_port, tipc_tvb, offset, 4, ENC_BIG_ENDIAN, &destport);
 	}
 
-	conversation_set_elements_by_address_port_pairs(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_TIPC, srcport, destport);
+	conversation_set_conv_addr_port_endpoints(pinfo, &pinfo->src, &pinfo->dst, CONVERSATION_TIPC, srcport, destport);
 
 	offset = offset + 4;
 	/* 20 - 24 Bytes