]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async:remove redudant judgement for msg-header-crc.
authorJianpeng Ma <jianpeng.ma@intel.com>
Thu, 26 Oct 2017 11:44:11 +0000 (19:44 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Fri, 27 Oct 2017 10:39:50 +0000 (18:39 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/msg/async/AsyncConnection.cc

index 93e043673d4b171cf75c920f6daffe856cca80e9..cf2f7517b45ee50dae2a09667fe8d2ff7abb51c6 100644 (file)
@@ -447,22 +447,23 @@ void AsyncConnection::process()
           ldout(async_msgr->cct, 20) << __func__ << " got MSG header" << dendl;
 
           header = *((ceph_msg_header*)state_buffer);
-          if (msgr->crcflags & MSG_CRC_HEADER)
-            header_crc = ceph_crc32c(0, (unsigned char *)&header,
-                                     sizeof(header) - sizeof(header.crc));
 
-          ldout(async_msgr->cct, 20) << __func__ << " got envelope type=" << header.type
+         ldout(async_msgr->cct, 20) << __func__ << " got envelope type=" << header.type
                               << " src " << entity_name_t(header.src)
                               << " front=" << header.front_len
                               << " data=" << header.data_len
                               << " off " << header.data_off << dendl;
 
-          // verify header crc
-          if (msgr->crcflags & MSG_CRC_HEADER && header_crc != header.crc) {
-            ldout(async_msgr->cct,0) << __func__ << " got bad header crc "
-                                     << header_crc << " != " << header.crc << dendl;
-            goto fail;
-          }
+         if (msgr->crcflags & MSG_CRC_HEADER) {
+           header_crc = ceph_crc32c(0, (unsigned char *)&header,
+               sizeof(header) - sizeof(header.crc));
+           // verify header crc
+           if (header_crc != header.crc) {
+             ldout(async_msgr->cct,0) << __func__ << " got bad header crc "
+               << header_crc << " != " << header.crc << dendl;
+             goto fail;
+           }
+         }
 
           // Reset state
           data_buf.clear();