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-isis.c | |
| parent | 162800efb308901e0c302517be01226130e39b19 (diff) | |
| download | wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.tar.gz wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.tar.bz2 wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.zip | |
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-isis.c')
| -rw-r--r-- | packet-isis.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/packet-isis.c b/packet-isis.c index 81fd5b80ac..b402506cfc 100644 --- a/packet-isis.c +++ b/packet-isis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly, core * bits. * - * $Id: packet-isis.c,v 1.8 2000/04/17 01:36:31 guy Exp $ + * $Id: packet-isis.c,v 1.9 2000/05/11 08:15:17 gram Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -111,7 +111,7 @@ isis_dissect_unknown(int offset,guint length,proto_tree *tree,frame_data *fd, } va_start(ap, fmat); - proto_tree_add_text(tree, offset, length, fmat, ap); + proto_tree_add_text(tree, NullTVB, offset, length, fmat, ap); va_end(ap); } /* @@ -159,18 +159,18 @@ dissect_isis(const u_char *pd, int offset, frame_data *fd, if (tree) { - ti = proto_tree_add_item(tree, proto_isis, offset, + ti = proto_tree_add_item(tree, proto_isis, NullTVB, offset, END_OF_FRAME, NULL ); isis_tree = proto_item_add_subtree(ti, ett_isis); - proto_tree_add_item(isis_tree, hf_isis_irpd, offset, 1, + proto_tree_add_item(isis_tree, hf_isis_irpd, NullTVB, offset, 1, ihdr->isis_irpd ); - proto_tree_add_item(isis_tree, hf_isis_header_length, + proto_tree_add_item(isis_tree, hf_isis_header_length, NullTVB, offset + 1, 1, ihdr->isis_header_length ); - proto_tree_add_item(isis_tree, hf_isis_version, + proto_tree_add_item(isis_tree, hf_isis_version, NullTVB, offset + 2, 1, ihdr->isis_version ); - proto_tree_add_item(isis_tree, hf_isis_system_id_length, + proto_tree_add_item(isis_tree, hf_isis_system_id_length, NullTVB, offset + 3, 1, ihdr->isis_system_id_len ); - proto_tree_add_uint_format(isis_tree, hf_isis_type, + proto_tree_add_uint_format(isis_tree, hf_isis_type, NullTVB, offset + 4, 1, ihdr->isis_type, "Type : %s (R:%s%s%s)", val_to_str(ihdr->isis_type & ISIS_TYPE_MASK, isis_vals, @@ -178,11 +178,11 @@ dissect_isis(const u_char *pd, int offset, frame_data *fd, (ihdr->isis_type & ISIS_R8_MASK) ? "1" : "0", (ihdr->isis_type & ISIS_R7_MASK) ? "1" : "0", (ihdr->isis_type & ISIS_R6_MASK) ? "1" : "0"); - proto_tree_add_item(isis_tree, hf_isis_version2, + proto_tree_add_item(isis_tree, hf_isis_version2, NullTVB, offset + 5, 1, ihdr->isis_version2 ); - proto_tree_add_item(isis_tree, hf_isis_reserved, + proto_tree_add_item(isis_tree, hf_isis_reserved, NullTVB, offset + 6, 1, ihdr->isis_reserved ); - proto_tree_add_item(isis_tree, hf_isis_max_area_adr, + proto_tree_add_item(isis_tree, hf_isis_max_area_adr, NullTVB, offset + 7, 1, ihdr->isis_max_area_adr ); } |