Don't give tvbuffs names; instead, give data sources names, where a

"data source" has a name and a top-level tvbuff, and frames can have a
list of data sources associated with them.

Use the tvbuff pointer to determine which data source is the data source
for a given field; this means we don't have to worry about multiple data
sources with the same name - the only thing the name does is label the
notebook tab for the display of the data source, and label the hex dump
of the data source in print/Tethereal output.

Clean up a bunch of things discovered in the process of doing the above.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4749 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 11 insertions, 1 deletions

diff --git a/epan/frame_data.h b/epan/frame_data.h
index 168e38d9c9..b972811e83 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -1,7 +1,7 @@
 /* frame_data.h
  * Definitions for frame_data structures and routines
  *
- * $Id: frame_data.h,v 1.3 2001/12/10 02:16:59 guy Exp $
+ * $Id: frame_data.h,v 1.4 2002/02/18 01:08:41 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,6 +26,7 @@
 #define __FRAME_DATA_H__
 
 #include "column_info.h"
+#include "tvbuff.h"
 
 /* XXX - some of this stuff is used only while a packet is being dissected;
    should we keep that stuff in the "packet_info" structure, instead, to
@@ -54,6 +55,15 @@ typedef struct _frame_data {
   } flags;
 } frame_data;
 
+/*
+ * A data source.
+ * Has a tvbuff and a name.
+ */
+typedef struct {
+  tvbuff_t *tvb;
+  char *name;
+} data_source;
+
 /* Utility routines used by packet*.c */
 
 void       p_add_proto_data(frame_data *, int, void *);