diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-02-18 01:08:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-02-18 01:08:44 +0000 |
| commit | 6a21dc7e44e06bf3064d74a8e9624b9e01b04bbd (patch) | |
| tree | 73281bb2d7e50e8527da2945d5627a31bae9e5c6 /packet-giop.c | |
| parent | d92a1cd8e1f58a1ec46793f9052aa893a279e523 (diff) | |
| download | wireshark-6a21dc7e44e06bf3064d74a8e9624b9e01b04bbd.tar.gz wireshark-6a21dc7e44e06bf3064d74a8e9624b9e01b04bbd.tar.bz2 wireshark-6a21dc7e44e06bf3064d74a8e9624b9e01b04bbd.zip | |
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.
svn path=/trunk/; revision=4749
Diffstat (limited to 'packet-giop.c')
| -rw-r--r-- | packet-giop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-giop.c b/packet-giop.c index bd50b39fcd..05afbfc12c 100644 --- a/packet-giop.c +++ b/packet-giop.c @@ -9,7 +9,7 @@ * Frank Singleton <frank.singleton@ericsson.com> * Trevor Shepherd <eustrsd@am1.ericsson.se> * - * $Id: packet-giop.c,v 1.55 2002/01/24 09:20:47 guy Exp $ + * $Id: packet-giop.c,v 1.56 2002/02/18 01:08:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1310,7 +1310,7 @@ static void read_IOR_strings_from_file(gchar *name, int max_iorlen) { it - or "get_CDR_octet()", or "decode_IOR()" - to throw an exception. */ - tvb = tvb_new_real_data(out,ior_val_len,ior_val_len, "GIOP FILE IOR"); + tvb = tvb_new_real_data(out, ior_val_len, ior_val_len); stream_is_big_endian = !get_CDR_octet(tvb,&my_offset); decode_IOR(tvb, NULL, NULL, &my_offset, 0, stream_is_big_endian); |