MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 08:05:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix *Network::isConnected().

Browse Source 
As m_enabled is changed accordingly to the modem current mode, it's not valid to use it for network connexion status.
This commit is contained in:
Daniel Caujolle-Bert
2021-03-23 22:32:36 +01:00
parent d26f3ea567
commit b5420fef15
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMRGatewayNetwork.cpp
View File

@@ -289,7 +289,7 @@ bool CDMRGatewayNetwork::writeTalkerAlias(unsigned int id, unsigned char type, c
bool CDMRGatewayNetwork::isConnected() const bool CDMRGatewayNetwork::isConnected() const
{ {
return (m_enabled && (m_addrLen != 0)); return (m_addrLen != 0);
} }
void CDMRGatewayNetwork::close() void CDMRGatewayNetwork::close()

2
DStarNetwork.cpp
View File

@@ -316,7 +316,7 @@ void CDStarNetwork::reset()
bool CDStarNetwork::isConnected() const bool CDStarNetwork::isConnected() const
{ {
return (m_enabled && (m_addrLen != 0)); return (m_addrLen != 0);
} }
void CDStarNetwork::close() void CDStarNetwork::close()

2
NXDNIcomNetwork.cpp
View File

@@ -155,7 +155,7 @@ void CNXDNIcomNetwork::reset()
bool CNXDNIcomNetwork::isConnected() const bool CNXDNIcomNetwork::isConnected() const
{ {
return (m_enabled && (m_addrLen != 0)); return (m_addrLen != 0);
} }
void CNXDNIcomNetwork::close() void CNXDNIcomNetwork::close()

2
NXDNKenwoodNetwork.cpp
View File

@@ -837,7 +837,7 @@ void CNXDNKenwoodNetwork::reset()
bool CNXDNKenwoodNetwork::isConnected() const bool CNXDNKenwoodNetwork::isConnected() const
{ {
return (m_enabled && (m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U)); return ((m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U));
} }
void CNXDNKenwoodNetwork::close() void CNXDNKenwoodNetwork::close()

2
P25Network.cpp
View File

@@ -426,7 +426,7 @@ unsigned int CP25Network::read(unsigned char* data, unsigned int length)
bool CP25Network::isConnected() const bool CP25Network::isConnected() const
{ {
return (m_enabled && (m_addrLen != 0)); return (m_addrLen != 0);
} }
void CP25Network::close() void CP25Network::close()

2
YSFNetwork.cpp
View File

@@ -185,7 +185,7 @@ void CYSFNetwork::reset()
bool CYSFNetwork::isConnected() const bool CYSFNetwork::isConnected() const
{ {
return (m_enabled && (m_addrLen != 0)); return (m_addrLen != 0);
} }
void CYSFNetwork::close() void CYSFNetwork::close()