Created a new protocol tree implementation and a new display filter

mechanism that is built into ethereal. Wiretap is now used to read all
file formats. Libpcap is used only for capturing.

svn path=/trunk/; revision=342

1 files changed, 210 insertions, 220 deletions

diff --git a/packet-smb.c b/packet-smb.c
index 5edeaa6958..9ae2b4d39c 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb.c,v 1.14 1999/07/01 04:04:36 sharpe Exp $
+ * $Id: packet-smb.c,v 1.15 1999/07/07 22:51:53 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -316,7 +316,7 @@ dissect_unknown_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
   if (tree) {
 
-    proto_tree_add_item(tree, offset, END_OF_FRAME, "Data (%u bytes)", 
+    proto_tree_add_text(tree, offset, END_OF_FRAME, "Data (%u bytes)", 
 			END_OF_FRAME); 
 
   }
@@ -421,7 +421,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -433,7 +433,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -445,7 +445,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "BufferFormat1: %u", BufferFormat1);
+      proto_tree_add_text(tree, offset, 1, "BufferFormat1: %u", BufferFormat1);
 
     }
 
@@ -457,7 +457,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(SharePath) + 1, "Share Path: %s", SharePath);
+      proto_tree_add_text(tree, offset, strlen(SharePath) + 1, "Share Path: %s", SharePath);
 
     }
 
@@ -469,7 +469,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "BufferFormat2: %u", BufferFormat2);
+      proto_tree_add_text(tree, offset, 1, "BufferFormat2: %u", BufferFormat2);
 
     }
 
@@ -481,7 +481,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(Password) + 1, "Password: %s", Password);
+      proto_tree_add_text(tree, offset, strlen(Password) + 1, "Password: %s", Password);
 
     }
 
@@ -493,7 +493,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "BufferFormat3: %u", BufferFormat3);
+      proto_tree_add_text(tree, offset, 1, "BufferFormat3: %u", BufferFormat3);
 
     }
 
@@ -505,7 +505,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(Service) + 1, "Service: %s", Service);
+      proto_tree_add_text(tree, offset, strlen(Service) + 1, "Service: %s", Service);
 
     }
 
@@ -521,7 +521,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -533,7 +533,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max Buffer Size: %u", MaxBufferSize);
+      proto_tree_add_text(tree, offset, 2, "Max Buffer Size: %u", MaxBufferSize);
 
     }
 
@@ -545,7 +545,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "TID: %u", TID);
+      proto_tree_add_text(tree, offset, 2, "TID: %u", TID);
 
     }
 
@@ -557,7 +557,7 @@ dissect_treecon_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -611,7 +611,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+        proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
       }
 
@@ -623,7 +623,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 1, "AndXCommand: %u", AndXCommand);
+        proto_tree_add_text(tree, offset, 1, "AndXCommand: %u", AndXCommand);
 
       }
 
@@ -635,7 +635,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 1, "AndXReserved: %u", AndXReserved);
+        proto_tree_add_text(tree, offset, 1, "AndXReserved: %u", AndXReserved);
 
       }
 
@@ -647,7 +647,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "AndXOffset: %u", AndXOffset);
+        proto_tree_add_text(tree, offset, 2, "AndXOffset: %u", AndXOffset);
 
       }
 
@@ -659,7 +659,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "MaxBufferSize: %u", MaxBufferSize);
+        proto_tree_add_text(tree, offset, 2, "MaxBufferSize: %u", MaxBufferSize);
 
       }
 
@@ -671,7 +671,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "MaxMpxCount: %u", MaxMpxCount);
+        proto_tree_add_text(tree, offset, 2, "MaxMpxCount: %u", MaxMpxCount);
 
       }
 
@@ -683,7 +683,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "VcNumber: %u", VcNumber);
+        proto_tree_add_text(tree, offset, 2, "VcNumber: %u", VcNumber);
 
       }
 
@@ -695,7 +695,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 4, "SessionKey: %u", SessionKey);
+        proto_tree_add_text(tree, offset, 4, "SessionKey: %u", SessionKey);
 
       }
 
@@ -707,7 +707,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "PasswordLen: %u", PasswordLen);
+        proto_tree_add_text(tree, offset, 2, "PasswordLen: %u", PasswordLen);
 
       }
 
@@ -719,7 +719,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 4, "Reserved: %u", Reserved);
+        proto_tree_add_text(tree, offset, 4, "Reserved: %u", Reserved);
 
       }
 
@@ -731,7 +731,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+        proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
       }
 
@@ -743,7 +743,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(AccountName) + 1, "AccountName: %s", AccountName);
+        proto_tree_add_text(tree, offset, strlen(AccountName) + 1, "AccountName: %s", AccountName);
 
       }
 
@@ -755,7 +755,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(PrimaryDomain) + 1, "PrimaryDomain: %s", PrimaryDomain);
+        proto_tree_add_text(tree, offset, strlen(PrimaryDomain) + 1, "PrimaryDomain: %s", PrimaryDomain);
 
       }
 
