diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-11-16 07:35:43 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-11-16 07:35:43 +0000 |
| commit | 510d1fca23a82e494ff4ea4358bed63bf2336afd (patch) | |
| tree | 1eaeec182ddb59258b1ee66e3a901ada60ee9f79 /packet-http.c | |
| parent | 29a3d8f7c035ec7cc502e0107d6951ec2162d4f8 (diff) | |
Tvbuffify the STP dissector, have it register itself and have the LLC
dissector call it through a handle, and make it static.
Give "dissect_data()" an "offset" argument, so dissectors can use it to
dissect part of the packet without having to cook up a new tvbuff.
Go back to using "dissect_data()" to dissect the data in an IPP request.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2651 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-http.c')
| -rw-r--r-- | packet-http.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-http.c b/packet-http.c index f43f8d17fc..7cdc060b76 100644 --- a/packet-http.c +++ b/packet-http.c @@ -3,7 +3,7 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-http.c,v 1.27 2000/11/15 08:27:14 guy Exp $ + * $Id: packet-http.c,v 1.28 2000/11/16 07:35:37 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -218,9 +218,9 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) datalen = tvb_length_remaining(tvb, offset); if (datalen > 0) { - tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, -1, -1); - if (is_ipp) { + tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, -1, -1); + /* * Fix up the top-level item so that it doesn't * include the IPP stuff. @@ -230,7 +230,7 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(ipp_handle, new_tvb, pinfo, tree); } else - dissect_data(new_tvb, pinfo, http_tree); + dissect_data(tvb, offset, pinfo, http_tree); } } |