Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue with net active and roamer reaccess bits in OSP_RFSS_STS_BCAST; add helper function to AffiliationLookup to allow for reverse resolving of grants from source to destination; migrate FNEPeerConnection from a non-pointer reference to a pointer (this allows better tracking of values without copying the connection structure);

Browse Source
pull/48/head
Bryan Biedenkapp 2 years ago
parent 1c28bed062
commit 6d5e35d361
6 changed files with 329 additions and 296 deletions
Show Stats Download Patch File Download Diff File

21
src/common/lookups/AffiliationLookup.cpp
Unescape View File

@ -463,6 +463,27 @@ uint32_t AffiliationLookup::getGrantedCh(uint32_t dstId)
return 0U;
}
/// <summary>
/// Helper to get the destination ID granted to the given source ID.
/// </summary>
/// <param name="srcId"></param>
/// <returns></returns>
uint32_t AffiliationLookup::getGrantedBySrcId(uint32_t srcId)
{
if (srcId == 0U) {
return 0U;
}
// lookup dynamic channel grant table entry
for (auto entry : m_grantSrcIdTable) {
if (entry.second == srcId) {
return entry.first;
}
}
return 0U;
}
/// <summary>
/// Helper to get the source ID granted for the given destination ID.
/// </summary>

2
src/common/lookups/AffiliationLookup.h
Unescape View File

@ -161,6 +161,8 @@ namespace lookups
virtual bool isNetGranted(uint32_t dstId) const;
/// <summary>Helper to get the channel granted for the given destination ID.</summary>
virtual uint32_t getGrantedCh(uint32_t dstId);
/// <summary>Helper to get the destination ID granted to the given source ID.</summary>
virtual uint32_t getGrantedBySrcId(uint32_t srcId);
/// <summary>Helper to get the source ID granted for the given destination ID.</summary>
virtual uint32_t getGrantedSrcId(uint32_t dstId);

4
src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.cpp
Unescape View File

@ -77,8 +77,8 @@ void OSP_RFSS_STS_BCAST::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
tsbkValue = m_siteData.lra(); // Location Registration Area
tsbkValue = (tsbkValue << 4) +
(m_roamerReaccess) ? 0x02U : 0x00U + // Roamer Reaccess Method
(m_siteData.netActive()) ? 0x01U : 0x00U; // Network Active
((m_roamerReaccess) ? 0x02U : 0x00U) + // Roamer Reaccess Method
((m_siteData.netActive()) ? 0x01U : 0x00U); // Network Active
tsbkValue = (tsbkValue << 12) + m_siteData.sysId(); // System ID
tsbkValue = (tsbkValue << 8) + m_siteData.rfssId(); // RF Sub-System ID
tsbkValue = (tsbkValue << 8) + m_siteData.siteId(); // Site ID

162
src/fne/network/FNENetwork.cpp
Unescape View File