@@ -767,7 +767,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(NativeOS) + 1, "NativeOS: %s", NativeOS);
+        proto_tree_add_text(tree, offset, strlen(NativeOS) + 1, "NativeOS: %s", NativeOS);
 
       }
 
@@ -783,7 +783,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+        proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
       }
 
@@ -795,7 +795,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 1, "AndXCommand: %u", AndXCommand);
+        proto_tree_add_text(tree, offset, 1, "AndXCommand: %u", AndXCommand);
 
       }
 
@@ -807,7 +807,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 1, "AndXReserved: %u", AndXReserved);
+        proto_tree_add_text(tree, offset, 1, "AndXReserved: %u", AndXReserved);
 
       }
 
@@ -819,7 +819,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "AndXOffset: %u", AndXOffset);
+        proto_tree_add_text(tree, offset, 2, "AndXOffset: %u", AndXOffset);
 
       }
 
@@ -831,7 +831,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "MaxBufferSize: %u", MaxBufferSize);
+        proto_tree_add_text(tree, offset, 2, "MaxBufferSize: %u", MaxBufferSize);
 
       }
 
@@ -843,7 +843,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "MaxMpxCount: %u", MaxMpxCount);
+        proto_tree_add_text(tree, offset, 2, "MaxMpxCount: %u", MaxMpxCount);
 
       }
 
@@ -855,7 +855,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "VcNumber: %u", VcNumber);
+        proto_tree_add_text(tree, offset, 2, "VcNumber: %u", VcNumber);
 
       }
 
@@ -867,7 +867,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 4, "SessionKey: %u", SessionKey);
+        proto_tree_add_text(tree, offset, 4, "SessionKey: %u", SessionKey);
 
       }
 
@@ -879,7 +879,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "ANSI Account Password Length: %u", ANSIAccountPasswordLength);
+        proto_tree_add_text(tree, offset, 2, "ANSI Account Password Length: %u", ANSIAccountPasswordLength);
 
       }
 
@@ -891,7 +891,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "UNICODE Account Password Length: %u", UNICODEAccountPasswordLength);
+        proto_tree_add_text(tree, offset, 2, "UNICODE Account Password Length: %u", UNICODEAccountPasswordLength);
 
       }
 
@@ -903,7 +903,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 4, "Reserved: %u", Reserved);
+        proto_tree_add_text(tree, offset, 4, "Reserved: %u", Reserved);
 
       }
 
@@ -915,36 +915,35 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        ti = proto_tree_add_item(tree, offset, 4, "Capabilities: 0x%04x", Capabilities);
-        Capabilities_tree = proto_tree_new();
-        proto_item_add_subtree(ti, Capabilities_tree, ETT_SMB_CAPABILITIES);
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        ti = proto_tree_add_text(tree, offset, 4, "Capabilities: 0x%04x", Capabilities);
+        Capabilities_tree = proto_item_add_subtree(ti, ETT_SMB_CAPABILITIES);
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0001, 32, " Raw Mode supported", " Raw Mode not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0002, 32, " Raw Mode supported", " MPX Mode not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0004, 32," Unicode supported", " Unicode not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0008, 32, " Large Files supported", " Large Files not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0010, 32, " NT LM 0.12 SMBs supported", " NT LM 0.12 SMBs not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0020, 32, " RPC Remote APIs supported", " RPC Remote APIs not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0040, 32, " NT Status Codes supported", " NT Status Codes not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0080, 32, " Level 2 OpLocks supported", " Level 2 OpLocks not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0100, 32, " Lock&Read supported", " Lock&Read not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x0200, 32, " NT Find supported", " NT Find not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x1000, 32, " DFS supported", " DFS not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x4000, 32, " Large READX supported", " Large READX not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x8000, 32, " Large WRITEX supported", " Large WRITEX not supported"));
-        proto_tree_add_item(Capabilities_tree, offset, 4, "%s",
+        proto_tree_add_text(Capabilities_tree, offset, 4, "%s",
                             decode_boolean_bitfield(Capabilities, 0x80000000, 32, " Extended Security Exchanges supported", " Extended Security Exchanges not supported"));
       
 }
@@ -957,7 +956,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, 2, "Byte Count: %u", ByteCount);
+        proto_tree_add_text(tree, offset, 2, "Byte Count: %u", ByteCount);
 
       }
 
@@ -969,7 +968,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(ANSIPassword) + 1, "ANSI Password: %s", ANSIPassword);
+        proto_tree_add_text(tree, offset, strlen(ANSIPassword) + 1, "ANSI Password: %s", ANSIPassword);
 
       }
 
@@ -983,7 +982,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
 	if (tree) {
 
-	  proto_tree_add_item(tree, offset, strlen(UNICODEPassword) + 1, "UNICODE Password: %s", UNICODEPassword);
+	  proto_tree_add_text(tree, offset, strlen(UNICODEPassword) + 1, "UNICODE Password: %s", UNICODEPassword);
 
 	}
 
