[Ocfs2-tools-devel] [PATCH 1/1] wireshark-ocfs2: remove "Pad" from ocfs2 header presentation

Jeff Liu jeff.liu at oracle.com
Fri Aug 14 07:30:39 PDT 2009


the 'Pad' should not be print out, remove it.

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

diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c
index ce57c3f..cb7d6d1 100644
--- a/epan/dissectors/packet-ocfs2.c
+++ b/epan/dissectors/packet-ocfs2.c
@@ -88,7 +88,6 @@ static int proto_ocfs2 = -1;
 static int hf_msg_magic = -1;
 static int hf_msg_data_len = -1;
 static int hf_msg_msg_type = -1;
-static int hf_msg_pad1 = -1;
 static int hf_msg_sys_status = -1;
 static int hf_msg_status = -1;
 static int hf_msg_key = -1;
@@ -140,7 +139,6 @@ struct ocfs2_msg
 #define	O2NET_MSG_HDR_OFF_MAGIC		offsetof(struct ocfs2_msg,magic)
 #define	O2NET_MSG_HDR_OFF_DATA_LEN	offsetof(struct ocfs2_msg,data_len)
 #define	O2NET_MSG_HDR_OFF_MSG_TYPE	offsetof(struct ocfs2_msg,msg_type)
-#define	O2NET_MSG_HDR_OFF_PAD1		offsetof(struct ocfs2_msg,pad1)
 #define	O2NET_MSG_HDR_OFF_SYS_STATUS	offsetof(struct ocfs2_msg,sys_status)
 #define	O2NET_MSG_HDR_OFF_STATUS	offsetof(struct ocfs2_msg,status)
 #define	O2NET_MSG_HDR_OFF_KEY		offsetof(struct ocfs2_msg,key)
@@ -1182,9 +1180,6 @@ static int dissect_ocfs2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		proto_tree_add_item(subtree, hf_msg_msg_type,
 				    tvb, O2NET_MSG_HDR_OFF_MSG_TYPE, 2,
 				    FALSE);
-		proto_tree_add_item(subtree, hf_msg_pad1,
-				    tvb, O2NET_MSG_HDR_OFF_PAD1, 2,
-				    FALSE);
 		proto_tree_add_item(subtree, hf_msg_sys_status,
 				    tvb, O2NET_MSG_HDR_OFF_SYS_STATUS, 4,
 				    FALSE);
@@ -1265,9 +1260,6 @@ void proto_register_ocfs2(void)
 		{ &hf_msg_msg_type, { "Type","ocfs2.msg.msg_type",
 					FT_UINT16, BASE_DEC, VALS(dlm_magic), 0x0,
 					"Message type", HFILL } },
-		{ &hf_msg_pad1, { "Pad", "ocfs2.msg.pad1",
-					FT_UINT16, BASE_HEX, NULL, 0x0,
-					"Padding", HFILL } },
 		{ &hf_msg_sys_status, { "Sys Status",	"ocfs2.msg.sys_status",
 					FT_UINT32, BASE_DEC, VALS(dlm_errnames), 0x0,
 					"System level status return code", HFILL } },
-- 
1.5.4.3




More information about the Ocfs2-tools-devel mailing list