From b972ce9cef17f7d30b80206cf0984ed122f2672d Mon Sep 17 00:00:00 2001 From: zhouhuang Date: Wed, 4 Dec 2024 19:53:53 +0800 Subject: [PATCH] update --- das-dn/hostadsbf/hostadsbf.cpp | 3 ++- das-dn/third_party/AdsLib/Sockets.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/das-dn/hostadsbf/hostadsbf.cpp b/das-dn/hostadsbf/hostadsbf.cpp index 2e3cfd93..32a62cd7 100644 --- a/das-dn/hostadsbf/hostadsbf.cpp +++ b/das-dn/hostadsbf/hostadsbf.cpp @@ -5,7 +5,7 @@ #include #define MAX_BLOCKF_SIZE 512 -#define DATA_BLOCK_BOUNDARY 1000 +#define DATA_BLOCK_BOUNDARY 400 #define REGISTER_DATA_TYPE_YC 1 #define REGISTER_DATA_TYPE_YM 2 @@ -712,6 +712,7 @@ BOOLEAN CHostADSBFProcess::calc(void) pData = GetUnitYCParamByPoint(uid, n); if (pData[4] == 1) continue; registerAddr = MAKEWORD(pData[0], pData[1]); + vLog(LOG_DEBUG, "registerAddr is: %d\n", registerAddr); if (registerAddr < DATA_BLOCK_BOUNDARY) { if (!m_adsDatas[0].inuse) m_adsDatas[0].inuse = TRUE; diff --git a/das-dn/third_party/AdsLib/Sockets.cpp b/das-dn/third_party/AdsLib/Sockets.cpp index 093ae267..2e272f39 100644 --- a/das-dn/third_party/AdsLib/Sockets.cpp +++ b/das-dn/third_party/AdsLib/Sockets.cpp @@ -126,7 +126,7 @@ Socket::Socket(const struct addrinfo* const host, const int type) if (SOCK_STREAM == type) { if (::connect(m_Socket, rp->ai_addr, rp->ai_addrlen)) { - LOG_WARN("Socket connect["<(rp->ai_addr)->sin_addr)) << "] timeout"); + LOG_WARN("Socket connect[" << std::string(inet_ntoa(reinterpret_cast(rp->ai_addr)->sin_addr)) << "] timeout"); closesocket(m_Socket); m_Socket = INVALID_SOCKET; continue;