aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation.h
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2019-11-11 01:06:53 +0100
committerJörg Mayer <jmayer@loplof.de>2019-11-24 21:33:18 +0000
commit4f2304ae0222a88a3f04ca7d169fe8580b82d4eb (patch)
tree22094d4baf7c51b28b123a3ba75aef09796355f2 /epan/conversation.h
parent4e18ef9b0e636353c9e25a2df0fb1d9c51c134c5 (diff)
conversation.h: Whitespace fixes
Change-Id: Id8b0b352ac5fcfc7451663367ccea8fe4be86da9 Reviewed-on: https://code.wireshark.org/review/35200 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/conversation.h')
-rw-r--r--epan/conversation.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/epan/conversation.h b/epan/conversation.h
index cd8d41612c..2da42db18e 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -44,9 +44,9 @@ extern "C" {
#define NO_PORT_B 0x02
/* Flags to handle endpoints */
-#define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */
+#define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */
-#include "packet.h" /* for conversation dissector type */
+#include "packet.h" /* for conversation dissector type */
/* Types of port numbers Wireshark knows about. */
typedef enum {
@@ -89,16 +89,14 @@ typedef struct conversation_key* conversation_key_t;
typedef struct conversation {
struct conversation *next; /** pointer to next conversation on hash chain */
struct conversation *last; /** pointer to the last conversation on hash chain */
- struct conversation *latest_found;
- /** pointer to the last conversation on hash chain */
- guint32 conv_index; /** unique ID for conversation */
+ struct conversation *latest_found; /** pointer to the last conversation on hash chain */
+ guint32 conv_index; /** unique ID for conversation */
guint32 setup_frame; /** frame number that setup this conversation */
- /* Assume that setup_frame is also the lowest frame number for now. */
+ /* Assume that setup_frame is also the lowest frame number for now. */
guint32 last_frame; /** highest frame number in this conversation */
- wmem_tree_t *data_list; /** list of data associated with conversation */
- wmem_tree_t *dissector_tree;
- /** tree containing protocol dissector client associated with conversation */
- guint options; /** wildcard flags */
+ wmem_tree_t *data_list; /** list of data associated with conversation */
+ wmem_tree_t *dissector_tree; /** tree containing protocol dissector client associated with conversation */
+ guint options; /** wildcard flags */
conversation_key_t key_ptr; /** pointer to the key for this conversation */
} conversation_t;