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

rewrite for UDPSocket renewal

Browse Source
This commit is contained in:
SASANO Takayoshi
2020-09-06 15:52:46 +09:00
parent def0edbaca
commit 9856025923
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMRNetwork.cpp
View File

@@ -128,7 +128,7 @@ bool CDMRNetwork::open()
{ {
LogMessage("DMR, Opening DMR Network"); LogMessage("DMR, Opening DMR Network");
if (CUDPSocket::isnone(m_address)) if (CUDPSocket::isNone(m_address))
CUDPSocket::lookup(m_addressStr, m_port, m_address, m_addrlen); CUDPSocket::lookup(m_addressStr, m_port, m_address, m_addrlen);
m_status = WAITING_CONNECT; m_status = WAITING_CONNECT;

2
DStarNetwork.cpp
View File

@@ -65,7 +65,7 @@ bool CDStarNetwork::open()
{ {
LogMessage("Opening D-Star network connection"); LogMessage("Opening D-Star network connection");
if (CUDPSocket::isnone(m_address)) if (CUDPSocket::isNone(m_address))
return false; return false;
m_pollTimer.start(); m_pollTimer.start();

2
NXDNIcomNetwork.cpp
View File

@@ -50,7 +50,7 @@ bool CNXDNIcomNetwork::open()
{ {
LogMessage("Opening NXDN network connection"); LogMessage("Opening NXDN network connection");
if (CUDPSocket::isnone(m_address)) if (CUDPSocket::isNone(m_address))
return false; return false;
return m_socket.open(); return m_socket.open();

8
NXDNKenwoodNetwork.cpp
View File

@@ -82,8 +82,8 @@ bool CNXDNKenwoodNetwork::open()
{ {
LogMessage("Opening Kenwood connection"); LogMessage("Opening Kenwood connection");
if (CUDPSocket::isnone(m_rtpaddress) || if (CUDPSocket::isNone(m_rtpaddress) ||
CUDPSocket::isnone(m_rtcpaddress)) CUDPSocket::isNone(m_rtcpaddress))
return false; return false;
if (!m_rtcpSocket.open()) if (!m_rtcpSocket.open())
@@ -766,7 +766,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
sockaddr_storage address; sockaddr_storage address;
unsigned int addrlen; unsigned int addrlen;
int length = m_rtpSocket.read(buffer, BUFFER_LENGTH, address, addrlen); int length = m_rtpSocket.read(buffer, BUFFER_LENGTH, address, addrlen);
if (length <= 0 || !CUDPSocket::match_addr(m_rtpaddress, address)) if (length <= 0 || !CUDPSocket::match(m_rtpaddress, address, IMT_ADDRESS_ONLY))
return 0U; return 0U;
if (!m_enabled) if (!m_enabled)
@@ -789,7 +789,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
sockaddr_storage address; sockaddr_storage address;
unsigned int addrlen; unsigned int addrlen;
int length = m_rtcpSocket.read(buffer, BUFFER_LENGTH, address, addrlen); int length = m_rtcpSocket.read(buffer, BUFFER_LENGTH, address, addrlen);
if (length <= 0 || !CUDPSocket::match_addr(m_rtcpaddress, address)) if (length <= 0 || !CUDPSocket::match(m_rtcpaddress, address, IMT_ADDRESS_ONLY))
return 0U; return 0U;
if (!m_enabled) if (!m_enabled)

2
P25Network.cpp
View File

@@ -107,7 +107,7 @@ bool CP25Network::open()
{ {
LogMessage("Opening P25 network connection"); LogMessage("Opening P25 network connection");
if (CUDPSocket::isnone(m_address)) if (CUDPSocket::isNone(m_address))
return false; return false;
return m_socket.open(m_address.ss_family); return m_socket.open(m_address.ss_family);

2
POCSAGNetwork.cpp
View File

@@ -47,7 +47,7 @@ bool CPOCSAGNetwork::open()
{ {
LogMessage("Opening POCSAG network connection"); LogMessage("Opening POCSAG network connection");
if (CUDPSocket::isnone(m_address)) if (CUDPSocket::isNone(m_address))
return false; return false;
return m_socket.open(); return m_socket.open();

2
YSFNetwork.cpp
View File

@@ -57,7 +57,7 @@ bool CYSFNetwork::open()
{ {
LogMessage("Opening YSF network connection"); LogMessage("Opening YSF network connection");
if (CUDPSocket::isnone(m_address)) if (CUDPSocket::isNone(m_address))
return false; return false;
m_pollTimer.start(); m_pollTimer.start();