--- ./source/private_module/lun_remote_mirror/deliver/rm_dlv_receive.c	2018-04-10 14:10:38.000000000 +0000
+++ ./source/private_module/lun_remote_mirror/deliver/rm_dlv_receive.c.hotpatch	2018-12-26 12:27:37.000000000 +0000
@@ -3973,11 +3973,13 @@
     rspIbc.usSrcNid = getLocalNid();
     /*modify by wangxiuwu ţDTS2014060306548  ޸ӽXNETϢʧԻ*/
     rspIbc.isNeedRetry = FALSE;
+    LVOS_TP_START(RM_HANG_TIMEOUT_1_87_01, &ebcSn)
     ebcBuffer = getEbcMsgBufferForIbc(ibcMsg->ulIBCDataNbyte);
+    LVOS_TP_END
     if (unlikely(NULL == ebcBuffer))
     {
         DBG_LogError(RM_LOG_ID_0156, "Get RM message failed.");
-        rspIbc.ulIBCResult = (uint32_t)RETURN_ERROR;
+        rspIbc.ulIBCResult = (uint32_t)RETURN_NO_MEM;
         result = RSF_AIBC_SEND_RSP_MSG_FN(&rspIbc);
         
         return RETURN_ERROR;
@@ -3995,7 +3997,6 @@
         /*IBCѾʧܣԲÿӦ*/
         rspIbc.ulIBCResult = (uint32_t)RETURN_ERROR;
         result = RSF_AIBC_SEND_RSP_MSG_FN(&rspIbc);
-        
         return RETURN_ERROR;
     }
     getRmMsgHeadFromEbc(rmMsg, ebcBuffer);
@@ -4011,7 +4012,6 @@
         RSF_PUT_FREE_NODE(rmMsg, RM_MSG_HEADER_PARTITION);
         return RETURN_ERROR;
     }
-    
     rmMsg->ullDestNode = RM_GET_LONG_ID(ibcMsg->aulIBCParameter[RM_IBC_REMOTE_WWN_HIGH],
                                         ibcMsg->aulIBCParameter[RM_IBC_REMOTE_WWN_LOW]);
     rmMsg->ullSrcNode = RM_GET_LONG_ID(ibcMsg->aulIBCParameter[RM_IBC_LOCAL_WWN_HIGH],
--- ./source/private_module/lun_remote_mirror/task_manage/public/rm_pub_util.c	2018-03-10 06:52:19.000000000 +0000
+++ ./source/private_module/lun_remote_mirror/task_manage/public/rm_pub_util.c.hotpatch	2018-12-26 12:27:37.000000000 +0000
@@ -2191,14 +2191,7 @@
     return;
 }
 
-/*********************************************************************
-*     : עDLVpub async msgϢﵽ벻IBCڴʱ
-*           ת
-* : msgDescInfo  : Ϣ
-* : 
-*   ֵ: 
-* ע: 
-**********************************************************************/
+
 void sendIbcPubAsyncMsgToCtrlRm(void *msgDescInfo)
 {
     int32_t result;
@@ -2233,6 +2226,13 @@
         putRmMsgDlvRm(sendRmMsg);
         return;
     }
+    splitLongIdRm(sendRmMsg->ullDestNode,
+                &(ibcMsg->aulIBCParameter[RM_IBC_REMOTE_WWN_LOW]),
+                &(ibcMsg->aulIBCParameter[RM_IBC_REMOTE_WWN_HIGH]));
+    splitLongIdRm(sendRmMsg->ullSrcNode,
+                &(ibcMsg->aulIBCParameter[RM_IBC_LOCAL_WWN_LOW]),
+                &(ibcMsg->aulIBCParameter[RM_IBC_LOCAL_WWN_HIGH]));
+    ibcMsg->aulIBCParameter[RM_IBC_SN_ID] = getEbcSnByDataBuff(sendRmMsg->buffer);
     /*modify by wangxiuwu ţDTS2014060306548  ޸ӽXNETϢʧԻ*/
     ibcMsg->isNeedRetry = FALSE;
     ibcMsg->ulSourceId = MY_PID;
