sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhouhuang 2024-12-25 10:59:46 +08:00
parent 8b3d4f1d03
commit 70600ed9a5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
das-dn/hostadsbf/hostadsbf.cpp
View File

@ -1092,6 +1092,11 @@ BOOLEAN CHostADSBFProcess::readRealData()
AdsVariable<std::array<BYTE, MAX_BLOCKF_SIZE>> turbineData {*m_turbine, ADSIGRP_IOIMAGE_RWOB, m_adsOverviewDataMemAddr}; AdsVariable<std::array<BYTE, MAX_BLOCKF_SIZE>> turbineData {*m_turbine, ADSIGRP_IOIMAGE_RWOB, m_adsOverviewDataMemAddr};
pData = ((std::array<BYTE, MAX_BLOCKF_SIZE>)turbineData).data(); pData = ((std::array<BYTE, MAX_BLOCKF_SIZE>)turbineData).data();
if (!m_turbine->IsConnected())
{
vLog(LOG_ERROR, "%s Read data error.\n", m_pidName.c_str());
return TRUE;
}
WORD registerAddr = m_adsOverviewDataMemAddr; WORD registerAddr = m_adsOverviewDataMemAddr;

5
das-dn/third_party/AdsLib/Sockets.cpp vendored
View File

@ -153,6 +153,7 @@ Socket::Socket(const struct addrinfo* const host, const int type) :
Socket::~Socket() Socket::~Socket()
{ {
LOG_ERROR("destroy socket\n");
Shutdown(); Shutdown();
// closesocket(m_Socket); // closesocket(m_Socket);
@ -218,7 +219,7 @@ size_t Socket::read(uint8_t* buffer, size_t maxBytes, timeval* timeout)
} }
m_LastError = WSAGetLastError(); m_LastError = WSAGetLastError();
if ((0 == bytesRead) || (m_LastError == CONNECTION_CLOSED) || (m_LastError == CONNECTION_ABORTED)) { if ((0 == bytesRead) || (m_LastError == CONNECTION_CLOSED) || (m_LastError == CONNECTION_ABORTED)) {
LOG_INFO("Socket connection closed by remote with error: " << std::dec << std::strerror(m_LastError)); LOG_INFO("read error, Socket: " << m_Socket << " connection closed by remote with error: " << std::dec << std::strerror(m_LastError));
} else { } else {
LOG_ERROR("Socket read frame failed with error: " << std::dec << std::strerror(m_LastError)); LOG_ERROR("Socket read frame failed with error: " << std::dec << std::strerror(m_LastError));
} }
@ -289,7 +290,7 @@ size_t Socket::write(const Frame& frame)
} }
if(0 == len){ if(0 == len){
LOG_INFO("Socket connection closed by remote with error: " << std::dec << std::strerror(m_LastError)); LOG_INFO("write error, Socket: " << m_Socket << " connection closed by remote with error: " << std::dec << std::strerror(m_LastError));
Shutdown(); Shutdown();
return 0; return 0;
} }