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.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.c')
| -rw-r--r-- | packet-smb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-smb.c b/packet-smb.c index 0357f2ead5..068ac45c55 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.206 2002/02/14 05:53:59 guy Exp $ + * $Id: packet-smb.c,v 1.207 2002/02/18 01:08:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -7712,9 +7712,9 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t } pd_tvb = tvb_new_real_data(r_fd->data, r_fd->datalen, - r_fd->datalen, "Reassembled SMB"); + r_fd->datalen); tvb_set_child_real_data_tvbuff(tvb, pd_tvb); - pinfo->fd->data_src = g_slist_append(pinfo->fd->data_src, pd_tvb); + add_new_data_source(pinfo->fd, pd_tvb, "Reassembled SMB"); pinfo->fragmented = FALSE; } @@ -11517,9 +11517,9 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } pd_tvb = tvb_new_real_data(r_fd->data, r_fd->datalen, - r_fd->datalen, "Reassembled SMB"); + r_fd->datalen); tvb_set_child_real_data_tvbuff(tvb, pd_tvb); - pinfo->fd->data_src = g_slist_append(pinfo->fd->data_src, pd_tvb); + add_new_data_source(pinfo->fd, pd_tvb, "Reassembled SMB"); pinfo->fragmented = FALSE; } |