@@ -997,7 +996,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(AccountName) + 1, "Account Name: %s", AccountName);
+        proto_tree_add_text(tree, offset, strlen(AccountName) + 1, "Account Name: %s", AccountName);
 
       }
 
@@ -1009,7 +1008,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(PrimaryDomain) + 1, "Primary Domain: %s", PrimaryDomain);
+        proto_tree_add_text(tree, offset, strlen(PrimaryDomain) + 1, "Primary Domain: %s", PrimaryDomain);
 
       }
 
@@ -1021,7 +1020,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(NativeOS) + 1, "Native OS: %s", NativeOS);
+        proto_tree_add_text(tree, offset, strlen(NativeOS) + 1, "Native OS: %s", NativeOS);
 
       }
 
@@ -1033,7 +1032,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
       if (tree) {
 
-        proto_tree_add_item(tree, offset, strlen(NativeLanManType) + 1, "Native LanMan Type: %s", NativeLanManType);
+        proto_tree_add_text(tree, offset, strlen(NativeLanManType) + 1, "Native LanMan Type: %s", NativeLanManType);
 
       }
 
@@ -1060,7 +1059,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -1072,7 +1071,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "AndXCommand: %u", AndXCommand);
+      proto_tree_add_text(tree, offset, 1, "AndXCommand: %u", AndXCommand);
 
     }
 
@@ -1084,7 +1083,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "AndXReserved: %u", AndXReserved);
+      proto_tree_add_text(tree, offset, 1, "AndXReserved: %u", AndXReserved);
 
     }
 
@@ -1096,7 +1095,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "AndXOffset: %u", AndXOffset);
+      proto_tree_add_text(tree, offset, 2, "AndXOffset: %u", AndXOffset);
 
     }
 
@@ -1108,7 +1107,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Action: %u", Action);
+      proto_tree_add_text(tree, offset, 2, "Action: %u", Action);
 
     }
 
@@ -1120,7 +1119,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -1132,7 +1131,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(NativeOS) + 1, "NativeOS: %s", NativeOS);
+      proto_tree_add_text(tree, offset, strlen(NativeOS) + 1, "NativeOS: %s", NativeOS);
 
     }
 
@@ -1144,7 +1143,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(NativeLanMan) + 1, "NativeLanMan: %s", NativeLanMan);
+      proto_tree_add_text(tree, offset, strlen(NativeLanMan) + 1, "NativeLanMan: %s", NativeLanMan);
 
     }
 
@@ -1156,7 +1155,7 @@ dissect_ssetup_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(PrimaryDomain) + 1, "PrimaryDomain: %s", PrimaryDomain);
+      proto_tree_add_text(tree, offset, strlen(PrimaryDomain) + 1, "PrimaryDomain: %s", PrimaryDomain);
 
     }
 
@@ -1194,9 +1193,9 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Invalid TCON_ANDX format. WCT should be 2, 3, or 4 ..., not %u", wct);
+      proto_tree_add_text(tree, offset, 1, "Invalid TCON_ANDX format. WCT should be 2, 3, or 4 ..., not %u", wct);
 
-      proto_tree_add_item(tree, offset, END_OF_FRAME, "Data");
+      proto_tree_add_text(tree, offset, END_OF_FRAME, "Data");
 
       return;
 
@@ -1206,7 +1205,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
   if (tree) {
 
-    proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", wct);
+    proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", wct);
 
   }
 
@@ -1216,11 +1215,11 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
   if (tree) {
 
-    proto_tree_add_item(tree, offset, 1, "Next Command: %s",
+    proto_tree_add_text(tree, offset, 1, "Next Command: %s",
 			(andxcmd == 0xFF) ? "No further commands":
 			decode_smb_name(andxcmd));
 		
-    proto_tree_add_item(tree, offset + 1, 1, "Reserved (MBZ): %u", pd[offset+1]);
+    proto_tree_add_text(tree, offset + 1, 1, "Reserved (MBZ): %u", pd[offset+1]);
 
   }
 
@@ -1230,7 +1229,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
   if (tree) {
 
-    proto_tree_add_item(tree, offset, 2, "Offset to next command: %u", andxoffs);
+    proto_tree_add_text(tree, offset, 2, "Offset to next command: %u", andxoffs);
 
   }
 
@@ -1244,10 +1243,9 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      ti = proto_tree_add_item(tree, offset, 2, "Additional Flags: 0x%02x", flags);
-      flags_tree = proto_tree_new();
-      proto_item_add_subtree(ti, flags_tree, ETT_SMB_AFLAGS);
-      proto_tree_add_item(flags_tree, offset, 2, "%s", 
+      ti = proto_tree_add_text(tree, offset, 2, "Additional Flags: 0x%02x", flags);
+      flags_tree = proto_item_add_subtree(ti, ETT_SMB_AFLAGS);
+      proto_tree_add_text(flags_tree, offset, 2, "%s", 
 			  decode_boolean_bitfield(flags, 0x01, 16,
 						  "Disconnect TID",
 						  "Don't disconnect TID"));
@@ -1260,7 +1258,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Password Length: %u", passwdlen);
+      proto_tree_add_text(tree, offset, 2, "Password Length: %u", passwdlen);
 
     }
 
@@ -1270,7 +1268,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", bcc);
 
     }
 
