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-tcp.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-tcp.c')
| -rw-r--r-- | packet-tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-tcp.c b/packet-tcp.c index 59e9626b76..cd46b08388 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.130 2002/02/03 23:28:38 guy Exp $ + * $Id: packet-tcp.c,v 1.131 2002/02/18 01:08:37 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -382,14 +382,14 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, /* create a new TVB structure for desegmented data */ next_tvb = tvb_new_real_data(ipfd_head->data, - ipfd_head->datalen, ipfd_head->datalen, - "Desegmented"); + ipfd_head->datalen, ipfd_head->datalen); /* add this tvb as a child to the original one */ tvb_set_child_real_data_tvbuff(tvb, next_tvb); /* add desegmented data to the data source list */ - pinfo->fd->data_src = g_slist_append(pinfo->fd->data_src, next_tvb); + add_new_data_source(pinfo->fd, next_tvb, + "Desegmented"); /* indicate that this is reassembled data */ tcpinfo->is_reassembled = TRUE; |