aboutsummaryrefslogtreecommitdiffstats
path: root/epan/circuit.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-11-07 17:44:55 -0500
committerAnders Broman <a.broman58@gmail.com>2017-11-08 07:25:25 +0000
commit371b5c526b439824ffd0eb2b11f76689436dc6c3 (patch)
treeed67cb279f5dc836b48b51a44cd61690765b402c /epan/circuit.h
parentf8a1878202f46dda8194fb56af7619c887cec806 (diff)
Have circuit functionality more closely mirror conversation functionality
This will allow for a smoother transition for refactoring because circuit functionality can now be represented as a strict subset of conversation functionality. Change-Id: I323d7facad707c81b8e35b33143fa1102d6b5976 Reviewed-on: https://code.wireshark.org/review/24290 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/circuit.h')
-rw-r--r--epan/circuit.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/circuit.h b/epan/circuit.h
index 5ec8c3b..a11247f 100644
--- a/epan/circuit.h
+++ b/epan/circuit.h
@@ -33,20 +33,18 @@ extern "C" {
/**
* Data structure representing a circuit.
*/
-typedef struct circuit_key {
- circuit_type ctype;
- guint32 circuit_id;
-} circuit_key;
+struct circuit_key;
+typedef struct circuit_key* circuit_key_t;
typedef struct circuit {
struct circuit *next; /**< pointer to next circuit with given circuit ID */
guint32 first_frame; /**< # of first frame for that circuit */
guint32 last_frame; /**< # of last frame for that circuit */
guint32 circuit_index; /**< unique ID for circuit */
- GSList *data_list; /**< list of data associated with circuit */
- dissector_handle_t dissector_handle; /**< handle for protocol dissector client associated with circuit */
+ wmem_tree_t *data_list; /**< list of data associated with circuit */
+ wmem_tree_t *dissector_tree; /** tree containing protocol dissector client associated with circuit */
guint options; /**< wildcard flags */
- circuit_key *key_ptr; /**< pointer to the key for this circuit */
+ circuit_key_t key_ptr; /**< pointer to the key for this circuit */
} circuit_t;
/**