@@ -1280,7 +1278,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str) + 1, "Password: %s", str);
+      proto_tree_add_text(tree, offset, strlen(str) + 1, "Password: %s", str);
 
     }
 
@@ -1290,7 +1288,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str) + 1, "Path: %s", str);
+      proto_tree_add_text(tree, offset, strlen(str) + 1, "Path: %s", str);
 
     }
 
@@ -1300,7 +1298,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str) + 1, "Service: %s", str);
+      proto_tree_add_text(tree, offset, strlen(str) + 1, "Service: %s", str);
 
     }
 
@@ -1314,7 +1312,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", bcc);
 
     }
 
@@ -1324,7 +1322,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str) + 1, "Service Type: %s",
+      proto_tree_add_text(tree, offset, strlen(str) + 1, "Service Type: %s",
 			  str);
 
     }
@@ -1339,7 +1337,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {  /* Should break out the bits */
 
-      proto_tree_add_item(tree, offset, 2, "Optional Support: 0x%04x", 
+      proto_tree_add_text(tree, offset, 2, "Optional Support: 0x%04x", 
 			  optionsup);
 
     }
@@ -1350,7 +1348,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", bcc);
 
     }
 
@@ -1360,7 +1358,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str) + 1, "Service: %s", str);
+      proto_tree_add_text(tree, offset, strlen(str) + 1, "Service: %s", str);
 
     }
 
@@ -1370,7 +1368,7 @@ dissect_tcon_andx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str) + 1, "Native File System: %s", str);
+      proto_tree_add_text(tree, offset, strlen(str) + 1, "Native File System: %s", str);
 
     }
 
@@ -1407,9 +1405,9 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
       !((wct == 13) && (dirn == 0)) && !((wct == 17) && (dirn == 0))) {
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Invalid Negotiate Protocol format. WCT should be zero or 1 or 13 or 17 ..., not %u", wct);
+      proto_tree_add_text(tree, offset, 1, "Invalid Negotiate Protocol format. WCT should be zero or 1 or 13 or 17 ..., not %u", wct);
 
-      proto_tree_add_item(tree, offset, END_OF_FRAME, "Data");
+      proto_tree_add_text(tree, offset, END_OF_FRAME, "Data");
 
       return;
     }
@@ -1417,7 +1415,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
   if (tree) {
 
-    proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %d", wct);
+    proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %d", wct);
 
   }
 
@@ -1433,7 +1431,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", bcc);
 
     }
 
@@ -1441,9 +1439,8 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      ti = proto_tree_add_item(tree, offset, END_OF_FRAME, "Dialects");
-      dialects = proto_tree_new();
-      proto_item_add_subtree(ti, dialects, ETT_SMB_DIALECTS);
+      ti = proto_tree_add_text(tree, offset, END_OF_FRAME, "Dialects");
+      dialects = proto_item_add_subtree(ti, ETT_SMB_DIALECTS);
 
     }
 
@@ -1452,7 +1449,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
       if (tree) {
 
-	proto_tree_add_item(dialects, offset, 1, "Dialect Marker: %d", pd[offset]);
+	proto_tree_add_text(dialects, offset, 1, "Dialect Marker: %d", pd[offset]);
 
       }
 
@@ -1462,7 +1459,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
       if (tree) {
 
-	proto_tree_add_item(dialects, offset, strlen(str)+1, "Dialect: %s", str);
+	proto_tree_add_text(dialects, offset, strlen(str)+1, "Dialect: %s", str);
 
       }
 
@@ -1479,12 +1476,12 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
       if (dialect == 0xFFFF) { /* Server didn't like them dialects */
 
-	proto_tree_add_item(tree, offset, 2, "Supplied dialects not recognized");
+	proto_tree_add_text(tree, offset, 2, "Supplied dialects not recognized");
 
       }
       else {
 
-	proto_tree_add_item(tree, offset, 2, "Dialect Index: %u, PC NETWORK PROTGRAM 1.0", dialect);
+	proto_tree_add_text(tree, offset, 2, "Dialect Index: %u, PC NETWORK PROTGRAM 1.0", dialect);
 
       }
 
@@ -1496,7 +1493,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", bcc);
 
     }
 
@@ -1506,7 +1503,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Dialect Index: %u, Greater than CORE PROTOCOL and up to LANMAN2.1", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Dialect Index: %u, Greater than CORE PROTOCOL and up to LANMAN2.1", GSHORT(pd, offset));
 
     }
 
