Crash_Override
/
MMDVMHost-Private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #731 from f1rmb/m17_remotecommand_status

This commit is contained in:
Jonathan Naylor 2022-01-07 12:11:41 +00:00 committed by GitHub
parent 4b864661a7 20b1367848
commit e0adf4328b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
M17Network.cpp
View File

@ -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];

2
M17Network.h
View File

@ -46,6 +46,8 @@ public:
void clock(unsigned int ms);
bool isConnected() const;
private:
CUDPSocket m_socket;
sockaddr_storage m_addr;

1
MMDVMHost.cpp
View File

@ -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");
}

2
YSFNetwork.cpp
View File

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