from Frederic Peters: bring debian package generation .deb up to date

[obnox/wireshark/wip.git] / epan / conversation.h

diff --git a/epan/conversation.h b/epan/conversation.h
index acc16165bbf273589d8d5b2a32fba2e2ad574702..bdf31b8519eaf4d636300a8e47c7a90dbf3066e2 100644 (file)
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -1,7 +1,7 @@
 /* conversation.h
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id: conversation.h,v 1.10 2002/08/28 20:40:44 jmayer Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,9 +28,18 @@
 /*
  * Flags to pass to "conversation_new()" to indicate that the address 2
  * and/or port 2 values for the conversation should be wildcards.
+ * The CONVERSATION_TEMPLATE option tells that any of the other supplied
+ * port and / or address wildcards will be used to match an infinite number
+ * of new connections to the conversation(s) that have the CONVERSATION_-
+ * TEMPLATE flag set. Any conversation created without the CONVERSATION_-
+ * TEMPLATE flag will be altered once the first connections (connection
+ * oriented protocols only) to include the newly found information which
+ * matched the wildcard options.
  */
 #define NO_ADDR2 0x01
 #define NO_PORT2 0x02
+#define NO_PORT2_FORCE 0x04
+#define CONVERSATION_TEMPLATE 0x08
 
 /*
  * Flags to pass to "find_conversation()" to indicate that the address B
@@ -38,6 +47,7 @@
  */
 #define NO_ADDR_B 0x01
 #define NO_PORT_B 0x02
+#define NO_PORT_B_FORCE 0x04
 
 #include "packet.h"            /* for conversation dissector type */
 
@@ -56,6 +66,7 @@ typedef struct conversation_key {
 typedef struct conversation {
        struct conversation *next;      /* pointer to next conversation on hash chain */
        guint32 index;                  /* unique ID for conversation */
+       guint32 setup_frame;    /* frame number that setup this conversation */
        GSList *data_list;              /* list of data associated with conversation */
        dissector_handle_t dissector_handle;
                                        /* handle for protocol dissector client associated with conversation */
@@ -65,10 +76,10 @@ typedef struct conversation {
 
 extern void conversation_init(void);
 
-extern conversation_t *conversation_new(address *addr1, address *addr2,
+extern conversation_t *conversation_new(guint32 setup_frame, address *addr1, address *addr2,
     port_type ptype, guint32 port1, guint32 port2, guint options);
 
-extern conversation_t *find_conversation(address *addr_a, address *addr_b,
+extern conversation_t *find_conversation(guint32 frame_num, address *addr_a, address *addr_b,
     port_type ptype, guint32 port_a, guint32 port_b, guint options);
 
 extern void conversation_add_proto_data(conversation_t *conv, int proto,