@@ -1518,14 +1515,13 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      ti = proto_tree_add_item(tree, offset, 2, "Security Mode: 0x%04x", mode);
-      mode_tree = proto_tree_new();
-      proto_item_add_subtree(ti, mode_tree, ETT_SMB_MODE);
-      proto_tree_add_item(mode_tree, offset, 2, "%s",
+      ti = proto_tree_add_text(tree, offset, 2, "Security Mode: 0x%04x", mode);
+      mode_tree = proto_item_add_subtree(ti, ETT_SMB_MODE);
+      proto_tree_add_text(mode_tree, offset, 2, "%s",
 			  decode_boolean_bitfield(mode, 0x0001, 16,
 						  "Security  = User",
 						  "Security  = Share"));
-      proto_tree_add_item(mode_tree, offset, 2, "%s",
+      proto_tree_add_text(mode_tree, offset, 2, "%s",
 			  decode_boolean_bitfield(mode, 0x0002, 16,
 						  "Passwords = Encrypted",
 						  "Passwords = Plaintext"));
@@ -1536,7 +1532,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max buffer size:     %u", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Max buffer size:     %u", GSHORT(pd, offset));
 
     }
 
@@ -1544,7 +1540,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max multiplex count: %u", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Max multiplex count: %u", GSHORT(pd, offset));
 
     }
     
@@ -1552,7 +1548,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max vcs:             %u", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Max vcs:             %u", GSHORT(pd, offset));
 
     }
 
@@ -1562,14 +1558,13 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      ti = proto_tree_add_item(tree, offset, 2, "Raw Mode: 0x%04x", rawmode);
-      rawmode_tree = proto_tree_new();
-      proto_item_add_subtree(ti, rawmode_tree, ETT_SMB_RAWMODE);
-      proto_tree_add_item(rawmode_tree, offset, 2, "%s",
+      ti = proto_tree_add_text(tree, offset, 2, "Raw Mode: 0x%04x", rawmode);
+      rawmode_tree = proto_item_add_subtree(ti, ETT_SMB_RAWMODE);
+      proto_tree_add_text(rawmode_tree, offset, 2, "%s",
 			  decode_boolean_bitfield(rawmode, 0x01, 16,
 						  "Read Raw supported",
 						  "Read Raw not supported"));
-      proto_tree_add_item(rawmode_tree, offset, 2, "%s",
+      proto_tree_add_text(rawmode_tree, offset, 2, "%s",
 			  decode_boolean_bitfield(rawmode, 0x02, 16,
 						  "Write Raw supported",
 						  "Write Raw not supported"));
@@ -1580,7 +1575,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 4, "Session key:         %08x", GWORD(pd, offset));
+      proto_tree_add_text(tree, offset, 4, "Session key:         %08x", GWORD(pd, offset));
 
     }
 
@@ -1590,9 +1585,9 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Server Time: %s",
+      proto_tree_add_text(tree, offset, 2, "Server Time: %s",
 			dissect_dos_time(GSHORT(pd, offset)));
-      proto_tree_add_item(tree, offset + 2, 2, "Server Date: %s",
+      proto_tree_add_text(tree, offset + 2, 2, "Server Date: %s",
 			dissect_dos_date(GSHORT(pd, offset + 2)));
 
     }
@@ -1603,7 +1598,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Server time zone: %i min from UTC",
+      proto_tree_add_text(tree, offset, 2, "Server time zone: %i min from UTC",
 			  (signed)GSSHORT(pd, offset));
 
     }
@@ -1616,7 +1611,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Challenge Length: %u", enckeylen);
+      proto_tree_add_text(tree, offset, 2, "Challenge Length: %u", enckeylen);
 
     }
 
@@ -1624,7 +1619,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Reserved: %u (MBZ)", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Reserved: %u (MBZ)", GSHORT(pd, offset));
 
     }
 
@@ -1634,7 +1629,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", bcc);
 
     }
 
@@ -1646,7 +1641,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
       if (tree) {
 
-	proto_tree_add_item(tree, offset, enckeylen, "Challenge: %s",
+	proto_tree_add_text(tree, offset, enckeylen, "Challenge: %s",
 				bytes_to_str(str, enckeylen));
       }
 
@@ -1660,7 +1655,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(str)+1, "Primary Domain: %s", str);
+      proto_tree_add_text(tree, offset, strlen(str)+1, "Primary Domain: %s", str);
 
     }
 
@@ -1670,7 +1665,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Dialect Index: %u, Greater than LANMAN2.1", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Dialect Index: %u, Greater than LANMAN2.1", GSHORT(pd, offset));
 
     }
 
