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, 192 insertions, 192 deletions

diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 53fb3c8898..725dc6b787 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -1,7 +1,7 @@
 /* packet-gryphon.c
  * Routines for Gryphon protocol packet disassembly
  *
- * $Id: packet-gryphon.c,v 1.8 2000/03/15 18:38:58 guy Exp $
+ * $Id: packet-gryphon.c,v 1.9 2000/05/11 08:18:09 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Steve Limkemann <stevelim@dgtech.com>
@@ -140,7 +140,7 @@ dissector(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
     }
     if (tree) {
     	if (fd) {
-	    ti = proto_tree_add_item(tree, proto_gryphon, offset,
+	    ti = proto_tree_add_item(tree, proto_gryphon, NullTVB, offset,
 	    	    end_of_frame, NULL);
 	    gryphon_tree = proto_item_add_subtree(ti, ett_gryphon);
 	} else
@@ -152,7 +152,7 @@ dissector(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    frmtyp = data[6];
 	    msglen = pntohs ((unsigned short *)&data[4]);
 
-    	    header_item = proto_tree_add_text(gryphon_tree, offset,
+    	    header_item = proto_tree_add_text(gryphon_tree, NullTVB, offset,
 	    	    MSG_HDR_SZ, "Header");
 	    header_tree = proto_item_add_subtree(header_item,
 	    	    ett_gryphon_header);
@@ -162,10 +162,10 @@ dissector(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    }
 	    if (i >= SIZEOF(src_dest))
     		i = SIZEOF(src_dest) - 1;
- 	    proto_tree_add_text(header_tree, offset, 2,
+ 	    proto_tree_add_text(header_tree, NullTVB, offset, 2,
 	    	    "Source: %s, channel %hd", src_dest[i].strptr, data[1]);
-    	    proto_tree_add_item_hidden(header_tree, hf_gryph_src, offset, 1, src);
-    	    proto_tree_add_item_hidden(header_tree, hf_gryph_srcchan, offset+1, 1, data[1]);
+    	    proto_tree_add_item_hidden(header_tree, hf_gryph_src, NullTVB, offset, 1, src);
+    	    proto_tree_add_item_hidden(header_tree, hf_gryph_srcchan, NullTVB, offset+1, 1, data[1]);
 
 	    for (i = 0; i < SIZEOF(src_dest); i++) {
     		if (src_dest[i].value == dest)
@@ -173,22 +173,22 @@ dissector(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    }
 	    if (i >= SIZEOF(src_dest))
     		i = SIZEOF(src_dest) - 1;
-  	    proto_tree_add_text(header_tree, offset+2, 2,
+  	    proto_tree_add_text(header_tree, NullTVB, offset+2, 2,
 	    	    "Destination: %s, channel %hd", src_dest[i].strptr, data[3]);
-    	    proto_tree_add_item_hidden(header_tree, hf_gryph_dest, offset+2, 1, dest);
-    	    proto_tree_add_item_hidden(header_tree, hf_gryph_destchan, offset+3, 1, data[3]);
+    	    proto_tree_add_item_hidden(header_tree, hf_gryph_dest, NullTVB, offset+2, 1, dest);
+    	    proto_tree_add_item_hidden(header_tree, hf_gryph_destchan, NullTVB, offset+3, 1, data[3]);
 
-	    proto_tree_add_text(header_tree, offset+4, 2,
+	    proto_tree_add_text(header_tree, NullTVB, offset+4, 2,
 	    	    "Data length: %d bytes", msglen);
-	    proto_tree_add_text(header_tree, offset+6, 1,
+	    proto_tree_add_text(header_tree, NullTVB, offset+6, 1,
 	    	    "Frame type: %s", frame_type[frmtyp]);
-	    proto_tree_add_text(header_tree, offset+7, 1, "reserved");
+	    proto_tree_add_text(header_tree, NullTVB, offset+7, 1, "reserved");
 
-    	    proto_tree_add_item_hidden(header_tree, hf_gryph_type, offset+6, 1, frmtyp);
+    	    proto_tree_add_item_hidden(header_tree, hf_gryph_type, NullTVB, offset+6, 1, frmtyp);
 	    msgpad = 3 - (msglen + 3) % 4;
 	    msgend = data + msglen + msgpad + MSG_HDR_SZ;
 
-    	    body_item = proto_tree_add_text(gryphon_tree, offset + MSG_HDR_SZ,
+    	    body_item = proto_tree_add_text(gryphon_tree, NullTVB, offset + MSG_HDR_SZ,
 	    	    msglen + msgpad, "Body");
     	    body_tree = proto_item_add_subtree(body_item, ett_gryphon_body);
 
@@ -216,12 +216,12 @@ dissector(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    }
 	    if (data < msgend - msgpad) {
 	    	i = msgend - msgpad - data;
-		proto_tree_add_text(gryphon_tree, offset, i, "Data");
+		proto_tree_add_text(gryphon_tree, NullTVB, offset, i, "Data");
 		BUMP (offset, data, i);
 	    }
 	    if (data < msgend) {
 	    	i = msgend - data;
-		proto_tree_add_text(gryphon_tree, offset, i, "padding");
+		proto_tree_add_text(gryphon_tree, NullTVB, offset, i, "padding");
 		BUMP (offset, data, i);
 	    }
 /*	    data = dataend;*/
