Add M17 network status to Remote command "status" output.
YSFNetwork: fix ::IsConnected(), it should not take m_enabled in account.
This commit is contained in:
parent
4b864661a7
commit
20b1367848
|
@ -194,6 +194,11 @@ void CM17Network::enable(bool enabled)
|
|||
m_enabled = enabled;
|
||||
}
|
||||
|
||||
bool CM17Network::isConnected() const
|
||||
{
|
||||
return (m_addrLen != 0);
|
||||
}
|
||||
|
||||
void CM17Network::sendPing()
|
||||
{
|
||||
unsigned char buffer[5U];
|
||||
|
|
|
@ -46,6 +46,8 @@ public:
|
|||
|
||||
void clock(unsigned int ms);
|
||||
|
||||
bool isConnected() const;
|
||||
|
||||
private:
|
||||
CUDPSocket m_socket;
|
||||
sockaddr_storage m_addr;
|
||||
|
|
|
@ -2698,5 +2698,6 @@ void CMMDVMHost::buildNetworkStatusString(std::string &str)
|
|||
str += std::string(" ysf:") + (((m_ysfNetwork == NULL) || (m_ysfEnabled == false)) ? "n/a" : (m_ysfNetwork->isConnected() ? "conn" : "disc"));
|
||||
str += std::string(" p25:") + (((m_p25Network == NULL) || (m_p25Enabled == false)) ? "n/a" : (m_p25Network->isConnected() ? "conn" : "disc"));
|
||||
str += std::string(" nxdn:") + (((m_nxdnNetwork == NULL) || (m_nxdnEnabled == false)) ? "n/a" : (m_nxdnNetwork->isConnected() ? "conn" : "disc"));
|
||||
str += std::string(" m17:") + (((m_m17Network == NULL) || (m_m17Enabled == false)) ? "n/a" : (m_m17Network->isConnected() ? "conn" : "disc"));
|
||||
str += std::string(" fm:") + (m_fmEnabled ? "conn" : "n/a");
|
||||
}
|
||||
|
|
|
@ -185,7 +185,7 @@ void CYSFNetwork::reset()
|
|||
|
||||
bool CYSFNetwork::isConnected() const
|
||||
{
|
||||
return m_enabled && (m_addrLen != 0U);
|
||||
return (m_addrLen != 0U);
|
||||
}
|
||||
|
||||
void CYSFNetwork::close()
|
||||
|
|
Loading…
Reference in New Issue