aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ascend.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-05-11 08:18:09 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-05-11 08:18:09 +0000
commit292e38e2c61edcd14bfa30ca3c72bacda1bcbe32 (patch)
treedb4edef02456a48d0f6d505166ac7d70f6c0f644 /packet-ascend.c
parent162800efb308901e0c302517be01226130e39b19 (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-ascend.c')
-rw-r--r--packet-ascend.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/packet-ascend.c b/packet-ascend.c
index 079bac0e03..cee11ab9f0 100644
--- a/packet-ascend.c
+++ b/packet-ascend.c
@@ -1,7 +1,7 @@
/* packet-ascend.c
* Routines for decoding Lucent/Ascend packet traces
*
- * $Id: packet-ascend.c,v 1.10 2000/03/27 17:53:18 gram Exp $
+ * $Id: packet-ascend.c,v 1.11 2000/05/11 08:14:54 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -70,24 +70,24 @@ dissect_ascend( const u_char *pd, frame_data *fd, proto_tree *tree ) {
/* populate a tree in the second pane with the status of the link
layer (ie none) */
if(tree) {
- ti = proto_tree_add_text(tree, 0, 0, "Lucent/Ascend packet trace" );
+ ti = proto_tree_add_text(tree, NullTVB, 0, 0, "Lucent/Ascend packet trace" );
fh_tree = proto_item_add_subtree(ti, ett_raw);
- proto_tree_add_item(fh_tree, hf_link_type, 0, 0,
+ proto_tree_add_item(fh_tree, hf_link_type, NullTVB, 0, 0,
fd->pseudo_header.ascend.type);
if (fd->pseudo_header.ascend.type == ASCEND_PFX_WDD) {
- proto_tree_add_item(fh_tree, hf_called_number, 0, 0,
+ proto_tree_add_item(fh_tree, hf_called_number, NullTVB, 0, 0,
fd->pseudo_header.ascend.call_num);
- proto_tree_add_item(fh_tree, hf_chunk, 0, 0,
+ proto_tree_add_item(fh_tree, hf_chunk, NullTVB, 0, 0,
fd->pseudo_header.ascend.chunk);
- proto_tree_add_item_hidden(fh_tree, hf_session_id, 0, 0, 0);
+ proto_tree_add_item_hidden(fh_tree, hf_session_id, NullTVB, 0, 0, 0);
} else { /* It's wandsession data */
- proto_tree_add_item(fh_tree, hf_user_name, 0, 0,
+ proto_tree_add_item(fh_tree, hf_user_name, NullTVB, 0, 0,
fd->pseudo_header.ascend.user);
- proto_tree_add_item(fh_tree, hf_session_id, 0, 0,
+ proto_tree_add_item(fh_tree, hf_session_id, NullTVB, 0, 0,
fd->pseudo_header.ascend.sess);
- proto_tree_add_item_hidden(fh_tree, hf_chunk, 0, 0, 0);
+ proto_tree_add_item_hidden(fh_tree, hf_chunk, NullTVB, 0, 0, 0);
}
- proto_tree_add_item(fh_tree, hf_task, 0, 0, fd->pseudo_header.ascend.task);
+ proto_tree_add_item(fh_tree, hf_task, NullTVB, 0, 0, fd->pseudo_header.ascend.task);
}
switch (fd->pseudo_header.ascend.type) {