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-17 13:38:57 +08:00
parent c09b99131b
commit 5fb9b5d89e
3 changed files with 182 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -967,7 +967,7 @@ BOOLEAN CHostADSBFProcess::OnTimer(void)
{ {
if (m_turbine == NULL) if (m_turbine == NULL)
{ {
vLog(LOG_DEBUG, "%s not connected.\n", m_pidName.c_str()); //vLog(LOG_DEBUG, "%s not connected.\n", m_pidName.c_str());
if ((m_apdu_t0_begin + 20) < system32.timers) if ((m_apdu_t0_begin + 20) < system32.timers)
{ {
m_apdu_t0_begin = system32.timers; m_apdu_t0_begin = system32.timers;
@ -1014,18 +1014,6 @@ BOOLEAN CHostADSBFProcess::OnTimer(void)
return TRUE; return TRUE;
} }
BOOLEAN CHostADSBFProcess::readDeviceState(const AdsDevice& route)
{
const auto state = route.GetState();
vLog(LOG_DEBUG, "ADS state: %d devState: %d\n", (uint16_t)state.ads, (uint16_t)state.device);
if ((uint16_t)state.ads >= ADSSTATE::ADSSTATE_MAXSTATES && (uint16_t)state.device >= ADSSTATE::ADSSTATE_MAXSTATES)
{
return FALSE;
}
return TRUE;
}
BOOLEAN CHostADSBFProcess::readFileID() BOOLEAN CHostADSBFProcess::readFileID()
{ {
int uid = GetCurUnitID(); int uid = GetCurUnitID();

1
das-dn/hostadsbf/hostadsbf.h
View File

@ -88,7 +88,6 @@ public:
private: private:
BOOLEAN calc(void); BOOLEAN calc(void);
BOOLEAN readDeviceState(const AdsDevice& route);
BOOLEAN readRealData(void); BOOLEAN readRealData(void);
BOOLEAN readFileID(void); BOOLEAN readFileID(void);
}; };

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

@ -124,7 +124,6 @@ Socket::Socket(const struct addrinfo* const host, const int type) :
if (INVALID_SOCKET == m_Socket) { if (INVALID_SOCKET == m_Socket) {
continue; continue;
} }
if (SOCK_STREAM == type) { if (SOCK_STREAM == type) {
if (::connect(m_Socket, rp->ai_addr, rp->ai_addrlen)) { if (::connect(m_Socket, rp->ai_addr, rp->ai_addrlen)) {
LOG_WARN("Socket connect["<<std::string(inet_ntoa(reinterpret_cast<sockaddr_in*>(rp->ai_addr)->sin_addr)) << "] timeout"); LOG_WARN("Socket connect["<<std::string(inet_ntoa(reinterpret_cast<sockaddr_in*>(rp->ai_addr)->sin_addr)) << "] timeout");
@ -155,7 +154,7 @@ Socket::Socket(const struct addrinfo* const host, const int type) :
Socket::~Socket() Socket::~Socket()
{ {
Shutdown(); Shutdown();
closesocket(m_Socket); // closesocket(m_Socket);
if (m_WSAInitialized) { if (m_WSAInitialized) {
WSACleanup(); WSACleanup();
@ -182,6 +181,7 @@ void Socket::Shutdown()
if(IsValid()) if(IsValid())
{ {
shutdown(m_Socket, SHUT_RDWR); shutdown(m_Socket, SHUT_RDWR);
closesocket(m_Socket);
m_Socket = INVALID_SOCKET; m_Socket = INVALID_SOCKET;
m_Connected = false; m_Connected = false;
} }
@ -243,6 +243,7 @@ bool Socket::Select(timeval* timeout)
FD_ZERO(&readSockets); FD_ZERO(&readSockets);
FD_SET(m_Socket, &readSockets); FD_SET(m_Socket, &readSockets);
if (!IsValid()) return false;
/* wait for receive data */ /* wait for receive data */
const int state = NATIVE_SELECT(m_Socket + 1, &readSockets, nullptr, nullptr, timeout); const int state = NATIVE_SELECT(m_Socket + 1, &readSockets, nullptr, nullptr, timeout);
if (0 == state) { if (0 == state) {