diff --git a/das-dn/submodbustcp/sub_modbus_tcp.cpp b/das-dn/submodbustcp/sub_modbus_tcp.cpp index 3e833b5a..2313993a 100644 --- a/das-dn/submodbustcp/sub_modbus_tcp.cpp +++ b/das-dn/submodbustcp/sub_modbus_tcp.cpp @@ -392,11 +392,13 @@ int CSubModbusTcpProcess::OnPackageReceived(BYTE* pBuf, int count, int ord) BYTE *ppucFrame = &pBuf[MB_TCP_FUNC]; BYTE ucRcvAddress = pBuf[MB_TCP_UID]; +#if 0 if (ucRcvAddress != pItem->ied_addr && ucRcvAddress != MB_ADDRESS_BROADCAST) { vLog(LOG_DEBUG, "数据不是发送给我的.\n"); return count; } +#endif BYTE ucFunctionCode = ppucFrame[MB_PDU_FUNC_OFF]; eMBException eException; eMBErrorCode eStatus = MB_ENOERR; diff --git a/das-dn/submodbustcp/sub_modbus_tcp.h b/das-dn/submodbustcp/sub_modbus_tcp.h index fdd7fb76..911774a6 100644 --- a/das-dn/submodbustcp/sub_modbus_tcp.h +++ b/das-dn/submodbustcp/sub_modbus_tcp.h @@ -66,11 +66,11 @@ private: private: int OnPackageReceived(BYTE* pBuf, int count, int ord /* = -1 */); - BOOLEAN OnReceiveData(CSubModbusTcpProcessItem *pItem, BYTE* pData, int count, int uid); + BOOLEAN OnReceiveData(CSubModbusTcpProcessItem*, BYTE*, int, int); - eMBErrorCode eMBTCPSend(BYTE ucSlaveAddress, const BYTE *pucFrame, WORD usLength, int); + eMBErrorCode eMBTCPSend(BYTE, const BYTE*, WORD, int); - eMBException prveMBError2Exception(eMBErrorCode eErrorCode); + eMBException prveMBError2Exception(eMBErrorCode); eMBException eMBFuncReadInputRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen); eMBException eMBFuncReadHoldingRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen); eMBException eMBFuncWriteHoldingRegister(CSubModbusTcpProcessItem *pItem, BYTE* pucFrame, WORD* usLen);