From 671992baabddd865f029490db62a273b03683cba Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 4 Jun 2001 07:27:50 +0000
Subject: Define a "COPY_ADDRESS()" macro, which copies the data in one address
 to another (copying the data to a mallocated array) in "epan/packet_info.h",
 and use it in the conversation code.

svn path=/trunk/; revision=3510
---
 epan/conversation.c | 24 ++++--------------------
 epan/packet_info.h  | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/epan/conversation.c b/epan/conversation.c
index af6deabd24..6c0b95bcab 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -1,7 +1,7 @@
 /* conversation.c
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id: conversation.c,v 1.7 2001/06/04 06:46:07 guy Exp $
+ * $Id: conversation.c,v 1.8 2001/06/04 07:27:49 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -406,27 +406,11 @@ conversation_init(void)
 	new_index = 0;
 }
 
-/*
- * Copy an address, allocating a new buffer for the address data.
- */
-static void
-copy_address(address *to, address *from)
-{
-	guint8 *data;
-
-	to->type = from->type;
-	to->len = from->len;
-	data = g_malloc(from->len);
-	memcpy(data, from->data, from->len);
-	to->data = data;
-}
-
 /*
  * Given source and destination addresses and ports for a packet,
  * create a new conversation to contain packets between those address/port
  * pairs. The options field is used to flag the destination address/port 
  * are not given and any value is acceptable.
-
  */
 conversation_t *
 conversation_new(address *src, address *dst, port_type ptype,
@@ -438,8 +422,8 @@ conversation_new(address *src, address *dst, port_type ptype,
 	new_key = g_mem_chunk_alloc(conversation_key_chunk);
 	new_key->next = conversation_keys;
 	conversation_keys = new_key;
-	copy_address(&new_key->src, src);
-	copy_address(&new_key->dst, dst);
+	COPY_ADDRESS(&new_key->src, src);
+	COPY_ADDRESS(&new_key->dst, dst);
 	new_key->ptype = ptype;
 	new_key->port_src = src_port;
 	new_key->port_dst = dst_port;
@@ -527,7 +511,7 @@ void conversation_set_addr( conversation_t *conv, address *addr){
 		    conv->key_ptr);
 	}
 	conv->options &= ~NO_DST_ADDR;
-	copy_address(&conv->key_ptr->dst, addr);
+	COPY_ADDRESS(&conv->key_ptr->dst, addr);
 	if (conv->options & NO_DST_PORT) {
 		g_hash_table_insert(conversation_hashtable_no_dst_port,
 		    conv->key_ptr, conv);
diff --git a/epan/packet_info.h b/epan/packet_info.h
index f1f16df136..be1d1d9622 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -1,7 +1,7 @@
 /* packet_info.h
  * Definitions for packet info structures and routines
  *
- * $Id: packet_info.h,v 1.3 2001/06/04 06:46:07 guy Exp $
+ * $Id: packet_info.h,v 1.4 2001/06/04 07:27:50 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -54,11 +54,26 @@ typedef struct _address {
 	(addr)->data = (addr_data); \
 	}
 
+/*
+ * Given two addresses, return "true" if they're equal, "false" otherwise.
+ */
 #define ADDRESSES_EQUAL(addr1, addr2) \
 	((addr1)->type == (addr2)->type && \
 	 (addr1)->len == (addr2)->len && \
 	 memcmp((addr1)->data, (addr2)->data, (addr1)->len) == 0)
 
+/*
+ * Copy an address, allocating a new buffer for the address data.
+ */
+#define COPY_ADDRESS(to, from) { \
+	guint8 *COPY_ADDRESS_data; \
+	(to)->type = (from)->type; \
+	(to)->len = (from)->len; \
+	COPY_ADDRESS_data = g_malloc((from)->len); \
+	memcpy(COPY_ADDRESS_data, (from)->data, (from)->len); \
+	(to)->data = COPY_ADDRESS_data; \
+	}
+
 /* Types of port numbers Ethereal knows about. */
 typedef enum {
   PT_NONE,		/* no port number */
-- 
cgit v1.2.1