From b5420fef155c35bca1987ddb7175d55604b25671 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Tue, 23 Mar 2021 22:32:36 +0100 Subject: [PATCH] Fix *Network::isConnected(). As m_enabled is changed accordingly to the modem current mode, it's not valid to use it for network connexion status. --- DMRGatewayNetwork.cpp | 2 +- DStarNetwork.cpp | 2 +- NXDNIcomNetwork.cpp | 2 +- NXDNKenwoodNetwork.cpp | 2 +- P25Network.cpp | 2 +- YSFNetwork.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DMRGatewayNetwork.cpp b/DMRGatewayNetwork.cpp index dd86e76..775a79d 100644 --- a/DMRGatewayNetwork.cpp +++ b/DMRGatewayNetwork.cpp @@ -289,7 +289,7 @@ bool CDMRGatewayNetwork::writeTalkerAlias(unsigned int id, unsigned char type, c bool CDMRGatewayNetwork::isConnected() const { - return (m_enabled && (m_addrLen != 0)); + return (m_addrLen != 0); } void CDMRGatewayNetwork::close() diff --git a/DStarNetwork.cpp b/DStarNetwork.cpp index 4a978e2..c702cfa 100644 --- a/DStarNetwork.cpp +++ b/DStarNetwork.cpp @@ -316,7 +316,7 @@ void CDStarNetwork::reset() bool CDStarNetwork::isConnected() const { - return (m_enabled && (m_addrLen != 0)); + return (m_addrLen != 0); } void CDStarNetwork::close() diff --git a/NXDNIcomNetwork.cpp b/NXDNIcomNetwork.cpp index 5f20b37..730f445 100644 --- a/NXDNIcomNetwork.cpp +++ b/NXDNIcomNetwork.cpp @@ -155,7 +155,7 @@ void CNXDNIcomNetwork::reset() bool CNXDNIcomNetwork::isConnected() const { - return (m_enabled && (m_addrLen != 0)); + return (m_addrLen != 0); } void CNXDNIcomNetwork::close() diff --git a/NXDNKenwoodNetwork.cpp b/NXDNKenwoodNetwork.cpp index 3866133..bed3316 100644 --- a/NXDNKenwoodNetwork.cpp +++ b/NXDNKenwoodNetwork.cpp @@ -837,7 +837,7 @@ void CNXDNKenwoodNetwork::reset() bool CNXDNKenwoodNetwork::isConnected() const { - return (m_enabled && (m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U)); + return ((m_rtcpAddrLen != 0U) && (m_rtpAddrLen != 0U)); } void CNXDNKenwoodNetwork::close() diff --git a/P25Network.cpp b/P25Network.cpp index 2734373..77a9a7d 100644 --- a/P25Network.cpp +++ b/P25Network.cpp @@ -426,7 +426,7 @@ unsigned int CP25Network::read(unsigned char* data, unsigned int length) bool CP25Network::isConnected() const { - return (m_enabled && (m_addrLen != 0)); + return (m_addrLen != 0); } void CP25Network::close() diff --git a/YSFNetwork.cpp b/YSFNetwork.cpp index 451d3af..3fc5eb6 100644 --- a/YSFNetwork.cpp +++ b/YSFNetwork.cpp @@ -185,7 +185,7 @@ void CYSFNetwork::reset() bool CYSFNetwork::isConnected() const { - return (m_enabled && (m_addrLen != 0)); + return (m_addrLen != 0); } void CYSFNetwork::close()