DVB-CI: Convert circuit API to conversation API

Add the few necessary conversation APIs to make conversion possible.

Change-Id: I775f23005c48cacd2be342bdc704af4738f0789c
Reviewed-on: https://code.wireshark.org/review/24310
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 3d39723013cbe00fa4872ea36daaef6815f92892..7a641ee7bccbbba4f3fb879c9403b259ff11b343 100644 (file)
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -162,6 +162,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
  conversation_key_port1@Base 2.5.0
  conversation_key_port2@Base 2.5.0
  conversation_new@Base 1.9.1
+ conversation_new_simple@Base 2.5.0
  conversation_pt_to_endpoint_type@Base 2.5.0
  conversation_set_dissector@Base 1.9.1
  conversation_set_dissector_from_frame_number@Base 2.0.0
@@ -601,6 +602,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
  find_capture_dissector@Base 2.3.0
  find_circuit@Base 1.9.1
  find_conversation@Base 1.9.1
+ find_conversation_simple@Base 2.5.0
  find_conversation_pinfo@Base 2.5.0
  find_conversation_filter@Base 2.0.0
  find_depend_dissector_list@Base 2.1.0

diff --git a/epan/address.h b/epan/address.h
index 90dcb29d8712a034e673a31c4d07f45f15652a01..e871bca1ecc0612bba9e0df5148d97d6d0af17b6 100644 (file)
--- a/epan/address.h
+++ b/epan/address.h
@@ -380,7 +380,6 @@ typedef enum {
     CT_IAX2,            /* IAX2 call id */
     CT_H223,            /* H.223 logical channel number */
     CT_BICC,            /* BICC Circuit identifier */
-    CT_DVBCI,           /* DVB-CI session number|transport connection id */
     CT_ISO14443         /* ISO14443 connection between terminal and card
                            the circuit ID is always 0, there's only one
                            such connection */

diff --git a/epan/conversation.c b/epan/conversation.c
index 30932128751a604e0e621263f6ac1a41a3a1fc1d..38903b1a72195104b863c75a72bad28681e84ef6 100644 (file)
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -645,8 +645,16 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
        }
 
        new_key = wmem_new(wmem_file_scope(), struct conversation_key);
-       copy_address_wmem(wmem_file_scope(), &new_key->addr1, addr1);
-       copy_address_wmem(wmem_file_scope(), &new_key->addr2, addr2);
+       if (addr1 != NULL) {
+               copy_address_wmem(wmem_file_scope(), &new_key->addr1, addr1);
+       } else {
+               clear_address(&new_key->addr1);
+       }
+       if (addr2 != NULL) {
+               copy_address_wmem(wmem_file_scope(), &new_key->addr2, addr2);
+       } else {
+               clear_address(&new_key->addr2);
+       }
        new_key->etype = etype;
        new_key->port1 = port1;
        new_key->port2 = port2;
@@ -673,6 +681,12 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
        return conversation;
 }
 
+conversation_t *conversation_new_simple(const guint32 setup_frame, const endpoint_type etype, const guint32 port1, const guint options)
+{
+       /* Force the lack of an address or port 2 */
+       return conversation_new(setup_frame, NULL, NULL, etype, port1, 0, options | NO_ADDR2 | NO_PORT2);
+}
+
 /*
  * Set the port 2 value in a key.  Remove the original from table,
  * update the options and port values, insert the updated key.
@@ -761,8 +775,16 @@ conversation_lookup_hashtable(wmem_map_t *hashtable, const guint32 frame_num, co
         * We don't make a copy of the address data, we just copy the
         * pointer to it, as "key" disappears when we return.
         */
-       key.addr1 = *addr1;
-       key.addr2 = *addr2;
+       if (addr1 != NULL) {
+               key.addr1 = *addr1;
+       } else {
+               clear_address(&key.addr1);
+       }
+       if (addr2 != NULL) {
+               key.addr2 = *addr2;
+       } else {
+               clear_address(&key.addr2);
+       }
        key.etype = etype;
        key.port1 = port1;
        key.port2 = port2;