@@ -446,7 +446,7 @@ decode_command (int dst, const u_char **data, const u_char *dataend, int *offset
     proto_item	    *ti;
 
     cmd = (*data)[0];
-    proto_tree_add_item_hidden(pt, hf_gryph_cmd, *offset, 1, cmd);
+    proto_tree_add_item_hidden(pt, hf_gryph_cmd, NullTVB, *offset, 1, cmd);
     if (cmd > 0x3F)
     	cmd += dst * 256;
 
@@ -464,11 +464,11 @@ decode_command (int dst, const u_char **data, const u_char *dataend, int *offset
     if (i >= SIZEOF(cmds))
     	i = SIZEOF(cmds) - 1;
 
-    proto_tree_add_text (pt, *offset, 4, "Command: %s", cmds[i].strptr);
+    proto_tree_add_text (pt, NullTVB, *offset, 4, "Command: %s", cmds[i].strptr);
     BUMP (*offset, *data, 4);
 
     if (cmds[i].cmd_fnct && dataend - *data) {
-	ti = proto_tree_add_text(pt, *offset, dataend - *data, "Data: (%d bytes)", dataend - *data);
+	ti = proto_tree_add_text(pt, NullTVB, *offset, dataend - *data, "Data: (%d bytes)", dataend - *data);
 	ft = proto_item_add_subtree(ti, ett_gryphon_command_data);
 	(*(cmds[i].cmd_fnct)) (dst, data, dataend, offset, msglen, ft);
     }
@@ -498,7 +498,7 @@ decode_response (int src, const u_char **data, const u_char *dataend, int *offse
     }
     if (i >= SIZEOF(cmds))
     	i = SIZEOF(cmds) - 1;
-    proto_tree_add_text (pt, *offset, 4, "Command: %s", cmds[i].strptr);
+    proto_tree_add_text (pt, NullTVB, *offset, 4, "Command: %s", cmds[i].strptr);
     BUMP (*offset, *data, 4);
     
     resp = pntohl ((unsigned long *)data[0]);
@@ -508,11 +508,11 @@ decode_response (int src, const u_char **data, const u_char *dataend, int *offse
     }
     if (j >= SIZEOF(responses))
     	j = SIZEOF(responses) - 1;
-    proto_tree_add_text (pt, *offset, 4, "Status: %s", responses[j].strptr);
+    proto_tree_add_text (pt, NullTVB, *offset, 4, "Status: %s", responses[j].strptr);
     BUMP (*offset, *data, 4);
 
     if (cmds[i].rsp_fnct) {
-    ti = proto_tree_add_text(pt, *offset, dataend - *data, "Data: (%d bytes)", dataend - *data);
+    ti = proto_tree_add_text(pt, NullTVB, *offset, dataend - *data, "Data: (%d bytes)", dataend - *data);
     ft = proto_item_add_subtree(ti, ett_gryphon_response_data);
 	(*(cmds[i].rsp_fnct)) (src, data, dataend, offset, msglen, ft);
     }
@@ -534,53 +534,53 @@ decode_data (int src, const u_char **data, const u_char *dataend, int *offset, i
 	padding = 3 - (hdrsize + datasize + extrasize + 3) % 4;
 	msgsize = hdrsize + datasize + extrasize + padding + 16;
 
-    	item = proto_tree_add_text(pt, *offset, 16, "Message header");
+    	item = proto_tree_add_text(pt, NullTVB, *offset, 16, "Message header");
 	tree = proto_item_add_subtree (item, ett_gryphon_data_header);
-    	proto_tree_add_text(tree, *offset, 2, "Header length: %d bytes, %d bits", hdrsize, hdrbits);
-    	proto_tree_add_text(tree, *offset+2, 2, "Data length: %d bytes", datasize);
-    	proto_tree_add_text(tree, *offset+4, 1, "Extra data length: %d bytes", extrasize);
+    	proto_tree_add_text(tree, NullTVB, *offset, 2, "Header length: %d bytes, %d bits", hdrsize, hdrbits);
+    	proto_tree_add_text(tree, NullTVB, *offset+2, 2, "Data length: %d bytes", datasize);
+    	proto_tree_add_text(tree, NullTVB, *offset+4, 1, "Extra data length: %d bytes", extrasize);
 	mode = (*data)[5];
-    	item1 = proto_tree_add_text(tree, *offset+5, 1, "Mode: %hd", mode);
+    	item1 = proto_tree_add_text(tree, NullTVB, *offset+5, 1, "Mode: %hd", mode);
 	if (mode) {
 	    tree1 = proto_item_add_subtree (item1, ett_gryphon_flags);
 	    if (mode & 0x80)
-	    	proto_tree_add_text(tree1, *offset+5, 1, "1... .... = Transmitted message");
+	    	proto_tree_add_text(tree1, NullTVB, *offset+5, 1, "1... .... = Transmitted message");
 	    if (mode & 0x40)
-	    	proto_tree_add_text(tree1, *offset+5, 1, ".1.. .... = Received message");
+	    	proto_tree_add_text(tree1, NullTVB, *offset+5, 1, ".1.. .... = Received message");
 	    if (mode & 0x20)
-	    	proto_tree_add_text(tree1, *offset+5, 1, "..1. .... = Local message");
+	    	proto_tree_add_text(tree1, NullTVB, *offset+5, 1, "..1. .... = Local message");
 	    if (mode & 0x10)
-	    	proto_tree_add_text(tree1, *offset+5, 1, "...1 .... = Remote message");
+	    	proto_tree_add_text(tree1, NullTVB, *offset+5, 1, "...1 .... = Remote message");
 	    if (mode & 0x01)
-	    	proto_tree_add_text(tree1, *offset+5, 1, ".... ...1 = Internal message");
+	    	proto_tree_add_text(tree1, NullTVB, *offset+5, 1, ".... ...1 = Internal message");
 	}
-    	proto_tree_add_text(tree, *offset+6, 1, "Priority: %d", (*data)[6]);
-    	proto_tree_add_text(tree, *offset+7, 1, "Error status: %hd", (*data)[7]);
+    	proto_tree_add_text(tree, NullTVB, *offset+6, 1, "Priority: %d", (*data)[6]);
+    	proto_tree_add_text(tree, NullTVB, *offset+7, 1, "Error status: %hd", (*data)[7]);
 	timestamp = pntohl ((unsigned long *)((*data)+8));
 	hours = timestamp /(100000 * 60 *60);
 	minutes = (timestamp / (100000 * 60)) % 60;
 	seconds = (timestamp / 100000) % 60;
 	fraction = timestamp % 100000;
-    	proto_tree_add_text(tree, *offset+8, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
-    	proto_tree_add_text(tree, *offset+12, 1, "Context: %hd", (*data)[12]);
-    	proto_tree_add_text(tree, *offset+13, 3, "reserved:");
+    	proto_tree_add_text(tree, NullTVB, *offset+8, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
+    	proto_tree_add_text(tree, NullTVB, *offset+12, 1, "Context: %hd", (*data)[12]);
+    	proto_tree_add_text(tree, NullTVB, *offset+13, 3, "reserved:");
 	BUMP (*offset, *data, 16);
-    	item = proto_tree_add_text(pt, *offset, msgsize-16-padding, "Message Body");
+    	item = proto_tree_add_text(pt, NullTVB, *offset, msgsize-16-padding, "Message Body");
 	tree = proto_item_add_subtree (item, ett_gryphon_data_body);
 	if (hdrsize) {
-	    proto_tree_add_text(tree, *offset, hdrsize, "Header");
+	    proto_tree_add_text(tree, NullTVB, *offset, hdrsize, "Header");
 	    BUMP (*offset, *data, hdrsize);
 	}
 	if (datasize) {
-	    proto_tree_add_text(tree, *offset, datasize, "Data");
+	    proto_tree_add_text(tree, NullTVB, *offset, datasize, "Data");
 	    BUMP (*offset, *data, datasize);
 	}
 	if (extrasize) {
-	    proto_tree_add_text(tree, *offset, extrasize, "Extra data");
+	    proto_tree_add_text(tree, NullTVB, *offset, extrasize, "Extra data");
 	    BUMP (*offset, *data, extrasize);
 	}
 	if (padding) {
-    	    proto_tree_add_text(pt, *offset, padding, "padding");
+    	    proto_tree_add_text(pt, NullTVB, *offset, padding, "padding");
 	    BUMP (*offset, *data, padding);
 	}
 }
@@ -594,24 +594,24 @@ decode_event (int src, const u_char **data, const u_char *dataend, int *offset,
 
     padding = 3 - (msglen + 3) % 4;
     msgend = *data + msglen;
-    proto_tree_add_text(pt, *offset, 1, "Event ID: %hd", **data);
-    proto_tree_add_text(pt, *offset+1, 1, "Event context: %hd", *((*data)+1));
-    proto_tree_add_text(pt, *offset+2, 2, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Event ID: %hd", **data);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 1, "Event context: %hd", *((*data)+1));
+    proto_tree_add_text(pt, NullTVB, *offset+2, 2, "reserved");
     BUMP (*offset, *data, 4);
     timestamp = pntohl ((unsigned long *)(*data));
     hours = timestamp /(100000 * 60 *60);
     minutes = (timestamp / (100000 * 60)) % 60;
     seconds = (timestamp / 100000) % 60;
     fraction = timestamp % 100000;
-    proto_tree_add_text(pt, *offset, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
     BUMP (*offset, *data, 4);
     if (*data < msgend) {
     	length = msgend - *data;
-    	proto_tree_add_text (pt, *offset, length, "Data (%d bytes)", length);
+    	proto_tree_add_text (pt, NullTVB, *offset, length, "Data (%d bytes)", length);
 	BUMP (*offset, *data, length);
     }
     if (padding) {
-    	proto_tree_add_text (pt, *offset, padding, "padding");
+    	proto_tree_add_text (pt, NullTVB, *offset, padding, "padding");
 	BUMP (*offset, *data, padding);
     }
 }
@@ -627,8 +627,8 @@ cmd_init (int src, const u_char **data, const u_char *dataend, int *offset, int
     	ptr = "Always initialize";
     else
     	ptr = "Initialize if not previously initialized";
-    proto_tree_add_text(pt, *offset, 1, "Mode: %s", ptr);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Mode: %s", ptr);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -638,10 +638,10 @@ eventnum (int src, const u_char **data, const u_char *dataend, int *offset, int
     unsigned char   event = **data;
     
     if (event)
-    	proto_tree_add_text(pt, *offset, 1, "Event number: %hd", event);
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Event number: %hd", event);
     else
-    	proto_tree_add_text(pt, *offset, 1, "Event numbers: All");
-    proto_tree_add_text(pt, *offset+1, 3, "padding");
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Event numbers: All");
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "padding");
     BUMP (*offset, *data, 4);
 }
 
@@ -661,13 +661,13 @@ resp_time (int src, const u_char **data, const u_char *dataend, int *offset, int
     timestamp = ts.lnglng / 100000L;
     strncpy (date, ctime((time_t*)&timestamp), sizeof(date));
     date[strlen(date)-1] = 0x00;
-    proto_tree_add_text(pt, *offset, 8, "Date/Time: %s", date);
+    proto_tree_add_text(pt, NullTVB, *offset, 8, "Date/Time: %s", date);
     timestamp = ts.lng[0];
     hours = timestamp /(100000 * 60 *60);
     minutes = (timestamp / (100000 * 60)) % 60;
     seconds = (timestamp / 100000) % 60;
     fraction = timestamp % 100000;
-    proto_tree_add_text(pt, *offset+4, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
+    proto_tree_add_text(pt, NullTVB, *offset+4, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
     BUMP (*offset, *data, 8);
 }
 
@@ -685,16 +685,16 @@ cmd_setfilt (int src, const u_char **data, const u_char *dataend, int *offset, i
     	strcpy (mode, "Block");
     if (length == 0)
     	strcat (mode, " all");
-    proto_tree_add_text(pt, *offset, 4, "Pass/Block flag: %s", mode);
-    proto_tree_add_text(pt, *offset+4, 4, "Length of Pattern & Mask: %d", length);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "Pass/Block flag: %s", mode);
+    proto_tree_add_text(pt, NullTVB, *offset+4, 4, "Length of Pattern & Mask: %d", length);
     BUMP (*offset, *data, 8);
     if (length) {
-    	proto_tree_add_text(pt, *offset, length * 2, "discarded data");
+    	proto_tree_add_text(pt, NullTVB, *offset, length * 2, "discarded data");
     	BUMP (*offset, *data, length * 2);
     }
     padding = 3 - (length * 2 + 3) % 4;
     if (padding) {
-	proto_tree_add_text(pt, *offset+1, 3, "padding");
+	proto_tree_add_text(pt, NullTVB, *offset+1, 3, "padding");
 	BUMP (*offset, *data, padding);
     }
 }
@@ -712,9 +712,9 @@ cmd_ioctl (int src, const u_char **data, const u_char *dataend, int *offset, int
     }
     if (i >= SIZEOF(ioctls))
     	i = SIZEOF(ioctls) - 1;
-    proto_tree_add_text(pt, *offset, 4, "IOCTL: %s", ioctls[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "IOCTL: %s", ioctls[i].strptr);
     BUMP (*offset, *data, 4);
-    proto_tree_add_text(pt, *offset, dataend - *data, "Data");
+    proto_tree_add_text(pt, NullTVB, *offset, dataend - *data, "Data");
     BUMP (*offset, *data, dataend - *data);
 }
 
@@ -730,27 +730,27 @@ cmd_addfilt (int src, const u_char **data, const u_char *dataend, int *offset, i
     char    	active[] = ".... ..1. = The filter is active";
     char    	inactive[] = ".... ..0. = The filter is inactive";
 
-    item = proto_tree_add_text(pt, *offset, 1, "Flags");
+    item = proto_tree_add_text(pt, NullTVB, *offset, 1, "Flags");
     tree = proto_item_add_subtree (item, ett_gryphon_flags);
     if (**data & FILTER_PASS_FLAG)
     	ptr = pass;
     else
     	ptr = block;
-    proto_tree_add_text(tree, *offset, 1, ptr);
+    proto_tree_add_text(tree, NullTVB, *offset, 1, ptr);
     if (**data & FILTER_ACTIVE_FLAG)
     	ptr = active;
     else
     	ptr = inactive;
-    proto_tree_add_text(tree, *offset, 1, ptr);
+    proto_tree_add_text(tree, NullTVB, *offset, 1, ptr);
     BUMP (*offset, *data, 1);
     blocks = **data;
-    proto_tree_add_text(pt, *offset, 1, "Number of filter blocks = %d", blocks);
-    proto_tree_add_text(pt, *offset+1, 6, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of filter blocks = %d", blocks);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 6, "reserved");
     BUMP (*offset, *data, 7);
     for (i = 1; i <= blocks; i++) {
 	length = pntohs ((unsigned short *)((*data)+2)) * 2 + 8;
 	length += 3 - (length + 3) % 4;
-	item = proto_tree_add_text(pt, *offset, length, "Filter block %d", i);
+	item = proto_tree_add_text(pt, NullTVB, *offset, length, "Filter block %d", i);
 	tree = proto_item_add_subtree (item, ett_gryphon_cmd_filter_block);
 	filter_block (src, data, dataend, offset, msglen, tree);
     }
@@ -759,8 +759,8 @@ cmd_addfilt (int src, const u_char **data, const u_char *dataend, int *offset, i
 void
 resp_addfilt (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt)
 {
-    proto_tree_add_text(pt, *offset, 1, "Filter handle: %hd", **data);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Filter handle: %hd", **data);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -771,9 +771,9 @@ cmd_modfilt (int src, const u_char **data, const u_char *dataend, int *offset, i
     int     	    i;
 
     if (**data)
-    	proto_tree_add_text(pt, *offset, 1, "Filter handle: %hd", **data);
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Filter handle: %hd", **data);
     else
-    	proto_tree_add_text(pt, *offset, 1, "Filter handles: all");
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Filter handles: all");
     action = *((*data) + 1);
     for (i = 0; i < SIZEOF(filtacts); i++) {
     	if (filtacts[i].value == action)
@@ -781,8 +781,8 @@ cmd_modfilt (int src, const u_char **data, const u_char *dataend, int *offset, i
     }
     if (i >= SIZEOF(filtacts))
     	i = SIZEOF(filtacts) - 1;
-    proto_tree_add_text(pt, *offset+1, 1, "Action: %s filter", filtacts[i].strptr);
-    proto_tree_add_text(pt, *offset+2, 2, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset+1, 1, "Action: %s filter", filtacts[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset+2, 2, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -792,13 +792,13 @@ resp_filthan (int src, const u_char **data, const u_char *dataend, int *offset,
     int     	handles = **data;
     int     	i, padding;
     
-    proto_tree_add_text(pt, *offset, 1, "Number of filter handles: %d", handles);
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of filter handles: %d", handles);
     for (i = 1; i <= handles; i++){
-    	proto_tree_add_text(pt, *offset+i, 1, "Handle %d: %hd", i, *(*data+i));
+    	proto_tree_add_text(pt, NullTVB, *offset+i, 1, "Handle %d: %hd", i, *(*data+i));
     }
     padding = 3 - (handles + 1 + 3) % 4;
     if (padding)
-    	proto_tree_add_text(pt, *offset+1+handles, padding, "padding");
+    	proto_tree_add_text(pt, NullTVB, *offset+1+handles, padding, "padding");
     BUMP (*offset, *data, 1+handles+padding);
 }
 
@@ -814,8 +814,8 @@ dfiltmode (int src, const u_char **data, const u_char *dataend, int *offset, int
     }
     if (i >= SIZEOF(dmodes))
     	i = SIZEOF(dmodes) - 1;
-    proto_tree_add_text(pt, *offset, 1, "Filter mode: %s", dmodes[i].strptr);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Filter mode: %s", dmodes[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -831,8 +831,8 @@ filtmode (int src, const u_char **data, const u_char *dataend, int *offset, int
     }
     if (i >= SIZEOF(modes))
     	i = SIZEOF(modes) - 1;
-    proto_tree_add_text(pt, *offset, 1, "Filter mode: %s", modes[i].strptr);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Filter mode: %s", modes[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -844,10 +844,10 @@ resp_events (int src, const u_char **data, const u_char *dataend, int *offset, i
     
     i = 1;
     while (*data < dataend) {
-    	item = proto_tree_add_text(pt, *offset, 20, "Event %d:", i);
+    	item = proto_tree_add_text(pt, NullTVB, *offset, 20, "Event %d:", i);
 	tree = proto_item_add_subtree (item, ett_gryphon_cmd_events_data);
-	proto_tree_add_text(tree, *offset, 1, "Event ID: %hd", **data);
-	proto_tree_add_text(tree, *offset+1, 19, "Event name: %s", (*data)+1);
+	proto_tree_add_text(tree, NullTVB, *offset, 1, "Event ID: %hd", **data);
+	proto_tree_add_text(tree, NullTVB, *offset+1, 19, "Event name: %s", (*data)+1);
 	BUMP (*offset, *data, 20);
 	i++;
     }
@@ -859,19 +859,19 @@ cmd_register (int src, const u_char **data, const u_char *dataend, int *offset,
     char    	string[33];
     
     MEMCPY (string, *data, 16);
-    proto_tree_add_text(pt, *offset, 16, "Username: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 16, "Username: %s", string);
     BUMP (*offset, *data, 16);
     MEMCPY (string, *data, 32);
-    proto_tree_add_text(pt, *offset, 32, "Password: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 32, "Password: %s", string);
     BUMP (*offset, *data, 32);
 }
 
 void
 resp_register (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt) {
     
-    proto_tree_add_text(pt, *offset, 1, "Client ID: %hd", (*data)[0]);
-    proto_tree_add_text(pt, *offset+1, 1, "Privileges: %hd", (*data)[1]);
-    proto_tree_add_text(pt, *offset+2, 2, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Client ID: %hd", (*data)[0]);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 1, "Privileges: %hd", (*data)[1]);
+    proto_tree_add_text(pt, NullTVB, *offset+2, 2, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -902,38 +902,38 @@ resp_config (int src, const u_char **data, const u_char *dataend, int *offset, i
 
 
    MEMCPY (string, *data, 20);
-    proto_tree_add_text(pt, *offset, 20, "Device name: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 20, "Device name: %s", string);
     BUMP (*offset, *data, 20);
 
     MEMCPY (string, *data, 8);
-    proto_tree_add_text(pt, *offset, 8, "Device version: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 8, "Device version: %s", string);
     BUMP (*offset, *data, 8);
 
     MEMCPY (string, *data, 20);
-    proto_tree_add_text(pt, *offset, 20, "Device serial number: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 20, "Device serial number: %s", string);
     BUMP (*offset, *data, 20);
 
     devices = **data;
-    proto_tree_add_text(pt, *offset, 1, "Number of channels: %d", devices);
-    proto_tree_add_text(pt, *offset+1, 15, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of channels: %d", devices);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 15, "reserved");
     BUMP (*offset, *data, 16);
     for (i = 1; i <= devices; i++) {
-	ti = proto_tree_add_text(pt, *offset, 80, "Channel %d:", i);
+	ti = proto_tree_add_text(pt, NullTVB, *offset, 80, "Channel %d:", i);
 	ft = proto_item_add_subtree(ti, ett_gryphon_cmd_config_device);
 	MEMCPY (string, *data, 20);
-	proto_tree_add_text(ft, *offset, 20, "Driver name: %s", string);
+	proto_tree_add_text(ft, NullTVB, *offset, 20, "Driver name: %s", string);
 	BUMP (*offset, *data, 20);
 
 	MEMCPY (string, *data, 8);
-	proto_tree_add_text(ft, *offset, 8, "Driver version: %s", string);
+	proto_tree_add_text(ft, NullTVB, *offset, 8, "Driver version: %s", string);
 	BUMP (*offset, *data, 8);
 
 	MEMCPY (string, *data, 24);
-	proto_tree_add_text(ft, *offset, 24, "device security string: %s", string);
+	proto_tree_add_text(ft, NullTVB, *offset, 24, "device security string: %s", string);
 	BUMP (*offset, *data, 24);
 
 	MEMCPY (string, *data, 20);
-	proto_tree_add_text(ft, *offset, 20, "Hardware serial number: %s", string);
+	proto_tree_add_text(ft, NullTVB, *offset, 20, "Hardware serial number: %s", string);
 	BUMP (*offset, *data, 20);
 
     	x = pntohs ((unsigned short *)*data);
@@ -943,11 +943,11 @@ resp_config (int src, const u_char **data, const u_char *dataend, int *offset, i
 	}
 	if (j >= SIZEOF(protocol_types))
 	    j = SIZEOF(protocol_types) -1;
-	proto_tree_add_text(ft, *offset, 2, "Protocol type & subtype: %s", protocol_types[j].strptr);
+	proto_tree_add_text(ft, NullTVB, *offset, 2, "Protocol type & subtype: %s", protocol_types[j].strptr);
 	BUMP (*offset, *data, 2);
 
-	proto_tree_add_text(ft, *offset, 1, "Channel ID: %hd", **data);
-	proto_tree_add_text(ft, *offset+1, 5, "reserved");
+	proto_tree_add_text(ft, NullTVB, *offset, 1, "Channel ID: %hd", **data);
+	proto_tree_add_text(ft, NullTVB, *offset+1, 5, "reserved");
 	BUMP (*offset, *data, 6);
     }
 }
@@ -965,39 +965,39 @@ cmd_sched (int src, const u_char **data, const u_char *dataend, int *offset, int
     
     x = pntohl ((unsigned int *)*data);
     if (x == 0xFFFFFFFF)
-    	proto_tree_add_text(pt, *offset, 4, "Number of iterations: infinite");
+    	proto_tree_add_text(pt, NullTVB, *offset, 4, "Number of iterations: infinite");
     else
-    	proto_tree_add_text(pt, *offset, 4, "Number of iterations: %d", x);
+    	proto_tree_add_text(pt, NullTVB, *offset, 4, "Number of iterations: %d", x);
     BUMP (*offset, *data, 4);
     x = pntohl ((unsigned int *)*data);
-    item = proto_tree_add_text(pt, *offset, 4, "Flags");
+    item = proto_tree_add_text(pt, NullTVB, *offset, 4, "Flags");
     tree = proto_item_add_subtree (item, ett_gryphon_flags);
     ptr = x & 1 ? crit : norm;
-    proto_tree_add_text(tree, *offset, 4, ptr, NULL);
+    proto_tree_add_text(tree, NullTVB, *offset, 4, ptr, NULL);
     BUMP (*offset, *data, 4);
     i = 1;
     while (*data < dataend) {
     	length = 16 + (*data)[16] + pntohs ((unsigned short *)((*data)+18)) + (*data)[20] + 16;
 	length += 3 - (length + 3) % 4;
-	item = proto_tree_add_text(pt, *offset, length, "Message %d", i);
+	item = proto_tree_add_text(pt, NullTVB, *offset, length, "Message %d", i);
 	tree = proto_item_add_subtree (item, ett_gryphon_cmd_sched_data);
 	x = pntohl ((unsigned int *)*data);
-	proto_tree_add_text(tree, *offset, 4, "Sleep: %d milliseconds", x);
+	proto_tree_add_text(tree, NullTVB, *offset, 4, "Sleep: %d milliseconds", x);
 	BUMP (*offset, *data, 4);
 	x = pntohl ((unsigned int *)*data);
-	proto_tree_add_text(tree, *offset, 4, "Transmit count: %d", x);
+	proto_tree_add_text(tree, NullTVB, *offset, 4, "Transmit count: %d", x);
 	BUMP (*offset, *data, 4);
 	x = pntohl ((unsigned int *)*data);
-	proto_tree_add_text(tree, *offset, 4, "Transmit period: %d milliseconds", x);
+	proto_tree_add_text(tree, NullTVB, *offset, 4, "Transmit period: %d milliseconds", x);
 	BUMP (*offset, *data, 4);
-	proto_tree_add_text(tree, *offset, 2, "reserved flags");
+	proto_tree_add_text(tree, NullTVB, *offset, 2, "reserved flags");
 	x = *((*data)+2);
 	if (x == 0)
 	    x = def_chan;
-	proto_tree_add_text(tree, *offset+2, 1, "Channel: %d", x);
-	proto_tree_add_text(tree, *offset+3, 1, "reserved");
+	proto_tree_add_text(tree, NullTVB, *offset+2, 1, "Channel: %d", x);
+	proto_tree_add_text(tree, NullTVB, *offset+3, 1, "reserved");
 	BUMP (*offset, *data, 4);
-	item1 = proto_tree_add_text(tree, *offset, length, "Message");
+	item1 = proto_tree_add_text(tree, NullTVB, *offset, length, "Message");
 	tree1 = proto_item_add_subtree (item1, ett_gryphon_cmd_sched_cmd);
    	decode_data (src, data, dataend, offset, msglen, tree1);
 	i++;
@@ -1021,13 +1021,13 @@ resp_blm_data (int src, const u_char **data, const u_char *dataend, int *offset,
     minutes = (timestamp / (100000 * 60)) % 60;
     seconds = (timestamp / 100000) % 60;
     fraction = timestamp % 100000;
-    proto_tree_add_text(pt, *offset, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "Timestamp: %d:%02d:%02d.%05d", hours, minutes, seconds, fraction);
     BUMP (*offset, *data, 4);
     for (i = 0; i < SIZEOF(fields); i++){
     	x = pntohs ((unsigned short *)(*data));
 	fract = x % 100;
 	x /= 100;
-	proto_tree_add_text(pt, *offset, 2, fields[i], x, fract);
+	proto_tree_add_text(pt, NullTVB, *offset, 2, fields[i], x, fract);
 	BUMP (*offset, *data, 2);
     }
 }
@@ -1048,7 +1048,7 @@ resp_blm_stat (int src, const u_char **data, const u_char *dataend, int *offset,
     resp_blm_data (src, data, dataend, offset, msglen, pt);
     for (i = 0; i < SIZEOF(fields); i++){
     	x = pntohl ((unsigned int *)(*data));
-	proto_tree_add_text(pt, *offset, 4, fields[i], x);
+	proto_tree_add_text(pt, NullTVB, *offset, 4, fields[i], x);
 	BUMP (*offset, *data, 4);
     }
 }
@@ -1065,22 +1065,22 @@ cmd_addresp (int src, const u_char **data, const u_char *dataend, int *offset, i
     char    	inactive[] = ".... ..0. = The response is inactive";
 
     actionType = 0;
-    item = proto_tree_add_text(pt, *offset, 1, "Flags");
+    item = proto_tree_add_text(pt, NullTVB, *offset, 1, "Flags");
     tree = proto_item_add_subtree (item, ett_gryphon_flags);
     if (**data & FILTER_ACTIVE_FLAG)
     	ptr = active;
     else
     	ptr = inactive;
-    proto_tree_add_text(tree, *offset, 1, ptr, NULL);
+    proto_tree_add_text(tree, NullTVB, *offset, 1, ptr, NULL);
     BUMP (*offset, *data, 1);
     blocks = **data;
-    proto_tree_add_text(pt, *offset, 1, "Number of filter blocks = %d", blocks);
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of filter blocks = %d", blocks);
     BUMP (*offset, *data, 1);
     responses = **data;
-    proto_tree_add_text(pt, *offset, 1, "Number of response blocks = %d", responses);
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of response blocks = %d", responses);
     BUMP (*offset, *data, 1);
     old_handle = **data;
-    proto_tree_add_text(pt, *offset, 1, "Old handle = %d", old_handle);
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Old handle = %d", old_handle);
     BUMP (*offset, *data, 1);
     action = **data;
     switch (action & 7) {
@@ -1096,22 +1096,22 @@ cmd_addresp (int src, const u_char **data, const u_char *dataend, int *offset, i
     default:
     	ptr = "- unknown -";
     }
-    item = proto_tree_add_text(pt, *offset, 1, "Action = %s", ptr);
+    item = proto_tree_add_text(pt, NullTVB, *offset, 1, "Action = %s", ptr);
     tree = proto_item_add_subtree (item, ett_gryphon_flags);
     if (action & FR_DEACT_AFTER_PER && !(action & FR_DELETE)){
-    	proto_tree_add_text(tree, *offset, 1,
+    	proto_tree_add_text(tree, NullTVB, *offset, 1,
 	    	"1.0. .... Deactivate this response after the specified period following a conforming message");
     }
     if (action & FR_DEACT_ON_EVENT && !(action & FR_DELETE)){
-    	proto_tree_add_text(tree, *offset, 1,
+    	proto_tree_add_text(tree, NullTVB, *offset, 1,
 	    	".10. .... Deactivate this response for a conforming message");
     }
     if (action & FR_DEACT_AFTER_PER && action & FR_DELETE){
-    	proto_tree_add_text(tree, *offset, 1,
+    	proto_tree_add_text(tree, NullTVB, *offset, 1,
 	    	"1.1. .... Delete this response after the specified period following a conforming message");
     }
     if (action & FR_DEACT_ON_EVENT && action & FR_DELETE){
-    	proto_tree_add_text(tree, *offset, 1,
+    	proto_tree_add_text(tree, NullTVB, *offset, 1,
 	    	".11. .... Delete this response for a conforming message");
     }
     actionValue = pntohs ((unsigned short *)((*data)+2));
@@ -1123,30 +1123,30 @@ cmd_addresp (int src, const u_char **data, const u_char *dataend, int *offset, i
     	    ptr = "...0 .... The period is in 0.01 seconds";
 	    actionType = 0;
 	}
-    	proto_tree_add_text(tree, *offset, 1, ptr, NULL);
+    	proto_tree_add_text(tree, NullTVB, *offset, 1, ptr, NULL);
     }
     BUMP (*offset, *data, 1);
-    proto_tree_add_text(pt, *offset, 1, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "reserved");
     BUMP (*offset, *data, 1);
     if (actionValue) {
     	if (actionType == 1) {
-	    proto_tree_add_text(tree, *offset, 2, "Period: %d messages", actionValue);
+	    proto_tree_add_text(tree, NullTVB, *offset, 2, "Period: %d messages", actionValue);
 	} else {
-	    proto_tree_add_text(tree, *offset, 2, "Period: %d.%02d seconds", actionValue/100, actionValue%100);
+	    proto_tree_add_text(tree, NullTVB, *offset, 2, "Period: %d.%02d seconds", actionValue/100, actionValue%100);
 	}
     }
     BUMP (*offset, *data, 2);
     for (i = 1; i <= blocks; i++) {
 	length = pntohs ((unsigned short *)((*data)+2)) * 2 + 8;
 	length += 3 - (length + 3) % 4;
-	item = proto_tree_add_text(pt, *offset, length, "Filter block %d", i);
+	item = proto_tree_add_text(pt, NullTVB, *offset, length, "Filter block %d", i);
 	tree = proto_item_add_subtree (item, ett_gryphon_cmd_filter_block);
 	filter_block (src, data, dataend, offset, msglen, tree);
     }
     for (i = 1; i <= responses; i++) {
 	length = pntohs ((unsigned short *)((*data)+4)) + 8;
 	length += 3 - (length + 3) % 4;
-	item = proto_tree_add_text(pt, *offset, length, "Response block %d", i);
+	item = proto_tree_add_text(pt, NullTVB, *offset, length, "Response block %d", i);
 	tree = proto_item_add_subtree (item, ett_gryphon_cmd_response_block);
     	dissector((*data)-*offset, *offset, NULL, tree);
     	BUMP (*offset, *data, length);
@@ -1157,8 +1157,8 @@ void
 resp_addresp (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt)
 {
     if (*data < dataend) {
-	proto_tree_add_text(pt, *offset, 1, "Response handle: %hd", **data);
-	proto_tree_add_text(pt, *offset+1, 3, "reserved");
+	proto_tree_add_text(pt, NullTVB, *offset, 1, "Response handle: %hd", **data);
+	proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
 	BUMP (*offset, *data, 4);
     }
 }
@@ -1171,11 +1171,11 @@ cmd_modresp (int src, const u_char **data, const u_char *dataend, int *offset, i
     int     	    i;
 
     if (**data)
-    	proto_tree_add_text(pt, *offset, 1, "Response handle: %hd", **data);
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Response handle: %hd", **data);
     else if (dest)
-    	proto_tree_add_text(pt, *offset, 1, "Response handles: all on channel %hd", dest);
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Response handles: all on channel %hd", dest);
     else
-    	proto_tree_add_text(pt, *offset, 1, "Response handles: all");
+    	proto_tree_add_text(pt, NullTVB, *offset, 1, "Response handles: all");
     action = *((*data) + 1);
     for (i = 0; i < SIZEOF(filtacts); i++) {
     	if (filtacts[i].value == action)
@@ -1183,8 +1183,8 @@ cmd_modresp (int src, const u_char **data, const u_char *dataend, int *offset, i
     }
     if (i >= SIZEOF(filtacts))
     	i = SIZEOF(filtacts) - 1;
-    proto_tree_add_text(pt, *offset+1, 1, "Action: %s response", filtacts[i].strptr);
-    proto_tree_add_text(pt, *offset+2, 2, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset+1, 1, "Action: %s response", filtacts[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset+2, 2, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -1194,13 +1194,13 @@ resp_resphan (int src, const u_char **data, const u_char *dataend, int *offset,
     int     	handles = **data;
     int     	i, padding;
     
-    proto_tree_add_text(pt, *offset, 1, "Number of response handles: %d", handles);
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of response handles: %d", handles);
     for (i = 1; i <= handles; i++){
-    	proto_tree_add_text(pt, *offset+i, 1, "Handle %d: %hd", i, *(*data+i));
+    	proto_tree_add_text(pt, NullTVB, *offset+i, 1, "Handle %d: %hd", i, *(*data+i));
     }
     padding = 3 - (handles + 1 + 3) % 4;
     if (padding)
-    	proto_tree_add_text(pt, *offset+1+handles, padding, "padding");
+    	proto_tree_add_text(pt, NullTVB, *offset+1+handles, padding, "padding");
     BUMP (*offset, *data, 1+handles+padding);
 }
 
@@ -1208,7 +1208,7 @@ void
 resp_sched (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt)
 {
     unsigned int    id = pntohl ((unsigned int *)(*data));
-    proto_tree_add_text(pt, *offset, 4, "Transmit schedule ID: %d", id);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "Transmit schedule ID: %d", id);
     BUMP (*offset, *data, 4);
 }
 
@@ -1217,15 +1217,15 @@ cmd_desc (int src, const u_char **data, const u_char *dataend, int *offset, int
 {
     u_char  string[81];
     
-    proto_tree_add_text(pt, *offset, 4, "Program size: %d bytes", pntohl ((unsigned int *)(*data)));
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "Program size: %d bytes", pntohl ((unsigned int *)(*data)));
     BUMP (*offset, *data, 4);
     strncpy (string, *data, 32);
     string[32] = 0;
-    proto_tree_add_text(pt, *offset, 32, "Program name: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 32, "Program name: %s", string);
     BUMP (*offset, *data, 32);
     strncpy (string, *data, 80);
     string[80] = 0;
-    proto_tree_add_text(pt, *offset, 80, "Program description: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 80, "Program description: %s", string);
     BUMP (*offset, *data, 80);
 }
 
@@ -1238,15 +1238,15 @@ resp_desc (int src, const u_char **data, const u_char *dataend, int *offset, int
     char    	missing[] = ".... ...0 = The program is not present";
     char    	present[] = ".... ...1 = The program is already present";
     
-    item = proto_tree_add_text(pt, *offset, 1, "Flags");
+    item = proto_tree_add_text(pt, NullTVB, *offset, 1, "Flags");
     tree = proto_item_add_subtree (item, ett_gryphon_flags);
     if (**data & 1)
     	ptr = present;
     else
     	ptr = missing;
-    proto_tree_add_text(tree, *offset, 1, ptr);
-    proto_tree_add_text(pt, *offset+1, 1, "Handle: %hd", (*data)[1]);
-    proto_tree_add_text(pt, *offset+2, 2, "reserved");
+    proto_tree_add_text(tree, NullTVB, *offset, 1, ptr);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 1, "Handle: %hd", (*data)[1]);
+    proto_tree_add_text(pt, NullTVB, *offset+2, 2, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -1254,16 +1254,16 @@ void
 cmd_upload (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt) {
     unsigned int    length;
     
-    proto_tree_add_text(pt, *offset, 2, "Block number: %d", pntohs ((unsigned short *)(*data)));
+    proto_tree_add_text(pt, NullTVB, *offset, 2, "Block number: %d", pntohs ((unsigned short *)(*data)));
     BUMP (*offset, *data, 4);
-    proto_tree_add_text(pt, *offset+2, 1, "Handle: %hd", (*data)[2]);
+    proto_tree_add_text(pt, NullTVB, *offset+2, 1, "Handle: %hd", (*data)[2]);
     BUMP (*offset, *data, 3);
     length = *data - dataend;
-    proto_tree_add_text(pt, *offset, length, "Data (%d bytes)", length);
+    proto_tree_add_text(pt, NullTVB, *offset, length, "Data (%d bytes)", length);
     BUMP (*offset, *data, length);
     length = 3 - (length + 3) % 4;
     if (length) {
-	proto_tree_add_text(pt, *offset, length, "padding");
+	proto_tree_add_text(pt, NullTVB, *offset, length, "padding");
 	BUMP (*offset, *data, length);
     }
 }
@@ -1274,15 +1274,15 @@ cmd_delete (int src, const u_char **data, const u_char *dataend, int *offset, in
     
     strncpy (string, *data, 32);
     string[32] = 0;
-    proto_tree_add_text(pt, *offset, 32, "Program name: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, 32, "Program name: %s", string);
     BUMP (*offset, *data, 32);
 }
 
 void
 cmd_list (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt) {
     
-    proto_tree_add_text(pt, *offset, 1, "Block number: %hd", (*data)[0]);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Block number: %hd", (*data)[0]);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -1294,21 +1294,21 @@ resp_list (int src, const u_char **data, const u_char *dataend, int *offset, int
     unsigned int    i, count;
     
     count = (*data)[0];
-    proto_tree_add_text(pt, *offset, 1, "Number of programs in this response: %d", count);
-    proto_tree_add_text(pt, *offset+1, 1, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of programs in this response: %d", count);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 1, "reserved");
     BUMP (*offset, *data, 2);
-    proto_tree_add_text(pt, *offset, 2, "Number of remaining programs: %d", pntohs ((unsigned short *)(*data)));
+    proto_tree_add_text(pt, NullTVB, *offset, 2, "Number of remaining programs: %d", pntohs ((unsigned short *)(*data)));
     BUMP (*offset, *data, 2);
     for (i = 1; i <= count; i++) {
-	item = proto_tree_add_text(pt, *offset, 112, "Program %d", i);
+	item = proto_tree_add_text(pt, NullTVB, *offset, 112, "Program %d", i);
 	tree = proto_item_add_subtree (item, ett_gryphon_pgm_list);
 	strncpy (string, *data, 32);
 	string[32] = 0;
-	proto_tree_add_text(tree, *offset, 32, "Name: %s", string);
+	proto_tree_add_text(tree, NullTVB, *offset, 32, "Name: %s", string);
 	BUMP (*offset, *data, 32);
 	strncpy (string, *data, 80);
 	string[80] = 0;
-	proto_tree_add_text(tree, *offset, 80, "Description: %s", string);
+	proto_tree_add_text(tree, NullTVB, *offset, 80, "Description: %s", string);
 	BUMP (*offset, *data, 80);
     }
 }
@@ -1322,11 +1322,11 @@ cmd_start (int src, const u_char **data, const u_char *dataend, int *offset, int
     strncpy (string, *data, 119);
     string[119] = 0;
     length = strlen (string) + 1;
-    proto_tree_add_text(pt, *offset, length, "Arguments: %s", string);
+    proto_tree_add_text(pt, NullTVB, *offset, length, "Arguments: %s", string);
     BUMP (*offset, *data, length);
     length = 3 - (length + 3) % 4;
     if (length) {
-	proto_tree_add_text(pt, *offset, length, "padding");
+	proto_tree_add_text(pt, NullTVB, *offset, length, "padding");
 	BUMP (*offset, *data, length);
     }
 }
@@ -1334,8 +1334,8 @@ cmd_start (int src, const u_char **data, const u_char *dataend, int *offset, int
 void
 resp_start (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt) {
     
-    proto_tree_add_text(pt, *offset, 1, "Channel (Client) number: %hd", (*data)[0]);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Channel (Client) number: %hd", (*data)[0]);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -1346,18 +1346,18 @@ resp_status (int src, const u_char **data, const u_char *dataend, int *offset, i
     unsigned int    i, copies, length;
     
     copies = (*data)[0];
-    item = proto_tree_add_text(pt, *offset, 1, "Number of running copies: %d", copies);
+    item = proto_tree_add_text(pt, NullTVB, *offset, 1, "Number of running copies: %d", copies);
     tree = proto_item_add_subtree (item, ett_gryphon_pgm_status);
     BUMP (*offset, *data, 1);
     if (copies) {
 	for (i = 1; i <= copies; i++) {
-	    proto_tree_add_text(tree, *offset, 1, "Program %d channel (client) number %hd", i, (*data)[0]);
+	    proto_tree_add_text(tree, NullTVB, *offset, 1, "Program %d channel (client) number %hd", i, (*data)[0]);
     	    BUMP (*offset, *data, 1);
 	}
     }
     length = 3 - (copies + 1 + 3) % 4;
     if (length) {
-	proto_tree_add_text(pt, *offset, length, "padding");
+	proto_tree_add_text(pt, NullTVB, *offset, length, "padding");
 	BUMP (*offset, *data, length);
     }
 }
@@ -1369,13 +1369,13 @@ cmd_options (int src, const u_char **data, const u_char *dataend, int *offset, i
     unsigned int    i, size, padding, option, option_length, option_value;
     unsigned char   *string, *string1;
     
-    item = proto_tree_add_text(pt, *offset, 1, "Handle: %hd", **data);
-    item = proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    item = proto_tree_add_text(pt, NullTVB, *offset, 1, "Handle: %hd", **data);
+    item = proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
     for (i = 1; *data <= dataend; i++) {
     	size = (*data)[1] + 2;
 	padding = 3 - ((size + 3) %4);
-	item = proto_tree_add_text(pt, *offset, size + padding, "Option number %d", i);
+	item = proto_tree_add_text(pt, NullTVB, *offset, size + padding, "Option number %d", i);
     	tree = proto_item_add_subtree (item, ett_gryphon_pgm_options);
 	option = **data;
 	option_length = (*data)[1];
@@ -1418,10 +1418,10 @@ cmd_options (int src, const u_char **data, const u_char *dataend, int *offset, i
 	    }
 	    break;
 	}
-	proto_tree_add_text(tree, *offset, 1, "%s", string);
-	proto_tree_add_text(tree, *offset+2, option_length, "%s", string1);
+	proto_tree_add_text(tree, NullTVB, *offset, 1, "%s", string);
+	proto_tree_add_text(tree, NullTVB, *offset+2, option_length, "%s", string1);
 	if (padding)
-	    proto_tree_add_text(tree, *offset+option_length+2, padding, "padding");
+	    proto_tree_add_text(tree, NullTVB, *offset+option_length+2, padding, "padding");
     	BUMP (*offset, *data, size + padding);
     }
 }
@@ -1429,8 +1429,8 @@ cmd_options (int src, const u_char **data, const u_char *dataend, int *offset, i
 void
 speed (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt) {
     
-    proto_tree_add_text(pt, *offset, 1, "Baud rate index: %hd", (*data)[0]);
-    proto_tree_add_text(pt, *offset+1, 3, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset, 1, "Baud rate index: %hd", (*data)[0]);
+    proto_tree_add_text(pt, NullTVB, *offset+1, 3, "reserved");
     BUMP (*offset, *data, 4);
 }
 
@@ -1438,9 +1438,9 @@ void
 filter_block (int src, const u_char **data, const u_char *dataend, int *offset, int msglen, proto_tree *pt) {
     int     length, type, i, operator, padding;
     
-    proto_tree_add_text(pt, *offset, 2, "Filter field starts at byte %d", pntohs ((unsigned short *)(*data)));
+    proto_tree_add_text(pt, NullTVB, *offset, 2, "Filter field starts at byte %d", pntohs ((unsigned short *)(*data)));
     length = pntohs ((unsigned short *)((*data)+2));
-    proto_tree_add_text(pt, *offset+2, 2, "Filter field is %d bytes long", length);
+    proto_tree_add_text(pt, NullTVB, *offset+2, 2, "Filter field is %d bytes long", length);
     type = *((*data)+4);
     for (i = 0; i < SIZEOF(filter_data_types); i++) {
     	if (filter_data_types[i].value == type)
@@ -1448,7 +1448,7 @@ filter_block (int src, const u_char **data, const u_char *dataend, int *offset,
     }
     if (i >= SIZEOF(filter_data_types))
     	i = SIZEOF(filter_data_types) - 1;
-    proto_tree_add_text(pt, *offset+4, 1, "Filtering on %s", filter_data_types[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset+4, 1, "Filtering on %s", filter_data_types[i].strptr);
 
     operator = *((*data)+5);
     for (i = 0; i < SIZEOF(operators); i++) {
@@ -1457,32 +1457,32 @@ filter_block (int src, const u_char **data, const u_char *dataend, int *offset,
     }
     if (i >= SIZEOF(operators))
     	i = SIZEOF(operators) - 1;
-    proto_tree_add_text(pt, *offset+5, 1, "Type of comparison: %s", operators[i].strptr);
-    proto_tree_add_text(pt, *offset+6, 2, "reserved");
+    proto_tree_add_text(pt, NullTVB, *offset+5, 1, "Type of comparison: %s", operators[i].strptr);
+    proto_tree_add_text(pt, NullTVB, *offset+6, 2, "reserved");
     BUMP (*offset, *data, 8);
     
     if (operator == BIT_FIELD_CHECK) {
-    	proto_tree_add_text(pt, *offset, length, "Pattern");
-    	proto_tree_add_text(pt, *offset+length, length, "Mask");
+    	proto_tree_add_text(pt, NullTVB, *offset, length, "Pattern");
+    	proto_tree_add_text(pt, NullTVB, *offset+length, length, "Mask");
     } else {
     	switch (length) {
 	case 1:
-    	    proto_tree_add_text(pt, *offset, 1, "Value: %hd", **data);
+    	    proto_tree_add_text(pt, NullTVB, *offset, 1, "Value: %hd", **data);
 	    break;
 	case 2:
-   	    proto_tree_add_text(pt, *offset, 2, "Value: %d", pntohs ((unsigned short *)(*data)));
+   	    proto_tree_add_text(pt, NullTVB, *offset, 2, "Value: %d", pntohs ((unsigned short *)(*data)));
 	    break;
 	case 4:
-   	    proto_tree_add_text(pt, *offset, 4, "Value: %dl", pntohl ((unsigned long *)(*data)));
+   	    proto_tree_add_text(pt, NullTVB, *offset, 4, "Value: %dl", pntohl ((unsigned long *)(*data)));
 	    break;
 	default:
-   	    proto_tree_add_text(pt, *offset, length, "Value");
+   	    proto_tree_add_text(pt, NullTVB, *offset, length, "Value");
 	}
     }
     BUMP (*offset, *data, length * 2);
     padding = 3 - (length * 2 + 3) % 4;
     if (padding) {
-    	proto_tree_add_text(pt, *offset, padding, "padding");
+    	proto_tree_add_text(pt, NullTVB, *offset, padding, "padding");
 	BUMP (*offset, *data, padding);
     }
 }
@@ -1514,9 +1514,9 @@ blm_mode (int src, const u_char **data, const u_char *dataend, int *offset, int
     	mode = "- unknown -";
 	sprintf (line, "reserved");
     }
-    proto_tree_add_text(pt, *offset, 4, "Mode: %s", mode);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, "Mode: %s", mode);
     BUMP (*offset, *data, 4);
-    proto_tree_add_text(pt, *offset, 4, line, NULL);
+    proto_tree_add_text(pt, NullTVB, *offset, 4, line, NULL);
     BUMP (*offset, *data, 4);
 }