@@ -1680,22 +1675,21 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      ti = proto_tree_add_item(tree, offset, 1, "Security Mode: 0x%02x", mode);
-      mode_tree = proto_tree_new();
-      proto_item_add_subtree(ti, mode_tree, ETT_SMB_MODE);
-      proto_tree_add_item(mode_tree, offset, 1, "%s",
+      ti = proto_tree_add_text(tree, offset, 1, "Security Mode: 0x%02x", mode);
+      mode_tree = proto_item_add_subtree(ti, ETT_SMB_MODE);
+      proto_tree_add_text(mode_tree, offset, 1, "%s",
 			  decode_boolean_bitfield(mode, 0x01, 8,
 						  "Security  = User",
 						  "Security  = Share"));
-      proto_tree_add_item(mode_tree, offset, 1, "%s",
+      proto_tree_add_text(mode_tree, offset, 1, "%s",
 			  decode_boolean_bitfield(mode, 0x02, 8,
 						  "Passwords = Encrypted",
 						  "Passwords = Plaintext"));
-      proto_tree_add_item(mode_tree, offset, 1, "%s",
+      proto_tree_add_text(mode_tree, offset, 1, "%s",
 			  decode_boolean_bitfield(mode, 0x04, 8,
 						  "Security signatures enabled",
 						  "Security signatures not enabled"));
-      proto_tree_add_item(mode_tree, offset, 1, "%s",
+      proto_tree_add_text(mode_tree, offset, 1, "%s",
 			  decode_boolean_bitfield(mode, 0x08, 8,
 						  "Security signatures required",
 						  "Security signatures not required"));
@@ -1706,7 +1700,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max multiplex count: %u", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Max multiplex count: %u", GSHORT(pd, offset));
 
     }
     
@@ -1714,7 +1708,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max vcs:             %u", GSHORT(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Max vcs:             %u", GSHORT(pd, offset));
 
     }
 
@@ -1722,7 +1716,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Max buffer size:     %u", GWORD(pd, offset));
+      proto_tree_add_text(tree, offset, 2, "Max buffer size:     %u", GWORD(pd, offset));
 
     }
 
@@ -1730,7 +1724,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 4, "Max raw size:        %u", GWORD(pd, offset));
+      proto_tree_add_text(tree, offset, 4, "Max raw size:        %u", GWORD(pd, offset));
 
     }
 
@@ -1738,7 +1732,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 4, "Session key:         %08x", GWORD(pd, offset));
+      proto_tree_add_text(tree, offset, 4, "Session key:         %08x", GWORD(pd, offset));
 
     }
 
@@ -1748,62 +1742,61 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      ti = proto_tree_add_item(tree, offset, 4, "Capabilities: 0x%04x", caps);
-      caps_tree = proto_tree_new();
-      proto_item_add_subtree(ti, caps_tree, ETT_SMB_CAPABILITIES);
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      ti = proto_tree_add_text(tree, offset, 4, "Capabilities: 0x%04x", caps);
+      caps_tree = proto_item_add_subtree(ti, ETT_SMB_CAPABILITIES);
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0001, 32,
 						  "Raw Mode supported",
 						  "Raw Mode not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0002, 32,
 						  "MPX Mode supported",
 						  "MPX Mode not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0004, 32,
 						  "Unicode supported",
 						  "Unicode not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0008, 32,
 						  "Large files supported",
 						  "Large files not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0010, 32, 
 						  "NT LM 0.12 SMBs supported",
 						  "NT LM 0.12 SMBs not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0020, 32,
 						  "RPC remote APIs supported",
 						  "RPC remote APIs not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0040, 32,
 						  "NT status codes supported",
 						  "NT status codes  not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0080, 32,
 						  "Level 2 OpLocks supported",
 						  "Level 2 OpLocks not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0100, 32,
 						  "Lock&Read supported",
 						  "Lock&Read not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x0200, 32,
 						  "NT Find supported",
 						  "NT Find not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x1000, 32,
 						  "DFS supported",
 						  "DFS not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x4000, 32,
 						  "Large READX supported",
 						  "Large READX not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x8000, 32,
 						  "Large WRITEX supported",
 						  "Large WRITEX not supported"));
-      proto_tree_add_item(caps_tree, offset, 4, "%s",
+      proto_tree_add_text(caps_tree, offset, 4, "%s",
 			  decode_boolean_bitfield(caps, 0x80000000, 32,
 						  "Extended security exchanges supported",
 						  "Extended security exchanges not supported"));
@@ -1815,8 +1808,8 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 4, "System Time Low: 0x%08x", GWORD(pd, offset));
-      proto_tree_add_item(tree, offset + 4, 4, "System Time High: 0x%08x", GWORD(pd, offset + 4)); 
+      proto_tree_add_text(tree, offset, 4, "System Time Low: 0x%08x", GWORD(pd, offset));
+      proto_tree_add_text(tree, offset + 4, 4, "System Time High: 0x%08x", GWORD(pd, offset + 4)); 
 
     }
 
@@ -1826,7 +1819,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Server time zone: %i min from UTC",
+      proto_tree_add_text(tree, offset, 2, "Server time zone: %i min from UTC",
 			  (signed)GSSHORT(pd, offset));
 
     }
