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-smb-pipe.c | |
| parent | d92a1cd8e1f58a1ec46793f9052aa893a279e523 (diff) | |
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-smb-pipe.c')
| -rw-r--r-- | packet-smb-pipe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index c3b513e401..c3f55c7b17 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.68 2002/01/27 22:25:48 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.69 2002/02/18 01:08:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3194,11 +3194,10 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree fragment_data *fd; new_tvb = tvb_new_real_data(fd_head->data, - fd_head->datalen, fd_head->datalen, - "DCERPC over SMB"); + fd_head->datalen, fd_head->datalen); tvb_set_child_real_data_tvbuff(d_tvb, new_tvb); - pinfo->fd->data_src=g_slist_append(pinfo->fd->data_src, - new_tvb); + add_new_data_source(pinfo->fd, new_tvb, + "DCERPC over SMB"); pinfo->fragmented=FALSE; d_tvb=new_tvb; |