dcerpc: remove use-after-free (found by clang).

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

diff --git a/epan/conversation.h b/epan/conversation.h
index 4efe7e098bcb86a0e05901c74b1fee477e7d4987..44cf276dac16487d4dbe725ad493ad278ca39bc6 100644 (file)
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -55,6 +55,9 @@ extern "C" {
 #define NO_ADDR_B 0x01
 #define NO_PORT_B 0x02
 
+/* Flags to handle endpoints */
+#define USE_LAST_ENDPOINT 0x08      /* Use last endpoint created, regardless of type */
+
 #include "packet.h"            /* for conversation dissector type */
 
 /* Types of port numbers Wireshark knows about. */
@@ -77,7 +80,16 @@ typedef enum {
        ENDPOINT_BLUETOOTH,
        ENDPOINT_TDMOP,
        ENDPOINT_DVBCI,
-       ENDPOINT_ISO14443
+       ENDPOINT_ISO14443,
+       ENDPOINT_ISDN,                  /* ISDN channel number */
+       ENDPOINT_H223,                  /* H.223 logical channel number */
+       ENDPOINT_X25,                   /* X.25 logical channel number */
+       ENDPOINT_IAX2,                  /* IAX2 call id */
+       ENDPOINT_DLCI,                  /* Frame Relay DLCI */
+       ENDPOINT_ISUP,                  /* ISDN User Part CIC */
+       ENDPOINT_BICC,                  /* BICC Circuit identifier */
+       ENDPOINT_GSMTAP,
+       ENDPOINT_IUUP
 } endpoint_type;
 
 /**
@@ -132,7 +144,7 @@ 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);
+WS_DLL_PUBLIC conversation_t *conversation_new_by_id(const guint32 setup_frame, const endpoint_type etype, const guint32 id, const guint options);
 
 /**
  * Given two address/port pairs for a packet, search for a conversation
@@ -173,7 +185,7 @@ WS_DLL_PUBLIC conversation_t *conversation_new_simple(const guint32 setup_frame,
 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);
+WS_DLL_PUBLIC conversation_t *find_conversation_by_id(const guint32 frame, const endpoint_type etype, const guint32 id, const guint options);
 
 /**  A helper function that calls find_conversation() using data from pinfo
  *  The frame number and addresses are taken from pinfo.
@@ -205,6 +217,12 @@ WS_DLL_PUBLIC dissector_handle_t conversation_get_dissector(conversation_t *conv
 WS_DLL_PUBLIC void conversation_create_endpoint(struct _packet_info *pinfo, address* addr1, address* addr2,
     endpoint_type etype, guint32 port1, guint32        port2, const guint options);
 
+WS_DLL_PUBLIC void conversation_create_endpoint_by_id(struct _packet_info *pinfo,
+    endpoint_type etype, guint32 id, const guint options);
+
+WS_DLL_PUBLIC guint32 conversation_get_endpoint_by_id(struct _packet_info *pinfo,
+    endpoint_type etype, const guint options);
+
 /**
  * Given two address/port pairs for a packet, search for a matching
  * conversation and, if found and it has a conversation dissector,
@@ -220,6 +238,10 @@ try_conversation_dissector(const address *addr_a, const address *addr_b, const e
     const guint32 port_a, const guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
     proto_tree *tree, void* data);
 
+extern gboolean
+try_conversation_dissector_by_id(const endpoint_type etype, const guint32 id, tvbuff_t *tvb,
+    packet_info *pinfo, proto_tree *tree, void* data);
+
 /* These routines are used to set undefined values for a conversation */
 
 extern void conversation_set_port2(conversation_t *conv, const guint32 port);