epan: Switch some _by_id conversation routines to elements.

Switch the non-endpoint *_by_id conversation routines to use element
lists. Change the ID type from guint32 to guint64. None of them used the
address+port option flag arguments, so remove them.

13 files changed, 33 insertions, 33 deletions

diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c
index 495980d69b..f53a1be397 100644
--- a/epan/dissectors/packet-dvb-s2-bb.c
+++ b/epan/dissectors/packet-dvb-s2-bb.c
@@ -1621,9 +1621,9 @@ static int dissect_dvb_s2_bb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
         virtual_id = isi;
         pinfo->p2p_dir = P2P_DIR_SENT;
     }
-    subcircuit = find_conversation_by_id(pinfo->num, ENDPOINT_DVBBBF, virtual_id, 0);
+    subcircuit = find_conversation_by_id(pinfo->num, ENDPOINT_DVBBBF, virtual_id);
     if (subcircuit == NULL) {
-        subcircuit = conversation_new_by_id(pinfo->num, ENDPOINT_DVBBBF, virtual_id, 0);
+        subcircuit = conversation_new_by_id(pinfo->num, ENDPOINT_DVBBBF, virtual_id);
     }
 
     /* conversation_create_endpoint() could be useful for the subdissectors
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 0a7d4385d3..fbc791fda4 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -4426,7 +4426,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                 break;
             }
             col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Session opened");
-            conv = conversation_new_by_id(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid), 0);
+            conv = conversation_new_by_id(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid));
             /* we always add the resource id immediately after the circuit
                 was created */
             conversation_add_proto_data(conv, proto_dvbci, GUINT_TO_POINTER(res_id));
@@ -4447,7 +4447,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             ssnb = tvb_get_ntohs(tvb, offset+1);
             proto_tree_add_item(sess_tree, hf_dvbci_sess_nb,
                     tvb, offset+1, 2, ENC_BIG_ENDIAN);
-            conv = find_conversation_by_id(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid), 0);
+            conv = find_conversation_by_id(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid));
             if (conv)
                 conv->last_frame = pinfo->num;
             break;
@@ -4464,7 +4464,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     }
 
     if (ssnb && !conv)
-        conv = find_conversation_by_id(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid), 0);
+        conv = find_conversation_by_id(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid));
 
     /* if the packet contains no resource id, we add the cached id from
        the circuit so that each packet has a resource id that can be
diff --git a/epan/dissectors/packet-fpp.c b/epan/dissectors/packet-fpp.c
index ef2b7939c9..41210fac74 100644
--- a/epan/dissectors/packet-fpp.c
+++ b/epan/dissectors/packet-fpp.c
@@ -510,13 +510,13 @@ dissect_preemption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     }
 
     prev_crc = 0;
-    conv = find_conversation_by_id(pinfo->num, ENDPOINT_NONE, interface_id | packet_direction, 0);
+    conv = find_conversation_by_id(pinfo->num, ENDPOINT_NONE, interface_id | packet_direction);
     /* Create a conversation at every SMD-S fragment.
     Find the conversation for every SMD-C fragment.*/
     if (pck_type == FPP_Packet_Init) {
         /* will be used for seeding the crc calculation */
         if (!PINFO_FD_VISITED(pinfo)) {
-            conv = conversation_new_by_id(pinfo->num, ENDPOINT_NONE, interface_id | packet_direction, 0);
+            conv = conversation_new_by_id(pinfo->num, ENDPOINT_NONE, interface_id | packet_direction);
             /* XXX Is this needed? */
             find_conversation_pinfo(pinfo, 0);
         }
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 0ebe797ada..925ea99e29 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -506,7 +506,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       proto_tree_add_uint(fr_tree, hf_fr_dlci, tvb, 0, offset, addr);
     }
 
-    conversation_create_endpoint_by_id(pinfo, ENDPOINT_DLCI, addr, 0);
+    conversation_create_endpoint_by_id(pinfo, ENDPOINT_DLCI, addr);
     col_add_fstr(pinfo->cinfo, COL_INFO, "DLCI %u", addr);
   }
 
diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c
index 9957166d06..298a15b5dd 100644
--- a/epan/dissectors/packet-gsmtap.c
+++ b/epan/dissectors/packet-gsmtap.c
@@ -853,7 +853,7 @@ dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 
 	/* Try to build an identifier of different 'streams' */
 	/* (AFCN _cant_ be used because of hopping */
-	conversation_create_endpoint_by_id(pinfo, ENDPOINT_GSMTAP, (timeslot << 3) | subslot, 0);
+	conversation_create_endpoint_by_id(pinfo, ENDPOINT_GSMTAP, (timeslot << 3) | subslot);
 
 	if (tree) {
 		guint8 channel;
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index fe75c78052..fce306e871 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -395,10 +395,10 @@ init_logical_channel( guint32 start_frame, h223_call_info* call_info, int vc, in
     guint32 circuit_id = circuit_chain_lookup(call_info, vc);
     conversation_t *subcircuit;
     h223_vc_info *vc_info;
-    subcircuit = find_conversation_by_id( start_frame, ENDPOINT_H223, circuit_id, 0);
+    subcircuit = find_conversation_by_id( start_frame, ENDPOINT_H223, circuit_id);
 
     if( subcircuit == NULL ) {
-        subcircuit = conversation_new_by_id( start_frame, ENDPOINT_H223, circuit_id, 0 );
+        subcircuit = conversation_new_by_id( start_frame, ENDPOINT_H223, circuit_id);
 #ifdef DEBUG_H223
         ws_debug("%d: Created new circuit %d for call %p VC %d", start_frame, circuit_id, call_info, vc);
 #endif
@@ -444,7 +444,7 @@ find_or_create_call_info_circ(packet_info * pinfo, endpoint_type etype, guint32
     conversation_t *circ = NULL;
 
     if(etype != ENDPOINT_NONE)
-        circ = find_conversation_by_id( pinfo->num, etype, circuit_id, 0);
+        circ = find_conversation_by_id( pinfo->num, etype, circuit_id);
     if(circ == NULL)
         return NULL;
 
@@ -727,9 +727,9 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo,
     TRY {
         /* update the circuit details before passing to a subdissector */
         guint32 circuit_id = circuit_chain_lookup(call_info, vc);
-        conversation_create_endpoint_by_id(pinfo, ENDPOINT_H223, circuit_id, 0);
+        conversation_create_endpoint_by_id(pinfo, ENDPOINT_H223, circuit_id);
 
-        conversation_t *subcircuit = find_conversation_by_id(pinfo->num, ENDPOINT_H223, circuit_id, 0);
+        conversation_t *subcircuit = find_conversation_by_id(pinfo->num, ENDPOINT_H223, circuit_id);
         proto_tree *vc_tree;
         proto_item *vc_item;
         h223_vc_info *vc_info = NULL;
@@ -793,7 +793,7 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo,
 
     /* restore the original circuit details for future PDUs */
     FINALLY {
-        conversation_create_endpoint_by_id(pinfo, orig_etype, orig_circuit, 0);
+        conversation_create_endpoint_by_id(pinfo, orig_etype, orig_circuit);
     }
     ENDTRY;
 }
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 24f5ffd195..bf67ffdee9 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -815,7 +815,7 @@ static conversation_t *iax2_new_circuit_for_call(packet_info *pinfo, proto_item
   }
 
   conv = conversation_new_by_id(framenum, ENDPOINT_IAX2,
-                    circuit_id, 0);
+                    circuit_id);
 
   conversation_add_proto_data(conv, proto_iax2, iax_call);
 
@@ -867,7 +867,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item *
   iax_call_data *iax_call;
   gboolean       reversed = FALSE;
 
-  dst_conv = find_conversation_by_id(framenum, ENDPOINT_IAX2, dst_circuit_id, 0);
+  dst_conv = find_conversation_by_id(framenum, ENDPOINT_IAX2, dst_circuit_id);
 
   if (!dst_conv) {
 #ifdef DEBUG_HASHING
@@ -997,7 +997,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo,
      * packet.
      */
 
-    src_conv = find_conversation_by_id(pinfo->num, ENDPOINT_IAX2, src_circuit_id, 0);
+    src_conv = find_conversation_by_id(pinfo->num, ENDPOINT_IAX2, src_circuit_id);
 
     if (src_conv) {
       iax_call = (iax_call_data *)conversation_get_proto_data(src_conv, proto_iax2);
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c
index ac7351dc14..d193c965f7 100644
--- a/epan/dissectors/packet-iso14443.c
+++ b/epan/dissectors/packet-iso14443.c
@@ -698,7 +698,7 @@ static int dissect_iso14443_ats(tvbuff_t *tvb, gint offset,
     col_set_str(pinfo->cinfo, COL_INFO, "ATS");
     proto_item_append_text(ti, ": ATS");
 
-    conv = conversation_new_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID, 0);
+    conv = conversation_new_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID);
     conversation_add_proto_data(conv, proto_iso14443, GUINT_TO_POINTER((guint)ISO14443_A));
 
     offset_tl = offset;
@@ -929,7 +929,7 @@ dissect_iso14443_cmd_type_attrib(tvbuff_t *tvb, packet_info *pinfo,
         col_set_str(pinfo->cinfo, COL_INFO, "Response to Attrib");
         proto_item_append_text(ti, ": Response to Attrib");
 
-        conv = conversation_new_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID, 0);
+        conv = conversation_new_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID);
         conversation_add_proto_data(conv, proto_iso14443, GUINT_TO_POINTER((guint)ISO14443_B));
 
         mbli = tvb_get_guint8(tvb, offset) >> 4;
@@ -1107,7 +1107,7 @@ dissect_iso14443_cmd_type_block(tvbuff_t *tvb, packet_info *pinfo,
         guint32 computed_checksum = 0;
         guint flags = PROTO_CHECKSUM_NO_FLAGS;
 
-        conv = find_conversation_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID, 0);
+        conv = find_conversation_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID);
         if (conv)
             t = (iso14443_type_t)GPOINTER_TO_UINT(conversation_get_proto_data(conv, proto_iso14443));
 
@@ -1397,7 +1397,7 @@ static int dissect_iso14443(tvbuff_t *tvb,
 
         /* all events that are not data transfers close the connection
            to the card (e.g. the field is switched on or off) */
-        conv = find_conversation_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID, 0);
+        conv = find_conversation_by_id(pinfo->num, ENDPOINT_ISO14443, ISO14443_CIRCUIT_ID);
         if (conv)
             conv->last_frame = pinfo->num;
     }
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index e176149376..0679afca4a 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -10403,7 +10403,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
         isup_tree = proto_item_add_subtree(ti, ett_isup);
         proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic);
       }
