diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-06-18 00:04:30 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-06-18 00:04:30 +0000 |
| commit | 2acf2daae2b8adfe8dfab6d407571d2ce202d84a (patch) | |
| tree | a6861ef2423ade016eaffcf7c591f86b55c4cc15 /epan/dissectors/packet-nfsacl.c | |
| parent | 4f9c68984e8797961d4b4ffed059264fbd43703b (diff) | |
nfs acl uses the same status codes as nfs so use the hf field for nfs
svn path=/trunk/; revision=22124
Diffstat (limited to 'epan/dissectors/packet-nfsacl.c')
| -rw-r--r-- | epan/dissectors/packet-nfsacl.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c index 84c1f50a07..f859c4eb13 100644 --- a/epan/dissectors/packet-nfsacl.c +++ b/epan/dissectors/packet-nfsacl.c @@ -39,8 +39,6 @@ static int hf_nfsacl_procedure_v3 = -1; static int hf_nfsacl_entry = -1; static int hf_nfsacl_aclcnt = -1; static int hf_nfsacl_dfaclcnt = -1; -static int hf_nfsacl2_status = -1; -static int hf_nfsacl3_status = -1; static int hf_nfsacl_aclent = -1; static int hf_nfsacl_aclent_type = -1; static int hf_nfsacl_aclent_uid = -1; @@ -266,7 +264,7 @@ dissect_nfsacl2_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, status = tvb_get_ntohl(tvb, offset + 0); - proto_tree_add_uint(tree, hf_nfsacl2_status, tvb, offset + 0, 4, status); + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -297,7 +295,7 @@ dissect_nfsacl2_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, status = tvb_get_ntohl(tvb, offset + 0); - proto_tree_add_uint(tree, hf_nfsacl2_status, tvb, offset + 0, 4, status); + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -343,7 +341,7 @@ dissect_nfsacl2_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, status = tvb_get_ntohl(tvb, offset + 0); - proto_tree_add_uint(tree, hf_nfsacl2_status, tvb, offset + 0, 4, status); + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -374,7 +372,7 @@ dissect_nfsacl2_getxattrdir_reply(tvbuff_t *tvb, int offset, status = tvb_get_ntohl(tvb, offset + 0); - proto_tree_add_uint(tree, hf_nfsacl2_status, tvb, offset + 0, 4, status); + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -433,7 +431,7 @@ dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, status = tvb_get_ntohl(tvb, offset + 0); if (tree) - proto_tree_add_uint(tree, hf_nfsacl3_status, tvb, offset + 0, 4, + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -490,7 +488,7 @@ dissect_nfsacl3_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 status = tvb_get_ntohl(tvb, offset + 0); if (tree) - proto_tree_add_uint(tree, hf_nfsacl3_status, tvb, offset + 0, 4, + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -520,7 +518,7 @@ dissect_nfsacl3_getxattrdir_reply(tvbuff_t *tvb, int offset, status = tvb_get_ntohl(tvb, offset + 0); if (tree) - proto_tree_add_uint(tree, hf_nfsacl3_status, tvb, offset + 0, 4, + proto_tree_add_uint(tree, hf_nfs_nfsstat, tvb, offset + 0, 4, status); offset += 4; @@ -552,16 +550,6 @@ static const value_string nfsacl3_proc_vals[] = { { 0, NULL } }; -static const value_string names_nfsacl2_status[] = { - { ACL2_OK, "ACL2_OK" }, - { 0, NULL } -}; - -static const value_string names_nfsacl3_status[] = { - { ACL3_OK, "ACL3_OK" }, - { 0, NULL } -}; - static struct true_false_string yesno = { "Yes", "No" }; void @@ -600,13 +588,6 @@ proto_register_nfsacl(void) "Permissions", "nfsacl.aclent.perm", FT_UINT32, BASE_DEC, NULL, 0, "Permissions", HFILL }}, /* V2 */ - { &hf_nfsacl2_status, { - "Status", "nfsacl.status2", FT_UINT32, BASE_DEC, - VALS(names_nfsacl2_status), 0, "Status", HFILL }}, - /* V3 */ - { &hf_nfsacl3_status, { - "Status", "nfsacl.status3", FT_UINT32, BASE_DEC, - VALS(names_nfsacl3_status), 0, "Status", HFILL }}, { &hf_nfsacl_create, { "create", "nfsacl.create", FT_BOOLEAN, BASE_NONE, &yesno, 0, "Create?", HFILL }}, |