[Ocfs2-tools-devel] [PATCH 1/1] wireshark-ocfs2: add dlm_query_join_request handler v4

[Jeff Liu]

remove the entries for DLM_QUERY_JOIN_MSG in dlm_struct_defs, otherwise, theNode Index/Domain will print twice.
also, change the print field string from Namelen to Domain Namelen to indicate on two distinct occasions.

Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
---
 epan/dissectors/packet-ocfs2.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c
index 6cd1a33..dcc3003 100644
--- a/epan/dissectors/packet-ocfs2.c
+++ b/epan/dissectors/packet-ocfs2.c
@@ -972,12 +972,6 @@ static struct dlm_msg_struct_def dlm_struct_defs[] = {
 	{ "dead_node",	&hf_dlm_dead_node,	FIELD_OFFSET_AND_SIZE(struct dlm_begin_reco,dead_node),	dlm_node_idx_handler},
 	{ DLM_MSG_STRUCT_DEF_END } }
 },
-{ "dlm_query_join_request", "DLM Query Join Request", DLM_QUERY_JOIN_MSG, &ett_dlm_query_join, {
-	{ "node_idx",	&hf_dlm_node_idx,	FIELD_OFFSET_AND_SIZE(struct dlm_query_join_request,node_idx),	dlm_node_idx_handler},
-	{ "name_len",	&hf_dlm_domain_name_len,FIELD_OFFSET_AND_SIZE(struct dlm_query_join_request,name_len),	dlm_domain_namelen_handler},
-	{ "domain",	&hf_dlm_domain_name,	FIELD_OFFSET_AND_SIZE(struct dlm_query_join_request,domain),	dlm_domain_name_handler},
-	{ DLM_MSG_STRUCT_DEF_END } }
-},
 { "dlm_assert_joined", "DLM Assert Joined", DLM_ASSERT_JOINED_MSG, &ett_dlm_assert_joined, {
 	{ "node_idx",	&hf_dlm_node_idx,	FIELD_OFFSET_AND_SIZE(struct dlm_assert_joined,node_idx),	dlm_node_idx_handler},
 	{ "name_len",	&hf_dlm_domain_name_len,FIELD_OFFSET_AND_SIZE(struct dlm_assert_joined,name_len),	dlm_domain_namelen_handler},
@@ -1284,7 +1278,8 @@ static void dissect_dlm_query_join_request(proto_tree *tree, tvbuff_t *tvb,
 	/* skip follow 2 padding bytes */
 	offset += 3;
 	namelen = tvb_get_guint8(tvb, offset);
-	proto_tree_add_item(tree, hf_dlm_namelen, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_dlm_domain_name_len, tvb, offset, 1,
+				FALSE);
 
 	++offset;
 	len = tvb_reported_length_remaining(tvb, offset);
-- 
1.5.4.3