-      conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISUP, cic, 0);
+      conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISUP, cic);
       message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH);
       dissect_ansi_isup_message(message_tvb, pinfo, isup_tree, ISUP_ITU_STANDARD_VARIANT, cic);
       break;
@@ -10452,7 +10452,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
         isup_tree = proto_item_add_subtree(ti, ett_isup);
         proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic);
       }
-      conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISUP, cic, 0);
+      conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISUP, cic);
       message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH);
       dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant, cic);
   }
@@ -10506,7 +10506,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 
   bicc_cic = tvb_get_letohl(tvb, BICC_CIC_OFFSET);
 
-  conversation_create_endpoint_by_id(pinfo, ENDPOINT_BICC, bicc_cic, 0);
+  conversation_create_endpoint_by_id(pinfo, ENDPOINT_BICC, bicc_cic);
 
   col_clear(pinfo->cinfo, COL_INFO);
   if (isup_show_cic_in_info) {
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 1ac5c3c109..424589544c 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -619,7 +619,7 @@ static int dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree,
 
         phdr &= 0x7fff;
 
-        conversation_create_endpoint_by_id(pinfo, ENDPOINT_IUUP, phdr, 0);
+        conversation_create_endpoint_by_id(pinfo, ENDPOINT_IUUP, phdr);
 
         tvb = tvb_new_subset_length(tvb_in,2,len);
     }
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 4f35b609fc..436afe7c8f 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -211,7 +211,7 @@ dissect_k12(tvbuff_t* tvb,packet_info* pinfo,proto_tree* tree, void* data _U_)
 			     * XXX: this is prone to collisions!
 			     * we need an uniform way to manage circuits between dissectors
 			     */
