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-mapi.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-mapi.c')
-rw-r--r-- | packet-mapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-mapi.c b/packet-mapi.c index bde5bb8dcc..32672b0622 100644 --- a/packet-mapi.c +++ b/packet-mapi.c @@ -1,7 +1,7 @@ /* packet-mapi.c * Routines for MSX mapi packet dissection * - * $Id: packet-mapi.c,v 1.5 2000/04/08 07:07:29 guy Exp $ + * $Id: packet-mapi.c,v 1.6 2000/05/11 08:15:23 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -66,21 +66,21 @@ dissect_mapi(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_mapi, offset, END_OF_FRAME, NULL); + ti = proto_tree_add_item(tree, proto_mapi, NullTVB, offset, END_OF_FRAME, NULL); mapi_tree = proto_item_add_subtree(ti, ett_mapi); if (pi.match_port == pi.destport) { - proto_tree_add_item_hidden(mapi_tree, hf_mapi_request, + proto_tree_add_item_hidden(mapi_tree, hf_mapi_request, NullTVB, offset, END_OF_FRAME, TRUE); - proto_tree_add_text(mapi_tree, offset, + proto_tree_add_text(mapi_tree, NullTVB, offset, END_OF_FRAME, "Request: <opaque data>" ); } else { - proto_tree_add_item_hidden(mapi_tree, hf_mapi_response, + proto_tree_add_item_hidden(mapi_tree, hf_mapi_response, NullTVB, offset, END_OF_FRAME, TRUE); - proto_tree_add_text(mapi_tree, offset, + proto_tree_add_text(mapi_tree, NullTVB, offset, END_OF_FRAME, "Response: <opaque data>"); } } |