diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 08:18:09 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 08:18:09 +0000 |
| commit | 292e38e2c61edcd14bfa30ca3c72bacda1bcbe32 (patch) | |
| tree | db4edef02456a48d0f6d505166ac7d70f6c0f644 /packet-http.c | |
| parent | 162800efb308901e0c302517be01226130e39b19 (diff) | |
Add tvbuff class.
Add exceptions routines.
Convert proto_tree_add_*() routines to require tvbuff_t* argument.
Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as
the tvbuff_t* argument to proto_tree_add_*() routines.
dissect_packet() creates a tvbuff_t, wraps the next dissect call in
a TRY block, will print "Short Frame" on the proto_tree if a BoundsError
exception is caught.
The FDDI dissector is converted to use tvbuff's.
svn path=/trunk/; revision=1939
Diffstat (limited to 'packet-http.c')
| -rw-r--r-- | packet-http.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-http.c b/packet-http.c index 085e6bb8b1..50d9f9c458 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.17 2000/04/08 07:07:17 guy Exp $ + * $Id: packet-http.c,v 1.18 2000/05/11 08:15:10 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -92,7 +92,7 @@ void dissect_http(const u_char *pd, int offset, frame_data *fd, proto_tree *tree } if (tree) { - ti = proto_tree_add_item(tree, proto_http, offset, END_OF_FRAME, NULL); + ti = proto_tree_add_item(tree, proto_http, NullTVB, offset, END_OF_FRAME, NULL); http_tree = proto_item_add_subtree(ti, ett_http); while (data < dataend) { @@ -180,7 +180,7 @@ void dissect_http(const u_char *pd, int offset, frame_data *fd, proto_tree *tree /* * Put this line. */ - proto_tree_add_text(http_tree, offset, linelen, "%s", + proto_tree_add_text(http_tree, NullTVB, offset, linelen, "%s", format_text(data, linelen)); offset += linelen; data = lineend; @@ -190,12 +190,12 @@ void dissect_http(const u_char *pd, int offset, frame_data *fd, proto_tree *tree case HTTP_RESPONSE: proto_tree_add_item_hidden(http_tree, - hf_http_response, 0, 0, 1); + hf_http_response, NullTVB, 0, 0, 1); break; case HTTP_REQUEST: proto_tree_add_item_hidden(http_tree, - hf_http_request, 0, 0, 1); + hf_http_request, NullTVB, 0, 0, 1); break; case HTTP_OTHERS: |