-		conversation_create_endpoint_by_id(pinfo, ENDPOINT_NONE, g_str_hash(circuit_str), 0);
+		conversation_create_endpoint_by_id(pinfo, ENDPOINT_NONE, g_str_hash(circuit_str));
 
 		proto_tree_add_uint(k12_tree, hf_k12_atm_vp, tvb, 0, 0,
 				    pinfo->pseudo_header->k12.input_info.atm.vp);
diff --git a/epan/dissectors/packet-vj-comp.c b/epan/dissectors/packet-vj-comp.c
index 45335572bd..a0d92769da 100644
--- a/epan/dissectors/packet-vj-comp.c
+++ b/epan/dissectors/packet-vj-comp.c
@@ -191,9 +191,9 @@ vjc_find_conversation(packet_info *pinfo, guint32 vjc_cnum, gboolean create)
             return conv;
     }
 
-    conv = find_conversation_by_id(pinfo->num, ENDPOINT_NONE, vjc_cnum, 0);
+    conv = find_conversation_by_id(pinfo->num, ENDPOINT_NONE, vjc_cnum);
     if (!conv && create) {
-        conv = conversation_new_by_id(pinfo->num, ENDPOINT_NONE, vjc_cnum, 0);
+        conv = conversation_new_by_id(pinfo->num, ENDPOINT_NONE, vjc_cnum);
     }
 
     return conv;
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 9a34b9a1b6..68b1b9535d 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -535,7 +535,7 @@ x25_hash_add_proto_start(guint16 vc, guint32 frame, dissector_handle_t dissect)
     /*
      * Is there already a circuit with this VC number?
      */
-    conv = find_conversation_by_id(frame, ENDPOINT_X25, vc, 0);
+    conv = find_conversation_by_id(frame, ENDPOINT_X25, vc);
     if (conv != NULL) {
         /*
          * Yes - close it, as we're creating a new one.
@@ -546,7 +546,7 @@ x25_hash_add_proto_start(guint16 vc, guint32 frame, dissector_handle_t dissect)
     /*
      * Set up a new circuit.
      */
-    conv = conversation_new_by_id(frame, ENDPOINT_X25, vc, 0);
+    conv = conversation_new_by_id(frame, ENDPOINT_X25, vc);
 
     /*
      * Set its dissector.
@@ -562,7 +562,7 @@ x25_hash_add_proto_end(guint16 vc, guint32 frame)
     /*
      * Try to find the circuit.
      */
-    conv = find_conversation_by_id(frame, ENDPOINT_X25, vc, 0);
+    conv = find_conversation_by_id(frame, ENDPOINT_X25, vc);
 
     /*
      * If we succeeded, close it.
@@ -1229,7 +1229,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     modulo = ((bytes0_1 & 0x2000) ? 128 : 8);
     vc     = (int)(bytes0_1 & 0x0FFF);
 
-    conversation_create_endpoint_by_id(pinfo, ENDPOINT_X25, vc, 0);
+    conversation_create_endpoint_by_id(pinfo, ENDPOINT_X25, vc);
 
     if (bytes0_1 & X25_ABIT) toa = TRUE;
     else toa = FALSE;