@ -142,20 +142,25 @@ void FNENetwork::clock(uint32_t ms)
std::vector<uint32_t> peersToRemove = std::vector<uint32_t>();
for (auto peer : m_peers) {
uint32_t id = peer.first;
FNEPeerConnection connection = peer.second;
if (connection.connected()) {
uint64_t dt = connection.lastPing() + (m_host->m_pingTime * m_host->m_maxMissedPings);
FNEPeerConnection* connection = peer.second;
if (connection != nullptr) {
if (connection->connected()) {
uint64_t dt = connection->lastPing() + (m_host->m_pingTime * m_host->m_maxMissedPings);
if (dt < now) {
LogInfoEx(LOG_NET, "PEER %u timed out, dt = %u, now = %u", id, dt, now);
peersToRemove.push_back(id);
}
}
}
}
// remove any peers
for (uint32_t peerId : peersToRemove) {
FNEPeerConnection* connection = m_peers[peerId];
m_peers.erase(peerId);
if (connection != nullptr) {
delete connection;
}
}
// roll the RTP timestamp if no call is in progress
@ -197,19 +202,20 @@ void FNENetwork::clock(uint32_t ms)
// update current peer packet sequence and stream ID
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end()) && streamId != 0U) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
uint16_t pktSeq = rtpHeader.getSequence();
if ((connection.currStreamId() == streamId) && (pktSeq != connection.pktNextSeq())) {
LogWarning(LOG_NET, "PEER %u Stream %u out-of-sequence; %u != %u", peerId, streamId, pktSeq, connection.pktNextSeq());
if (connection != nullptr) {
if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq())) {
LogWarning(LOG_NET, "PEER %u Stream %u out-of-sequence; %u != %u", peerId, streamId, pktSeq, connection->pktNextSeq());
}
connection.currStreamId(streamId);
connection.pktLastSeq(pktSeq);
connection.pktNextSeq(pktSeq + 1);
if (connection.pktNextSeq() > UINT16_MAX) {
connection.pktNextSeq(0U);
connection->currStreamId(streamId);
connection->pktLastSeq(pktSeq);
connection->pktNextSeq(pktSeq + 1);
if (connection->pktNextSeq() > UINT16_MAX) {
connection->pktNextSeq(0U);
}
}
m_peers[peerId] = connection;
@ -228,11 +234,12 @@ void FNENetwork::clock(uint32_t ms)
{
if (fneHeader.getSubFunction() == NET_PROTOCOL_SUBFUNC_DMR) { // Encapsulated DMR data frame
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
if (m_dmrEnabled) {
if (m_tagDMR != nullptr) {
m_tagDMR->processFrame(buffer.get(), length, peerId, rtpHeader.getSequence(), streamId);
@ -241,13 +248,15 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else if (fneHeader.getSubFunction() == NET_PROTOCOL_SUBFUNC_P25) { // Encapsulated P25 data frame
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
if (m_p25Enabled) {
if (m_tagP25 != nullptr) {
m_tagP25->processFrame(buffer.get(), length, peerId, rtpHeader.getSequence(), streamId);
@ -256,13 +265,15 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else if (fneHeader.getSubFunction() == NET_PROTOCOL_SUBFUNC_NXDN) { // Encapsulated NXDN data frame
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
if (m_nxdnEnabled) {
if (m_tagNXDN != nullptr) {
m_tagNXDN->processFrame(buffer.get(), length, peerId, rtpHeader.getSequence(), streamId);
@ -271,6 +282,7 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else {
Utils::dump("Unknown protocol opcode from peer", buffer.get(), length);
}
@ -280,22 +292,22 @@ void FNENetwork::clock(uint32_t ms)
case NET_FUNC_RPTL: // Repeater Login
{
if (peerId > 0 && (m_peers.find(peerId) == m_peers.end())) {
FNEPeerConnection connection = FNEPeerConnection(peerId, address, addrLen);
connection.lastPing(now);
connection.currStreamId(streamId);
FNEPeerConnection* connection = new FNEPeerConnection(peerId, address, addrLen);
connection->lastPing(now);
connection->currStreamId(streamId);
std::uniform_int_distribution<uint32_t> dist(DVM_RAND_MIN, DVM_RAND_MAX);
connection.salt(dist(m_random));
connection->salt(dist(m_random));
LogInfoEx(LOG_NET, "Repeater logging in with PEER %u, %s:%u", peerId, connection.address().c_str(), connection.port());
LogInfoEx(LOG_NET, "Repeater logging in with PEER %u, %s:%u", peerId, connection->address().c_str(), connection->port());
connection.connectionState(NET_STAT_WAITING_AUTHORISATION);
connection->connectionState(NET_STAT_WAITING_AUTHORISATION);
m_peers[peerId] = connection;
// transmit salt to peer
uint8_t salt[4U];
::memset(salt, 0x00U, 4U);
__SET_UINT32(connection.salt(), salt, 0U);
__SET_UINT32(connection->salt(), salt, 0U);
writePeerACK(peerId, salt, 4U);
LogInfoEx(LOG_NET, "Challenge response send to PEER %u for login", peerId);
@ -306,13 +318,16 @@ void FNENetwork::clock(uint32_t ms)
// check if the peer is in our peer list -- if he is, and he isn't in a running state, reset
// the login sequence
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
connection.lastPing(now);
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
connection->lastPing(now);
if (connection.connectionState() != NET_STAT_RUNNING) {
if (connection->connectionState() != NET_STAT_RUNNING) {
auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; });
if (it != m_peers.end()) {
m_peers.erase(peerId);
delete connection;
}
}
}
}
@ -322,10 +337,11 @@ void FNENetwork::clock(uint32_t ms)
case NET_FUNC_RPTK: // Repeater Authentication
{
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
connection.lastPing(now);
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
connection->lastPing(now);
if (connection.connectionState() == NET_STAT_WAITING_AUTHORISATION) {
if (connection->connectionState() == NET_STAT_WAITING_AUTHORISATION) {
// get the hash from the frame message
uint8_t hash[length - 8U];
::memset(hash, 0x00U, length - 8U);
@ -334,7 +350,7 @@ void FNENetwork::clock(uint32_t ms)
// generate our own hash
uint8_t salt[4U];
::memset(salt, 0x00U, 4U);
__SET_UINT32(connection.salt(), salt, 0U);
__SET_UINT32(connection->salt(), salt, 0U);
size_t size = m_password.size();
uint8_t* in = new uint8_t[size + sizeof(uint32_t)];
@ -361,7 +377,7 @@ void FNENetwork::clock(uint32_t ms)
}
if (valid) {
connection.connectionState(NET_STAT_WAITING_CONFIG);
connection->connectionState(NET_STAT_WAITING_CONFIG);
writePeerACK(peerId);
LogInfoEx(LOG_NET, "PEER %u has completed the login exchange", peerId);
}
@ -385,6 +401,7 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else {
writePeerNAK(peerId, TAG_REPEATER_AUTH, address, addrLen);
}
@ -393,10 +410,11 @@ void FNENetwork::clock(uint32_t ms)
case NET_FUNC_RPTC: // Repeater Configuration
{
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
connection.lastPing(now);
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
connection->lastPing(now);
if (connection.connectionState() == NET_STAT_WAITING_CONFIG) {
if (connection->connectionState() == NET_STAT_WAITING_CONFIG) {
uint8_t rawPayload[length - 8U];
::memset(rawPayload, 0x00U, length - 8U);
::memcpy(rawPayload, buffer.get() + 8U, length - 8U);
@ -424,11 +442,11 @@ void FNENetwork::clock(uint32_t ms)
}
}
else {
connection.config(v.get<json::object>());
connection.connectionState(NET_STAT_RUNNING);
connection.connected(true);
connection.pingsReceived(0U);
connection.lastPing(now);
connection->config(v.get<json::object>());
connection->connectionState(NET_STAT_RUNNING);
connection->connected(true);
connection->pingsReceived(0U);
connection->lastPing(now);
m_peers[peerId] = connection;
writePeerACK(peerId);
@ -443,7 +461,7 @@ void FNENetwork::clock(uint32_t ms)
writeDeactiveTGIDs(peerId, true);
m_frameQueue->flushQueue();
json::object peerConfig = connection.config();
json::object peerConfig = connection->config();
if (peerConfig["software"].is<std::string>()) {
std::string software = peerConfig["software"].get<std::string>();
LogInfoEx(LOG_NET, "PEER %u reports software %s", peerId, software.c_str());
@ -460,6 +478,7 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else {
writePeerNAK(peerId, TAG_REPEATER_CONFIG, address, addrLen);
}
@ -469,16 +488,19 @@ void FNENetwork::clock(uint32_t ms)
case NET_FUNC_RPT_CLOSING: // Repeater Closing (Disconnect)
{
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
LogInfoEx(LOG_NET, "PEER %u is closing down", peerId);
auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; });
if (it != m_peers.end()) {
m_peers.erase(peerId);
delete connection;
}
}
}
}
@ -487,23 +509,24 @@ void FNENetwork::clock(uint32_t ms)
case NET_FUNC_PING: // Repeater Ping
{
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
uint32_t pingsRx = connection.pingsReceived();
if (connection->connected() && connection->address() == ip) {
uint32_t pingsRx = connection->pingsReceived();
pingsRx++;
connection.pingsReceived(pingsRx);
connection.lastPing(now);
connection.pktLastSeq(connection.pktLastSeq() + 1);
connection->pingsReceived(pingsRx);
connection->lastPing(now);
connection->pktLastSeq(connection->pktLastSeq() + 1);
m_peers[peerId] = connection;
writePeerCommand(peerId, { NET_FUNC_PONG, NET_SUBFUNC_NOP });
if (m_debug) {
LogDebug(LOG_NET, "PEER %u ping received and answered, pingsReceived = %u", peerId, connection.pingsReceived());
LogDebug(LOG_NET, "PEER %u ping received and answered, pingsReceived = %u", peerId, connection->pingsReceived());
}
}
else {
@ -511,16 +534,18 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
break;
case NET_FUNC_GRANT_REQ: // Repeater Grant Request
{
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
/* ignored */
}
else {
@ -528,6 +553,7 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
break;
case NET_FUNC_TRANSFER:
@ -535,11 +561,12 @@ void FNENetwork::clock(uint32_t ms)
if (fneHeader.getSubFunction() == NET_TRANSFER_SUBFUNC_ACTIVITY) { // Peer Activity Log Transfer
if (m_allowActivityTransfer) {
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
uint8_t rawPayload[length - 11U];
::memset(rawPayload, 0x00U, length - 11U);
::memcpy(rawPayload, buffer.get() + 11U, length - 11U);
@ -553,14 +580,16 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else if (fneHeader.getSubFunction() == NET_TRANSFER_SUBFUNC_DIAG) { // Peer Diagnostic Log Transfer
if (m_allowDiagnosticTransfer) {
if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
FNEPeerConnection connection = m_peers[peerId];
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
std::string ip = UDPSocket::address(address);
// validate peer (simple validation really)
if (connection.connected() && connection.address() == ip) {
if (connection->connected() && connection->address() == ip) {
uint8_t rawPayload[length - 11U];
::memset(rawPayload, 0x00U, length - 11U);
::memcpy(rawPayload, buffer.get() + 11U, length - 11U);
@ -577,6 +606,7 @@ void FNENetwork::clock(uint32_t ms)
}
}
}
}
else {
Utils::dump("Unknown transfer opcode from the peer", buffer.get(), length);
}
@ -931,18 +961,21 @@ bool FNENetwork::writePeer(uint32_t peerId, FrameQueue::OpcodePair opcode, const
{
auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; });
if (it != m_peers.end()) {
uint32_t peerStreamId = m_peers[peerId].currStreamId();
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
uint32_t peerStreamId = connection->currStreamId();
if (streamId == 0U) {
streamId = peerStreamId;
}
sockaddr_storage addr = m_peers[peerId].socketStorage();
uint32_t addrLen = m_peers[peerId].sockStorageLen();
sockaddr_storage addr = connection->socketStorage();
uint32_t addrLen = connection->sockStorageLen();
m_frameQueue->enqueueMessage(data, length, streamId, peerId, m_peerId, opcode, pktSeq, addr, addrLen);
if (queueOnly)
return true;
return m_frameQueue->flushQueue();
}
}
return false;
}
@ -961,13 +994,16 @@ bool FNENetwork::writePeer(uint32_t peerId, FrameQueue::OpcodePair opcode, const
{
auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; });
if (it != m_peers.end()) {
FNEPeerConnection* connection = m_peers[peerId];
if (connection != nullptr) {
if (incPktSeq) {
m_peers[peerId].pktLastSeq(m_peers[peerId].pktLastSeq() + 1);
connection->pktLastSeq(connection->pktLastSeq() + 1);
}
uint16_t pktSeq = m_peers[peerId].pktLastSeq();
uint16_t pktSeq = connection->pktLastSeq();
return writePeer(peerId, opcode, data, length, pktSeq, streamId, queueOnly);
}
}
return false;
}

39
src/fne/network/FNENetwork.h
Unescape View File

@ -56,6 +56,10 @@ namespace network
class HOST_SW_API FNEPeerConnection {
public:
auto operator=(FNEPeerConnection&) -> FNEPeerConnection& = delete;
auto operator=(FNEPeerConnection&&) -> FNEPeerConnection& = delete;
FNEPeerConnection(FNEPeerConnection&) = delete;
/// <summary>Initializes a new insatnce of the FNEPeerConnection class.</summary>
FNEPeerConnection() :
m_id(0U),
@ -101,37 +105,6 @@ namespace network
assert(m_port > 0U);
}
/// <summary>Equals operator. Copies this FNEPeerConnection to another FNEPeerConnection.</summary>
virtual FNEPeerConnection& operator=(const FNEPeerConnection& data)
{
if (this != &data) {
m_id = data.m_id;
m_currStreamId = data.m_currStreamId;
m_socketStorage = data.m_socketStorage;
m_sockStorageLen = data.m_sockStorageLen;
m_address = data.m_address;
m_port = data.m_port;
m_salt = data.m_salt;
m_connected = data.m_connected;
m_connectionState = data.m_connectionState;
m_pingsReceived = data.m_pingsReceived;
m_lastPing = data.m_lastPing;
m_config = data.m_config;
m_pktLastSeq = data.m_pktLastSeq;
m_pktNextSeq = data.m_pktNextSeq;
}
return *this;
}
public:
/// <summary>Peer ID.</summary>
__PROPERTY_PLAIN(uint32_t, id);
@ -235,8 +208,8 @@ namespace network
NET_CONN_STATUS m_status;
typedef std::pair<const uint32_t, network::FNEPeerConnection> PeerMapPair;
std::unordered_map<uint32_t, FNEPeerConnection> m_peers;
typedef std::pair<const uint32_t, network::FNEPeerConnection*> PeerMapPair;
std::unordered_map<uint32_t, FNEPeerConnection*> m_peers;
Timer m_maintainenceTimer;
Timer m_updateLookupTimer;

19
src/fne/network/RESTAPI.cpp
Unescape View File

@ -461,25 +461,25 @@ void RESTAPI::restAPI_GetPeerList(const HTTPPayload& request, HTTPPayload& reply
if (m_network->m_peers.size() > 0) {
for (auto entry : m_network->m_peers) {
uint32_t peerId = entry.first;
network::FNEPeerConnection peer = entry.second;
network::FNEPeerConnection* peer = entry.second;
if (peer != nullptr) {
json::object peerObj = json::object();
peerObj["peerId"].set<uint32_t>(peerId);
std::string address = peer.address();
std::string address = peer->address();
peerObj["address"].set<std::string>(address);
uint16_t port = peer.port();
uint16_t port = peer->port();
peerObj["port"].set<uint16_t>(port);
bool connected = peer.connected();
bool connected = peer->connected();
peerObj["connected"].set<bool>(connected);
uint32_t connectionState = (uint32_t)peer.connectionState();
uint32_t connectionState = (uint32_t)peer->connectionState();
peerObj["connectionState"].set<uint32_t>(connectionState);
uint32_t pingsReceived = peer.pingsReceived();
uint32_t pingsReceived = peer->pingsReceived();
peerObj["pingsReceived"].set<uint32_t>(pingsReceived);
uint64_t lastPing = peer.lastPing();
uint64_t lastPing = peer->lastPing();
peerObj["lastPing"].set<uint64_t>(lastPing);
json::object peerConfig = peer.config();
json::object peerConfig = peer->config();
if (peerConfig["rcon"].is<json::object>())
peerConfig.erase("rcon");
peerObj["config"].set<json::object>(peerConfig);
@ -488,6 +488,7 @@ void RESTAPI::restAPI_GetPeerList(const HTTPPayload& request, HTTPPayload& reply
}
}
}
}
response["peers"].set<json::array>(peers);
reply.payload(response);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.