@@ -1123,7 +1145,7 @@ find_conversation(const guint32 frame_num, const address *addr_a, const address
                 * (Neither "addr_a" nor "port_a" take part in this lookup.)
                 */
                DPRINT(("trying dest addr:port as source addr:port and wildcarding dest addr:port"));
-               if (addr_a->type == AT_FC)
+               if ((addr_a != NULL) && (addr_a->type == AT_FC))
                        conversation =
                                conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
                                frame_num, addr_b, addr_a, etype, port_a, port_b);
@@ -1165,6 +1187,12 @@ find_conversation(const guint32 frame_num, const address *addr_a, const address
        return NULL;
 }
 
+conversation_t *find_conversation_simple(const guint32 frame, const endpoint_type etype, const guint32 port1, const guint options)
+{
+       /* Force the lack of a address or port B */
+       return find_conversation(frame, NULL, NULL, etype, port1, 0, options|NO_ADDR_B|NO_PORT_B);
+}
+
 void
 conversation_add_proto_data(conversation_t *conv, const int proto, void *proto_data)
 {

diff --git a/epan/conversation.h b/epan/conversation.h
index 6fce0bf8d650eb09460ef55bca07c192a8010545..f6a3581765d9052045f371896df0fdeea2cd97c5 100644 (file)
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -75,7 +75,8 @@ typedef enum {
        ENDPOINT_I2C,
        ENDPOINT_IBQP,                  /* Infiniband QP number */
        ENDPOINT_BLUETOOTH,
-       ENDPOINT_TDMOP
+       ENDPOINT_TDMOP,
+       ENDPOINT_DVBCI
 } endpoint_type;
 
 /**
@@ -130,6 +131,8 @@ extern void conversation_epan_reset(void);
 WS_DLL_PUBLIC conversation_t *conversation_new(const guint32 setup_frame, const address *addr1, const address *addr2,
     const endpoint_type etype, const guint32 port1, const guint32 port2, const guint options);
 
+WS_DLL_PUBLIC conversation_t *conversation_new_simple(const guint32 setup_frame, const endpoint_type etype, const guint32 port1, const guint options);
+
 /**
  * Given two address/port pairs for a packet, search for a conversation
  * containing packets between those address/port pairs.  Returns NULL if
@@ -169,6 +172,8 @@ WS_DLL_PUBLIC conversation_t *conversation_new(const guint32 setup_frame, const
 WS_DLL_PUBLIC conversation_t *find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b,
     const endpoint_type etype, const guint32 port_a, const guint32 port_b, const guint options);
 
+WS_DLL_PUBLIC conversation_t *find_conversation_simple(const guint32 frame, const endpoint_type etype, const guint32 port1, const guint options);
+
 /**  A helper function that calls find_conversation() using data from pinfo
  *  The frame number and addresses are taken from pinfo.
  */

diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 9389e433b8e43b734f64ec8e02900f8e0e939640..fbfb53cca3d914d49a7ed52eb400687333b78a07 100644 (file)
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -33,7 +33,7 @@
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <epan/circuit.h>
+#include <epan/conversation.h>
 #include <epan/dvb_chartbl.h>
 #include <epan/exported_pdu.h>
 #include <epan/reassemble.h>
@@ -445,65 +445,65 @@ typedef struct _apdu_info_t {
     guint16 res_class;
     guint8  res_min_ver;
     void (*dissect_payload)(guint32, gint,
-            tvbuff_t *, gint, circuit_t *, packet_info *, proto_tree *);
+            tvbuff_t *, gint, conversation_t *, packet_info *, proto_tree *);
 } apdu_info_t;
 
 
 static void
 dissect_dvbci_payload_rm(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_ap(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_ca(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_aut(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo _U_, proto_tree *tree);
 static void
 dissect_dvbci_payload_hc(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_dt(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_mmi(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_hlc(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_cup(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_opp(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit _U_,
         packet_info *pinfo, proto_tree *tree);
 static void
 dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit,
+        tvbuff_t *tvb, gint offset, conversation_t *circuit,
         packet_info *pinfo, proto_tree *tree);
 
 
@@ -1840,11 +1840,11 @@ dissect_rating(tvbuff_t *tvb, gint offset,
 /* if there's a dissector for the protocol and target port of our
     lsc connection, store it in the lsc session's circuit */
 static void
-store_lsc_msg_dissector(circuit_t *circuit, guint8 ip_proto, guint16 port)
+store_lsc_msg_dissector(conversation_t *conv, guint8 ip_proto, guint16 port)
 {
     dissector_handle_t msg_handle = NULL;
 
-    if (!circuit)
+    if (!conv)
         return;
 
     if (ip_proto==LSC_TCP)
@@ -1852,14 +1852,14 @@ store_lsc_msg_dissector(circuit_t *circuit, guint8 ip_proto, guint16 port)
     else if (ip_proto==LSC_UDP)
         msg_handle = dissector_get_uint_handle(udp_dissector_table, port);
 
-    circuit_set_dissector(circuit, msg_handle);
+    conversation_set_dissector(conv, msg_handle);
 }
 
 
 /* dissect a connection_descriptor for the lsc resource
    returns its length or -1 for error */
 static gint
-dissect_conn_desc(tvbuff_t *tvb, gint offset,  circuit_t *circuit,
+dissect_conn_desc(tvbuff_t *tvb, gint offset, conversation_t *conv,
         packet_info *pinfo, proto_tree *tree)
 {
     proto_item *ti;
@@ -1938,7 +1938,7 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset,  circuit_t *circuit,
                         udp_port_to_display(wmem_packet_scope(), port));
             }
         }
-        store_lsc_msg_dissector(circuit, ip_proto, port);
+        store_lsc_msg_dissector(conv, ip_proto, port);
 
     } else if (conn_desc_type == CONN_DESC_HOSTNAME) {
         proto_tree_add_item(conn_desc_tree, hf_dvbci_lsc_media_tag,
@@ -1965,7 +1965,7 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset,  circuit_t *circuit,
                         udp_port_to_display(wmem_packet_scope(), port));
             }
         }
-        store_lsc_msg_dissector(circuit, ip_proto, port);
+        store_lsc_msg_dissector(conv, ip_proto, port);
 
         /* everything from here to the descriptor's end is a hostname */
         hostname_len = (offset_body+len_field)-offset;
@@ -2671,7 +2671,7 @@ dissect_res_id(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 /* dissect the body of a resource manager apdu */
 static void
 dissect_dvbci_payload_rm(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     const gchar *tag_str;
@@ -2694,7 +2694,7 @@ dissect_dvbci_payload_rm(guint32 tag, gint len_field,
 
 static void
 dissect_dvbci_payload_ap(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     guint8          menu_str_len;
@@ -2740,7 +2740,7 @@ dissect_dvbci_payload_ap(guint32 tag, gint len_field _U_,
 
 static void
 dissect_dvbci_payload_ca(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     const gchar *tag_str;
@@ -2855,7 +2855,7 @@ dissect_dvbci_payload_ca(guint32 tag, gint len_field,
 
 static void
 dissect_dvbci_payload_aut(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo _U_, proto_tree *tree)
 {
     gint bytes_len;
@@ -2881,7 +2881,7 @@ dissect_dvbci_payload_aut(guint32 tag, gint len_field _U_,
 
 static void
 dissect_dvbci_payload_hc(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     proto_item *pi;
@@ -2983,7 +2983,7 @@ dissect_dvbci_payload_hc(guint32 tag, gint len_field _U_,
 
 static void
 dissect_dvbci_payload_dt(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     nstime_t     resp_intv;
@@ -3045,7 +3045,7 @@ dissect_dvbci_payload_dt(guint32 tag, gint len_field,
 
 static void
 dissect_dvbci_payload_mmi(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     gint            offset_start;
@@ -3222,7 +3222,7 @@ dissect_dvbci_payload_mmi(guint32 tag, gint len_field,
 
 static void
 dissect_dvbci_payload_hlc(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
   guint8 *str;
@@ -3249,7 +3249,7 @@ dissect_dvbci_payload_hlc(guint32 tag, gint len_field _U_,
 
 static void
 dissect_dvbci_payload_cup(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
   guint8      upgrade_type;
@@ -3468,7 +3468,7 @@ dissect_dvbci_exported_sac_msg(
 
 static void
 dissect_dvbci_payload_cc(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     guint8      status;
@@ -3672,7 +3672,7 @@ dissect_dvbci_ami_file_ack(tvbuff_t *tvb, gint offset,
 
 static void
 dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     guint8  app_dom_id_len, init_obj_len;
@@ -3756,7 +3756,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_,
 
 static void
 dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit,
+        tvbuff_t *tvb, gint offset, conversation_t *conv,
         packet_info *pinfo, proto_tree *tree)
 {
     gint                offset_start;
@@ -3782,7 +3782,7 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
             switch(id) {
                 case COMMS_CMD_ID_CONNECT_ON_CHANNEL:
                     conn_desc_len = dissect_conn_desc(tvb, offset,
-                            circuit, pinfo, tree);
+                            conv, pinfo, tree);
                     if (conn_desc_len < 0)
                         break;
                     offset += conn_desc_len;
@@ -3892,8 +3892,8 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
             msg_tvb = tvb_new_subset_remaining(tvb, offset);
             if (!msg_tvb)
                 break;
-            if (dvbci_dissect_lsc_msg && circuit_get_dissector(circuit)) {
-                msg_handle = circuit_get_dissector(circuit);
+            if (dvbci_dissect_lsc_msg && conversation_get_dissector(conv, 0)) {
+                msg_handle = conversation_get_dissector(conv, 0);
                 col_append_str(pinfo->cinfo, COL_INFO, ", ");
                 col_set_fence(pinfo->cinfo, COL_INFO);
                 col_append_str(pinfo->cinfo, COL_PROTOCOL, ", ");
@@ -3913,7 +3913,7 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
 
 static void
 dissect_dvbci_payload_opp(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit _U_,
+        tvbuff_t *tvb, gint offset, conversation_t *conv _U_,
         packet_info *pinfo, proto_tree *tree)
 {
     guint16         nit_loop_len, nit_loop_offset;
@@ -4083,7 +4083,7 @@ dissect_dvbci_payload_opp(guint32 tag, gint len_field _U_,
 
 static void
 dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
-        tvbuff_t *tvb, gint offset, circuit_t *circuit,
+        tvbuff_t *tvb, gint offset, conversation_t *conv,
         packet_info *pinfo, proto_tree *tree)
 {
     gchar   app_id_str[2+16+1]; /* "0x", string of 16 hex digits, trailing 0 */
@@ -4109,16 +4109,16 @@ dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
                          "Ok" : "Error"));
                 proto_tree_add_item(tree, hf_dvbci_sas_sess_state,
                         tvb, offset, 1, ENC_BIG_ENDIAN);
-                if (!circuit)
+                if (!conv)
                     break;
                 if (sas_status == SAS_SESS_STATE_CONNECTED) {
                     msg_handle = dissector_get_string_handle(
                             sas_msg_dissector_table, app_id_str);
                     /* this clears the dissector for msg_handle==NULL */
-                    circuit_set_dissector(circuit, msg_handle);
+                    conversation_set_dissector(conv, msg_handle);
                 }
                 else
-                    circuit_set_dissector(circuit, NULL);
+                    conversation_set_dissector(conv, NULL);
             }
             break;
         case T_SAS_ASYNC_MSG:
@@ -4133,7 +4133,7 @@ dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
                     tvb, offset, 2, ENC_BIG_ENDIAN);
             offset += 2;
             msg_tvb = tvb_new_subset_length(tvb, offset, msg_len);
-            msg_handle = circuit_get_dissector(circuit);
+            msg_handle = conversation_get_dissector(conv, 0);
             if (msg_handle == NULL)
                 msg_handle = data_handle;
             call_dissector(msg_handle, msg_tvb, pinfo, tree);
@@ -4145,7 +4145,7 @@ dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
 
 
 static void
-dissect_dvbci_apdu(tvbuff_t *tvb, circuit_t *circuit,
+dissect_dvbci_apdu(tvbuff_t *tvb, conversation_t *conv,
         packet_info *pinfo, proto_tree *tree, guint8 direction)
 {
     proto_tree  *app_tree;
@@ -4211,9 +4211,8 @@ dissect_dvbci_apdu(tvbuff_t *tvb, circuit_t *circuit,
                 "Invalid APDU length field, length field for %s must be %d", tag_str, ai->len_field);
         return;
     }
-    if (circuit) {
-        apdu_res_id = GPOINTER_TO_UINT(
-                (gpointer)circuit_get_proto_data(circuit, proto_dvbci));
+    if (conv) {
+        apdu_res_id = GPOINTER_TO_UINT(conversation_get_proto_data(conv, proto_dvbci));
 
         ai_res_class_str = val_to_str_const(ai->res_class, dvbci_res_class, "Unknown");
 
@@ -4236,7 +4235,7 @@ dissect_dvbci_apdu(tvbuff_t *tvb, circuit_t *circuit,
             return;
         }
         ai->dissect_payload(
-                tag, len_field, tvb, offset, circuit, pinfo, app_tree);
+                tag, len_field, tvb, offset, conv, pinfo, app_tree);
     }
 }
 
@@ -4249,7 +4248,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     proto_tree        *sess_tree;
     guint8             tag;
     const gchar       *tag_str;
-    circuit_t         *circuit     = NULL;
+    conversation_t    *conv     = NULL;
     proto_item        *pi;
     gint               offset;
     guint32            len_field;
@@ -4323,13 +4322,10 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                 break;
             }
             col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Session opened");
-            circuit = circuit_new(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num);
-            if (circuit) {
-                /* we always add the resource id immediately after the circuit
-                   was created */
-                circuit_add_proto_data(
-                        circuit, proto_dvbci, GUINT_TO_POINTER(res_id));
-            }
+            conv = conversation_new_simple(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid), 0);
+            /* we always add the resource id immediately after the circuit
+                was created */
+            conversation_add_proto_data(conv, proto_dvbci, GUINT_TO_POINTER(res_id));
             break;
         case T_CLOSE_SESSION_REQUEST:
             ssnb = tvb_get_ntohs(tvb, offset);
@@ -4347,9 +4343,9 @@ 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);
-            circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num);
-            if (circuit)
-                close_circuit(circuit, pinfo->num);
+            conv = find_conversation_simple(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid), 0);
+            if (conv)
+                conv->last_frame = pinfo->num;
             break;
         case T_SESSION_NUMBER:
             ssnb = tvb_get_ntohs(tvb, offset);
@@ -4363,23 +4359,22 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             break;
     }
 
-    if (ssnb && !circuit)
-        circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num);
+    if (ssnb && !conv)
+        conv = find_conversation_simple(pinfo->num, ENDPOINT_DVBCI, CT_ID(ssnb, tcid), 0);
 
     /* 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
        used for filtering */
-    if (circuit && !res_id_it) {
+    if (conv&& !res_id_it) {
         /* when a circuit is found, it always contains a valid resource id */
-        res_id = GPOINTER_TO_UINT(
-                (gpointer)circuit_get_proto_data(circuit, proto_dvbci));
+        res_id = GPOINTER_TO_UINT(conversation_get_proto_data(conv, proto_dvbci));
         res_id_it = dissect_res_id(NULL, 0, pinfo, sess_tree, res_id, TRUE);
         PROTO_ITEM_SET_GENERATED(res_id_it);
     }
 
     if (payload_tvb) {
         proto_item_set_len(ti, spdu_len-tvb_reported_length(payload_tvb));
-        dissect_dvbci_apdu(payload_tvb, circuit, pinfo, tree, direction);
+        dissect_dvbci_apdu(payload_tvb, conv, pinfo, tree, direction);
     }
     else {
         proto_item_set_len(ti, spdu_len);