]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
auth: fix connect response
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 15 Oct 2009 23:24:03 +0000 (16:24 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 15 Oct 2009 23:24:03 +0000 (16:24 -0700)
wireshark/ceph/packet-ceph.c

index e6e12206fa2c5f59f1fa727413c247e01f0d4282..754478db0d5d48c2c3ea66516401d05793a2c501 100644 (file)
@@ -476,7 +476,7 @@ static guint32 dissect_ceph_footer(tvbuff_t *tvb, proto_tree *tree, guint32 offs
        proto_tree_add_item(ceph_footer_tree, hf_ceph_footer_front_crc, tvb, offset+4, 4, TRUE);\r
        proto_tree_add_item(ceph_footer_tree, hf_ceph_footer_middle_crc, tvb, offset+8, 4, TRUE);\r
        data_crc_item = proto_tree_add_item(ceph_footer_tree, hf_ceph_footer_data_crc, tvb, offset+12, 4, TRUE);\r
-    proto_item_append_text(data_crc_item, " (calculated %x)", data_crc);\r
+       proto_item_append_text(data_crc_item, " (calculated %x)", data_crc);\r
 \r
        offset += 12;\r
        return offset;\r
@@ -531,7 +531,7 @@ static guint32 dissect_ceph_server_connect(tvbuff_t *tvb, proto_tree *tree, guin
        ceph_header_tree = proto_item_add_subtree(ceph_sub_item, ett_ceph);\r
 \r
        offset = dissect_ceph_entity_addr(tvb, ceph_header_tree, offset);\r
-\r
+       offset = dissect_ceph_entity_addr(tvb, ceph_header_tree, offset);\r
        msg = (struct ceph_msg_connect_reply *)tvb_get_ptr(tvb, offset, sizeof(struct ceph_msg_connect_reply));\r
        PROTO_ADD_TEXT(struct ceph_msg_connect_reply, msg, tag, "%d");\r
        PROTO_ADD_TEXT(struct ceph_msg_connect_reply, msg, global_seq, "%d");\r
@@ -1093,6 +1093,7 @@ static guint get_ceph_message_len(packet_info *pinfo, tvbuff_t *tvb, int offset)
                                sizeof(struct ceph_msg_connect);\r
                } else\r
                        len = sizeof(CEPH_BANNER) - 1 +\r
+                               sizeof(struct ceph_entity_addr) +\r
                                sizeof(struct ceph_entity_addr) +\r
                                sizeof(struct ceph_msg_connect_reply);\r
 \r