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-pop.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-pop.c')
| -rw-r--r-- | packet-pop.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-pop.c b/packet-pop.c index 909085bc23..ff93456b7c 100644 --- a/packet-pop.c +++ b/packet-pop.c @@ -2,7 +2,7 @@ * Routines for pop packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-pop.c,v 1.13 2000/04/08 07:07:33 guy Exp $ + * $Id: packet-pop.c,v 1.14 2000/05/11 08:15:33 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -101,27 +101,27 @@ dissect_pop(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_pop, offset, END_OF_FRAME, NULL); + ti = proto_tree_add_item(tree, proto_pop, NullTVB, offset, END_OF_FRAME, NULL); pop_tree = proto_item_add_subtree(ti, ett_pop); if (pi.match_port == pi.destport) { /* Request */ - proto_tree_add_item_hidden(pop_tree, hf_pop_request, offset, i1, TRUE); - proto_tree_add_text(pop_tree, offset, i1, "Request: %s", rr); + proto_tree_add_item_hidden(pop_tree, hf_pop_request, NullTVB, offset, i1, TRUE); + proto_tree_add_text(pop_tree, NullTVB, offset, i1, "Request: %s", rr); if (strlen(rd) != 0) - proto_tree_add_text(pop_tree, offset + i1 + 1, END_OF_FRAME, "Request Arg: %s", rd); + proto_tree_add_text(pop_tree, NullTVB, offset + i1 + 1, END_OF_FRAME, "Request Arg: %s", rd); } else { - proto_tree_add_item_hidden(pop_tree, hf_pop_response, offset, i1, TRUE); + proto_tree_add_item_hidden(pop_tree, hf_pop_response, NullTVB, offset, i1, TRUE); if (is_continuation(pd+offset)) dissect_data(pd, offset, fd, pop_tree); else { - proto_tree_add_text(pop_tree, offset, i1, "Response: %s", rr); + proto_tree_add_text(pop_tree, NullTVB, offset, i1, "Response: %s", rr); if (strlen(rd) != 0) - proto_tree_add_text(pop_tree, offset + i1 + 1, END_OF_FRAME, "Response Arg: %s", rd); + proto_tree_add_text(pop_tree, NullTVB, offset + i1 + 1, END_OF_FRAME, "Response Arg: %s", rd); } } |