@@ -1839,7 +1832,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Encryption key len: %u", enckeylen);
+      proto_tree_add_text(tree, offset, 1, "Encryption key len: %u", enckeylen);
 
     }
 
@@ -1849,7 +1842,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte count (BCC): %u", bcc);
+      proto_tree_add_text(tree, offset, 2, "Byte count (BCC): %u", bcc);
 
     }
 
@@ -1863,7 +1856,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
       if (tree) {
 
-	proto_tree_add_item(tree, offset, enckeylen, "Challenge encryption key: %s",
+	proto_tree_add_text(tree, offset, enckeylen, "Challenge encryption key: %s",
 				bytes_to_str(str, enckeylen));
 
       }
@@ -1882,9 +1875,9 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
 
       if (caps & 0x0004) {
       	ustr = unicode_to_str(str, &ustr_len);
-	proto_tree_add_item(tree, offset, ustr_len+2, "OEM domain name: %s", ustr);
+	proto_tree_add_text(tree, offset, ustr_len+2, "OEM domain name: %s", ustr);
       } else {
-	proto_tree_add_item(tree, offset, strlen(str)+1, "OEM domain name: %s", str);
+	proto_tree_add_text(tree, offset, strlen(str)+1, "OEM domain name: %s", str);
       }
 
     }
@@ -1894,7 +1887,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
   default:    /* Baddd */
 
     if (tree)
-      proto_tree_add_item(tree, offset, 1, "Bad format, should never get here");
+      proto_tree_add_text(tree, offset, 1, "Bad format, should never get here");
     return;
 
   }
@@ -1918,7 +1911,7 @@ dissect_deletedir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -1930,7 +1923,7 @@ dissect_deletedir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -1942,7 +1935,7 @@ dissect_deletedir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Buffer Format: %u", BufferFormat);
+      proto_tree_add_text(tree, offset, 1, "Buffer Format: %u", BufferFormat);
 
     }
 
@@ -1954,7 +1947,7 @@ dissect_deletedir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
+      proto_tree_add_text(tree, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
 
     }
 
@@ -1970,7 +1963,7 @@ dissect_deletedir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -1982,7 +1975,7 @@ dissect_deletedir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -2009,7 +2002,7 @@ dissect_createdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -2021,7 +2014,7 @@ dissect_createdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -2033,7 +2026,7 @@ dissect_createdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Buffer Format: %u", BufferFormat);
+      proto_tree_add_text(tree, offset, 1, "Buffer Format: %u", BufferFormat);
 
     }
 
@@ -2045,7 +2038,7 @@ dissect_createdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
+      proto_tree_add_text(tree, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
 
     }
 
@@ -2061,7 +2054,7 @@ dissect_createdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -2073,7 +2066,7 @@ dissect_createdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -2100,7 +2093,7 @@ dissect_checkdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *t
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -2112,7 +2105,7 @@ dissect_checkdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *t
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -2124,7 +2117,7 @@ dissect_checkdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *t
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Buffer Format: %u", BufferFormat);
+      proto_tree_add_text(tree, offset, 1, "Buffer Format: %u", BufferFormat);
 
     }
 
@@ -2136,7 +2129,7 @@ dissect_checkdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *t
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
+      proto_tree_add_text(tree, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
 
     }
 
@@ -2152,7 +2145,7 @@ dissect_checkdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *t
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 1, "Word Count (WCT): %u", WordCount);
+      proto_tree_add_text(tree, offset, 1, "Word Count (WCT): %u", WordCount);
 
     }
 
@@ -2164,7 +2157,7 @@ dissect_checkdir_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *t
 
     if (tree) {
 
-      proto_tree_add_item(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
+      proto_tree_add_text(tree, offset, 2, "Byte Count (BCC): %u", ByteCount);
 
     }
 
@@ -2609,17 +2602,16 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  ti = proto_tree_add_item(tree, offset, END_OF_FRAME,
+	  ti = proto_tree_add_text(tree, offset, END_OF_FRAME,
 				"Server Message Block Protocol");
-	  smb_tree = proto_tree_new();
-	  proto_item_add_subtree(ti, smb_tree, ETT_SMB);
+	  smb_tree = proto_item_add_subtree(ti, ETT_SMB);
 
 	  /* 0xFFSMB is actually a 1 byte msg type and 3 byte server
 	   * component ... SMB is only one used
 	   */
 
-	  proto_tree_add_item(smb_tree, offset, 1, "Message Type: 0xFF");
-	  proto_tree_add_item(smb_tree, offset+1, 3, "Server Component: SMB");
+	  proto_tree_add_text(smb_tree, offset, 1, "Message Type: 0xFF");
+	  proto_tree_add_text(smb_tree, offset+1, 3, "Server Component: SMB");
 
 	}
 
@@ -2627,7 +2619,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 1, "Command: %s", decode_smb_name(cmd));
+	  proto_tree_add_text(smb_tree, offset, 1, "Command: %s", decode_smb_name(cmd));
 
 	}
 
