rewrite for UDPSocket renewal
This commit is contained in:
parent
def0edbaca
commit
9856025923
|
@ -128,7 +128,7 @@ bool CDMRNetwork::open()
|
|||
{
|
||||
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);
|
||||
|
||||
m_status = WAITING_CONNECT;
|
||||
|
|
|
@ -65,7 +65,7 @@ bool CDStarNetwork::open()
|
|||
{
|
||||
LogMessage("Opening D-Star network connection");
|
||||
|
||||
if (CUDPSocket::isnone(m_address))
|
||||
if (CUDPSocket::isNone(m_address))
|
||||
return false;
|
||||
|
||||
m_pollTimer.start();
|
||||
|
|
|
@ -50,7 +50,7 @@ bool CNXDNIcomNetwork::open()
|
|||
{
|
||||
LogMessage("Opening NXDN network connection");
|
||||
|
||||
if (CUDPSocket::isnone(m_address))
|
||||
if (CUDPSocket::isNone(m_address))
|
||||
return false;
|
||||
|
||||
return m_socket.open();
|
||||
|
|
|
@ -82,8 +82,8 @@ bool CNXDNKenwoodNetwork::open()
|
|||
{
|
||||
LogMessage("Opening Kenwood connection");
|
||||
|
||||
if (CUDPSocket::isnone(m_rtpaddress) ||
|
||||
CUDPSocket::isnone(m_rtcpaddress))
|
||||
if (CUDPSocket::isNone(m_rtpaddress) ||
|
||||
CUDPSocket::isNone(m_rtcpaddress))
|
||||
return false;
|
||||
|
||||
if (!m_rtcpSocket.open())
|
||||
|
@ -766,7 +766,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
|
|||
sockaddr_storage address;
|
||||
unsigned int 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;
|
||||
|
||||
if (!m_enabled)
|
||||
|
@ -789,7 +789,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
|
|||
sockaddr_storage address;
|
||||
unsigned int 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;
|
||||
|
||||
if (!m_enabled)
|
||||
|
|
|
@ -107,7 +107,7 @@ bool CP25Network::open()
|
|||
{
|
||||
LogMessage("Opening P25 network connection");
|
||||
|
||||
if (CUDPSocket::isnone(m_address))
|
||||
if (CUDPSocket::isNone(m_address))
|
||||
return false;
|
||||
|
||||
return m_socket.open(m_address.ss_family);
|
||||
|
|
|
@ -47,7 +47,7 @@ bool CPOCSAGNetwork::open()
|
|||
{
|
||||
LogMessage("Opening POCSAG network connection");
|
||||
|
||||
if (CUDPSocket::isnone(m_address))
|
||||
if (CUDPSocket::isNone(m_address))
|
||||
return false;
|
||||
|
||||
return m_socket.open();
|
||||
|
|
|
@ -57,7 +57,7 @@ bool CYSFNetwork::open()
|
|||
{
|
||||
LogMessage("Opening YSF network connection");
|
||||
|
||||
if (CUDPSocket::isnone(m_address))
|
||||
if (CUDPSocket::isNone(m_address))
|
||||
return false;
|
||||
|
||||
m_pollTimer.start();
|
||||
|
|
Loading…
Reference in a new issue