ShaYmez/P25Clients
1
0
Fork 0
mirror of https://github.com/ShaYmez/P25Clients.git synced 2026-06-17 21:28:33 -04:00
Code Issues Projects Releases Wiki Activity

Conversion to IPv6

Browse Source
This commit is contained in:
Jonathan Naylor
2020-09-03 14:00:48 +01:00
parent 05d56f078e
commit 59dd67a952
20 changed files with 450 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
P25Gateway/Network.cpp
+9 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2014,2016 by Jonathan Naylor G4KLX
* Copyright (C) 2009-2014,2016,2020 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,22 +43,19 @@ bool CNetwork::open()
return m_socket.open();
}
bool CNetwork::writeData(const unsigned char* data, unsigned int length, const in_addr& address, unsigned int port)
bool CNetwork::writeData(const unsigned char* data, unsigned int length, const sockaddr_storage& addr, unsigned int addrLen)
{
assert(data != NULL);
assert(length > 0U);
assert(port > 0U);
if (m_debug)
CUtils::dump(1U, "P25 Network Data Sent", data, length);
return m_socket.write(data, length, address, port);
return m_socket.write(data, length, addr, addrLen);
}
bool CNetwork::writePoll(const in_addr& address, unsigned int port)
bool CNetwork::writePoll(const sockaddr_storage& addr, unsigned int addrLen)
{
assert(port > 0U);
unsigned char data[15U];
data[0U] = 0xF0U;
@@ -69,13 +66,11 @@ bool CNetwork::writePoll(const in_addr& address, unsigned int port)
if (m_debug)
CUtils::dump(1U, "P25 Network Poll Sent", data, 11U);
return m_socket.write(data, 11U, address, port);
return m_socket.write(data, 11U, addr, addrLen);
}
bool CNetwork::writeUnlink(const in_addr& address, unsigned int port)
bool CNetwork::writeUnlink(const sockaddr_storage& addr, unsigned int addrLen)
{
assert(port > 0U);
unsigned char data[15U];
data[0U] = 0xF1U;
@@ -86,15 +81,15 @@ bool CNetwork::writeUnlink(const in_addr& address, unsigned int port)
if (m_debug)
CUtils::dump(1U, "P25 Network Unlink Sent", data, 11U);
return m_socket.write(data, 11U, address, port);
return m_socket.write(data, 11U, addr, addrLen);
}
unsigned int CNetwork::readData(unsigned char* data, unsigned int length, in_addr& address, unsigned int& port)
unsigned int CNetwork::readData(unsigned char* data, unsigned int length, sockaddr_storage& addr, unsigned int& addrLen)
{
assert(data != NULL);
assert(length > 0U);
int len = m_socket.read(data, length, address, port);
int len = m_socket.read(data, length, addr, addrLen);
if (len <= 0)
return 0U;