@@ -2639,7 +2631,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 1, "Error Class: %s", 
+	  proto_tree_add_text(smb_tree, offset, 1, "Error Class: %s", 
 			      val_to_str((guint8)pd[offset], errcls_types, "Unknown Error Class (%x)"));
 	}
 
@@ -2651,7 +2643,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 1, "Reserved: %i", errcode1); 
+	  proto_tree_add_text(smb_tree, offset, 1, "Reserved: %i", errcode1); 
 
 	}
 
@@ -2661,7 +2653,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 2, "Error Code: %s",
+	  proto_tree_add_text(smb_tree, offset, 2, "Error Code: %s",
 			      decode_smb_error(errcls, errcode));
 
 	}
@@ -2674,36 +2666,35 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  tf = proto_tree_add_item(smb_tree, offset, 1, "Flags: 0x%02x", flags);
+	  tf = proto_tree_add_text(smb_tree, offset, 1, "Flags: 0x%02x", flags);
 
-	  flags_tree = proto_tree_new();
-	  proto_item_add_subtree(tf, flags_tree, ETT_SMB_FLAGS);
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  flags_tree = proto_item_add_subtree(tf, ETT_SMB_FLAGS);
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, 0x01, 8,
 						      "Lock&Read, Write&Unlock supported",
 						      "Lock&Read, Write&Unlock not supported"));
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, 0x02, 8,
 						      "Receive buffer posted",
 						      "Receive buffer not posted"));
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, 0x08, 8, 
 						      "Path names caseless",
 						      "Path names case sensitive"));
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, 0x10, 8,
 						      "Pathnames canonicalized",
 						      "Pathnames not canonicalized"));
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, 0x20, 8,
 						      "OpLocks requested/granted",
 						      "OpLocks not requested/granted"));
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, 0x40, 8, 
 						      "Notify all",
 						      "Notify open only"));
 
-	  proto_tree_add_item(flags_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags, SMB_FLAGS_DIRN,
 						      8, "Response to client/redirector", "Request to server"));
 
@@ -2715,39 +2706,38 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  tf = proto_tree_add_item(smb_tree, offset, 1, "Flags2: 0x%04x", flags2);
+	  tf = proto_tree_add_text(smb_tree, offset, 1, "Flags2: 0x%04x", flags2);
 
-	  flags2_tree = proto_tree_new();
-	  proto_item_add_subtree(tf, flags2_tree, ETT_SMB_FLAGS2);
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  flags2_tree = proto_item_add_subtree(tf, ETT_SMB_FLAGS2);
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x0001, 16,
 						      "Long file names supported",
 						      "Long file names not supported"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x0002, 16,
 						      "Extended attributes supported",
 						      "Extended attributes not supported"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x0004, 16,
 						      "Security signatures supported",
 						      "Security signatures not supported"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x0800, 16,
 						      "Extended security negotiation supported",
 						      "Extended security negotiation not supported"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x1000, 16, 
 						      "Resolve pathnames with DFS",
 						      "Don't resolve pathnames with DFS"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x2000, 16,
 						      "Permit reads if execute-only",
 						      "Don't permit reads if execute-only"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x4000, 16,
 						      "Error codes are NT error codes",
 						      "Error codes are DOS error codes"));
-	  proto_tree_add_item(flags2_tree, offset, 1, "%s",
+	  proto_tree_add_text(flags2_tree, offset, 1, "%s",
 			      decode_boolean_bitfield(flags2, 0x8000, 16, 
 						      "Strings are Unicode",
 						      "Strings are ASCII"));
@@ -2758,7 +2748,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 12, "Reserved: 6 WORDS");
+	  proto_tree_add_text(smb_tree, offset, 12, "Reserved: 6 WORDS");
 
 	}
 
@@ -2770,7 +2760,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 2, "Network Path/Tree ID (TID): %i (%04x)", tid, tid); 
+	  proto_tree_add_text(smb_tree, offset, 2, "Network Path/Tree ID (TID): %i (%04x)", tid, tid); 
 
 	}
 
@@ -2782,7 +2772,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 2, "Process ID (PID): %i (%04x)", pid, pid); 
+	  proto_tree_add_text(smb_tree, offset, 2, "Process ID (PID): %i (%04x)", pid, pid); 
 
 	}
 
@@ -2794,7 +2784,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 2, "User ID (UID): %i (%04x)", uid, uid); 
+	  proto_tree_add_text(smb_tree, offset, 2, "User ID (UID): %i (%04x)", uid, uid); 
 
 	}
 	
@@ -2806,7 +2796,7 @@ dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
 
 	if (tree) {
 
-	  proto_tree_add_item(smb_tree, offset, 2, "Multiplex ID (MID): %i (%04x)", mid, mid); 
+	  proto_tree_add_text(smb_tree, offset, 2, "Multiplex ID (MID): %i (%04x)", mid, mid); 
 
 	}