Convert proto_tree_add_tree calls to something filterable.

Remove "effectively useless" blurbs.

svn path=/trunk/; revision=50689

1 files changed, 42 insertions, 57 deletions

diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 0cb91e424f..b3dc1a5839 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -70,6 +70,7 @@ static int hf_fmp_numBlks = -1;
 static int hf_fmp_volID = -1;
 static int hf_fmp_startOffset = -1;
 static int hf_fmp_extent_state = -1;
+static int hf_fmp_revokeHandleListReason = -1;
 
 static gint ett_fmp_notify = -1;
 static gint ett_fmp_notify_hlist = -1;
@@ -165,32 +166,7 @@ dissect_fmp_notify_status(tvbuff_t *tvb, int offset, proto_tree *tree, int *rval
 static int
 dissect_revokeHandleListReason(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	revokeHandleListReason reason;
-
-  	if (tree) {
-		reason  = (revokeHandleListReason)tvb_get_ntohl(tvb, offset);
-		switch (reason) {
-		case FMP_LIST_USER_QUOTA_EXCEEDED:
-			proto_tree_add_text(tree, tvb, offset, 4, "Reason: %s",
-					    "LIST_USER_QUOTA_EXCEEDED");
-			break;
-
-		case FMP_LIST_GROUP_QUOTA_EXCEEDED:
-			proto_tree_add_text(tree, tvb, offset, 4, "Reason: %s",
-					    "LIST_GROUP_QUOTA_EXCEEDED");
-			break;
-
-		case FMP_LIST_SERVER_RESOURCE_LOW:
-			proto_tree_add_text(tree, tvb, offset, 4, "Reason: %s",
-					    "LIST_SERVER_RESOURCE_LOW");
-			break;
-
-		default:
-			proto_tree_add_text(tree, tvb, offset, 4, "Reason: %s",
-					    "Unknown Reason");
-			break;
-		}
-	}
+    proto_tree_add_item(tree, hf_fmp_revokeHandleListReason, tvb, offset, 4, ENC_BIG_ENDIAN);
 	offset += 4;
 	return offset;
 }
@@ -471,6 +447,12 @@ static const value_string fmp_status_vals[] = {
 
 };
 
+static const value_string fmp_revokeHandleListReason_vals[] = {
+    {FMP_LIST_USER_QUOTA_EXCEEDED, "LIST_USER_QUOTA_EXCEEDED"},
+    {FMP_LIST_GROUP_QUOTA_EXCEEDED, "LIST_GROUP_QUOTA_EXCEEDED"},
+    {FMP_LIST_SERVER_RESOURCE_LOW, "LIST_SERVER_RESOURCE_LOW"},
+    {0,NULL}
+};
 
 static int
 dissect_fmp_notify_extentState(tvbuff_t *tvb, int offset, proto_tree *tree)
@@ -567,56 +549,59 @@ proto_register_fmp_notify(void)
 			BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_handleListLen, {
-			"Number File Handles", "fmp_notify.handleListLength",
+			"Number of File Handles", "fmp_notify.handleListLength",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Number of File Handles", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fmp_sessionHandle, {
-                        "Session Handle", "fmp_notify.sessHandle", FT_BYTES, BASE_NONE,
-                        NULL, 0, "FMP Session Handle", HFILL }},
+            "Session Handle", "fmp_notify.sessHandle", FT_BYTES, BASE_NONE,
+            NULL, 0, NULL, HFILL }},
 
 
-                { &hf_fmp_fsID, {
-                        "File System ID", "fmp_notify.fsID", FT_UINT32, BASE_HEX,
-                        NULL, 0, NULL, HFILL }},
+        { &hf_fmp_fsID, {
+            "File System ID", "fmp_notify.fsID", FT_UINT32, BASE_HEX,
+            NULL, 0, NULL, HFILL }},
 
 #if 0
-                { &hf_fmp_fsBlkSz, {
-                        "FS Block Size", "fmp_notify.fsBlkSz", FT_UINT32, BASE_DEC,
-                        NULL, 0, "File System Block Size", HFILL }},
+        { &hf_fmp_fsBlkSz, {
+            "FS Block Size", "fmp_notify.fsBlkSz", FT_UINT32, BASE_DEC,
+            NULL, 0, NULL, HFILL }},
 #endif
 
+        { &hf_fmp_numBlksReq, {
+            "Number Blocks Requested", "fmp_notify.numBlksReq", FT_UINT32,
+            BASE_DEC, NULL, 0, NULL, HFILL }},
 
-                { &hf_fmp_numBlksReq, {
-                        "Number Blocks Requested", "fmp_notify.numBlksReq", FT_UINT32,
-                        BASE_DEC, NULL, 0, NULL, HFILL }},
-
-
-                { &hf_fmp_msgNum, {
-                        "Message Number", "fmp_notify.msgNum", FT_UINT32, BASE_DEC,
-                        NULL, 0, "FMP Message Number", HFILL }},
 
-                { &hf_fmp_cookie, {
-                        "Cookie", "fmp_notify.cookie", FT_UINT32, BASE_HEX,
-                        NULL, 0, "Cookie for FMP_REQUEST_QUEUED Resp", HFILL }},
+        { &hf_fmp_msgNum, {
+            "Message Number", "fmp_notify.msgNum", FT_UINT32, BASE_DEC,
+            NULL, 0, NULL, HFILL }},
 
+        { &hf_fmp_cookie, {
+            "Cookie", "fmp_notify.cookie", FT_UINT32, BASE_HEX,
+            NULL, 0, "Cookie for FMP_REQUEST_QUEUED Resp", HFILL }},
 
-                { &hf_fmp_firstLogBlk, {
-                        "First Logical Block", "fmp_notify.firstLogBlk", FT_UINT32,
-                        BASE_DEC, NULL, 0, "First Logical File Block", HFILL }},
 
+        { &hf_fmp_firstLogBlk, {
+            "First Logical Block", "fmp_notify.firstLogBlk", FT_UINT32,
+            BASE_DEC, NULL, 0, "First Logical File Block", HFILL }},
 
-                { &hf_fmp_fileSize, {
-                        "File Size", "fmp_notify.fileSize", FT_UINT64, BASE_DEC,
-                        NULL, 0, NULL, HFILL }},
 
-		 { &hf_fmp_fmpFHandle, {
-                        "FMP File Handle", "fmp_notify.fmpFHandle",
-                        FT_BYTES, BASE_NONE, NULL, 0, NULL,
-                        HFILL }},
+        { &hf_fmp_fileSize, {
+            "File Size", "fmp_notify.fileSize", FT_UINT64, BASE_DEC,
+            NULL, 0, NULL, HFILL }},
 
+		{ &hf_fmp_fmpFHandle, {
+            "FMP File Handle", "fmp_notify.fmpFHandle",
+            FT_BYTES, BASE_NONE, NULL, 0, NULL,
+            HFILL }},
 
+        { &hf_fmp_revokeHandleListReason,
+          { "Reason", "fmp.revokeHandleListReason",
+            FT_UINT32, BASE_DEC, VALS(fmp_revokeHandleListReason_vals), 0,
+            NULL, HFILL }},
 
+            
 	};
 
 	static gint *ett[] = {