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

1 files changed, 19 insertions, 19 deletions

diff --git a/packet-vines.c b/packet-vines.c
index dc45a08787..daa89958da 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
 /* packet-vines.c
  * Routines for Banyan VINES protocol packet disassembly
  *
- * $Id: packet-vines.c,v 1.15 2000/04/16 22:46:24 guy Exp $
+ * $Id: packet-vines.c,v 1.16 2000/05/11 08:15:54 gram Exp $
  *
  * Don Lafontaine <lafont02@cn.ca>
  *
@@ -104,10 +104,10 @@ dissect_vines_frp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree
   }
   
   if (tree) {
-    ti = proto_tree_add_text(tree, offset, 2, "Vines Fragmentation Protocol");
+    ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Vines Fragmentation Protocol");
     vines_frp_tree = proto_item_add_subtree(ti, ett_vines_frp);
-    proto_tree_add_text(vines_frp_tree, offset,     1, "Control Flags: 0x%02x = %s fragment", vines_frp_ctrl, frp_flags_str);
-    proto_tree_add_text(vines_frp_tree, offset + 1, 1, "Sequence Number: 0x%02x", vines_frp_seqno);
+    proto_tree_add_text(vines_frp_tree, NullTVB, offset,     1, "Control Flags: 0x%02x = %s fragment", vines_frp_ctrl, frp_flags_str);
+    proto_tree_add_text(vines_frp_tree, NullTVB, offset + 1, 1, "Sequence Number: 0x%02x", vines_frp_seqno);
   }
 
   /* Skip over header */
@@ -232,13 +232,13 @@ dissect_vines(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   */
   	if (tree) 
   		{
-    	ti = proto_tree_add_text(tree, offset, (viph.vip_pktlen), "Vines IP");
+    	ti = proto_tree_add_text(tree, NullTVB, offset, (viph.vip_pktlen), "Vines IP");
     	vip_tree = proto_item_add_subtree(ti, ett_vines);
-    	proto_tree_add_text(vip_tree, offset,      2, "Packet checksum: 0x%04x", viph.vip_chksum);
-    	proto_tree_add_text(vip_tree, offset +  2, 2, "Packet length: 0x%04x (%d)", viph.vip_pktlen, viph.vip_pktlen); 
-    	proto_tree_add_text(vip_tree, offset +  4, 1, "Transport control: 0x%02x",
+    	proto_tree_add_text(vip_tree, NullTVB, offset,      2, "Packet checksum: 0x%04x", viph.vip_chksum);
+    	proto_tree_add_text(vip_tree, NullTVB, offset +  2, 2, "Packet length: 0x%04x (%d)", viph.vip_pktlen, viph.vip_pktlen); 
+    	proto_tree_add_text(vip_tree, NullTVB, offset +  4, 1, "Transport control: 0x%02x",
       		viph.vip_tctl);
-    	proto_tree_add_text(vip_tree, offset +  5, 1, "Protocol: 0x%02x", viph.vip_proto);
+    	proto_tree_add_text(vip_tree, NullTVB, offset +  5, 1, "Protocol: 0x%02x", viph.vip_proto);
   		}
 
 
@@ -322,17 +322,17 @@ void dissect_vines_spp(const u_char *pd, int offset, frame_data *fd, proto_tree
 */ 
   	if (tree) 
   		{
-    	ti = proto_tree_add_text(tree, offset, sizeof(viph), "Vines SPP");
+    	ti = proto_tree_add_text(tree, NullTVB, offset, sizeof(viph), "Vines SPP");
     	vspp_tree = proto_item_add_subtree(ti, ett_vines_spp);
-    	proto_tree_add_text(vspp_tree, offset,      2, "Source port: 0x%04x", viph.vspp_sport);
-    	proto_tree_add_text(vspp_tree, offset+2,    2, "Destination port: 0x%04x", viph.vspp_dport); 
-    	proto_tree_add_text(vspp_tree, offset+4,    1, "Packet type: 0x%02x", viph.vspp_pkttype);
-    	proto_tree_add_text(vspp_tree, offset+5,    1, "Control: 0x%02x", viph.vspp_control);
-    	proto_tree_add_text(vspp_tree, offset+6,    2, "Local Connection ID: 0x%04x", viph.vspp_lclid);
-    	proto_tree_add_text(vspp_tree, offset+8,    2, "Remote Connection ID: 0x%04x", viph.vspp_rmtid);
-    	proto_tree_add_text(vspp_tree, offset+10,   2, "Sequence number: 0x%04x", viph.vspp_seqno);
-    	proto_tree_add_text(vspp_tree, offset+12,   2, "Ack number: 0x%04x", viph.vspp_ack);
-    	proto_tree_add_text(vspp_tree, offset+14,   2, "Window: 0x%04x", viph.vspp_win);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset,      2, "Source port: 0x%04x", viph.vspp_sport);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+2,    2, "Destination port: 0x%04x", viph.vspp_dport); 
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+4,    1, "Packet type: 0x%02x", viph.vspp_pkttype);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+5,    1, "Control: 0x%02x", viph.vspp_control);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+6,    2, "Local Connection ID: 0x%04x", viph.vspp_lclid);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+8,    2, "Remote Connection ID: 0x%04x", viph.vspp_rmtid);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+10,   2, "Sequence number: 0x%04x", viph.vspp_seqno);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+12,   2, "Ack number: 0x%04x", viph.vspp_ack);
+    	proto_tree_add_text(vspp_tree, NullTVB, offset+14,   2, "Window: 0x%04x", viph.vspp_win);
 		}
 	offset += 16; /* sizeof SPP */
 	dissect_data(pd, offset, fd, tree);