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 the FNE not properly rewriting TGIDs for configured peers (the original implementation was slighly naive in assumptions, the new implementation techincally allows rewrites to *any* peer *from* any peer not just ISSI peers); perform some minor cleanup of the REST classes; revert change in ClientConnection and ServerConnection initializing the m_buffer class variable (hopefully this may fix some strange issues being seen);

Browse Source
pull/48/head
Bryan Biedenkapp 2 years ago
parent af27a13c8c
commit 345495076b
15 changed files with 95 additions and 89 deletions
Show Stats Download Patch File Download Diff File

5
src/common/lookups/TalkgroupRulesLookup.cpp
Unescape View File

@ -262,7 +262,8 @@ TalkgroupRuleGroupVoice TalkgroupRulesLookup::findByRewrite(uint32_t peerId, uin
if (x.config().rewrite().size() == 0)
return false;
auto innerIt = std::find_if(x.config().rewrite().begin(), x.config().rewrite().end(),
std::vector<TalkgroupRuleRewrite> rewrite = x.config().rewrite();
auto innerIt = std::find_if(rewrite.begin(), rewrite.end(),
[&](TalkgroupRuleRewrite y)
{
if (slot != 0U) {
@ -272,7 +273,7 @@ TalkgroupRuleGroupVoice TalkgroupRulesLookup::findByRewrite(uint32_t peerId, uin
return y.peerId() == peerId && y.tgId() == id;
});
if (innerIt != x.config().rewrite().end())
if (innerIt != rewrite.end())
return true;
return false;
});

3
src/common/lookups/TalkgroupRulesLookup.h
Unescape View File

@ -85,7 +85,7 @@ namespace lookups
TalkgroupRuleRewrite(yaml::Node& node) :
TalkgroupRuleRewrite()
{
m_peerId = node["peerId"].as<uint32_t>(0U);
m_peerId = node["peerid"].as<uint32_t>(0U);
m_tgId = node["tgid"].as<uint32_t>(0U);
m_tgSlot = (uint8_t)node["slot"].as<uint32_t>(0U);
}
@ -169,6 +169,7 @@ namespace lookups
m_parrot = data.m_parrot;
m_inclusion = data.m_inclusion;
m_exclusion = data.m_exclusion;
m_rewrite = data.m_rewrite;
}
return *this;

18
src/common/network/rest/http/ClientConnection.h
Unescape View File

@ -38,20 +38,18 @@ namespace network
template <typename RequestHandlerType>
class ClientConnection {
public:
auto operator=(ClientConnection&) -> ClientConnection& = delete;
auto operator=(ClientConnection&&) -> ClientConnection& = delete;
ClientConnection(ClientConnection&) = delete;
/// <summary>Initializes a new instance of the ClientConnection class.</summary>
explicit ClientConnection(asio::ip::tcp::socket socket, RequestHandlerType& handler) :
m_socket(std::move(socket)),
m_requestHandler(handler),
m_buffer(),
m_lexer(HTTPLexer(true))
{
/* stub */
}
/// <summary>Initializes a copy instance of the ClientConnection class.</summary>
ClientConnection(const ClientConnection&) = delete;
/// <summary></summary>
ClientConnection& operator=(const ClientConnection&) = delete;
/// <summary>Start the first asynchronous operation for the connection.</summary>
void start() { read(); }
@ -81,7 +79,7 @@ namespace network
{
asio::error_code ec = e.code();
if (ec) {
::LogError(LOG_REST, "%s, code = %u", ec.message().c_str(), ec.value());
::LogError(LOG_REST, "ClientConnection::ensureNoLinger(), %s, code = %u", ec.message().c_str(), ec.value());
}
}
}
@ -123,7 +121,7 @@ namespace network
}
else if (ec != asio::error::operation_aborted) {
if (ec) {
::LogError(LOG_REST, "%s, code = %u", ec.message().c_str(), ec.value());
::LogError(LOG_REST, "ClientConnection::read(), %s, code = %u", ec.message().c_str(), ec.value());
}
stop();
}
@ -150,7 +148,9 @@ namespace network
asio::error_code ignored_ec;
m_socket.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
}
catch(const std::exception& e) { ::LogError(LOG_REST, "%s", ec.message().c_str()); }
catch(const std::exception& e) {
::LogError(LOG_REST, "ClientConnection::write(), %s, code = %u", ec.message().c_str(), ec.value());
}
}
}
}

9
src/common/network/rest/http/HTTPClient.h
Unescape View File

@ -42,6 +42,10 @@ namespace network
template<typename RequestHandlerType, template<class> class ConnectionImpl = ClientConnection>
class HTTPClient : private Thread {
public:
auto operator=(HTTPClient&) -> HTTPClient& = delete;
auto operator=(HTTPClient&&) -> HTTPClient& = delete;
HTTPClient(HTTPClient&) = delete;
/// <summary>Initializes a new instance of the HTTPClient class.</summary>
HTTPClient(const std::string& address, uint16_t port) :
m_address(address),
@ -53,8 +57,6 @@ namespace network
{
/* stub */
}
/// <summary>Initializes a copy instance of the HTTPClient class.</summary>
HTTPClient(const HTTPClient&) = delete;
/// <summary>Finalizes a instance of the HTTPClient class.</summary>
~HTTPClient() override
{
@ -63,9 +65,6 @@ namespace network
}
}
/// <summary></summary>
HTTPClient& operator=(const HTTPClient&) = delete;
/// <summary>Helper to set the HTTP request handlers.</summary>
template<typename Handler>
void setHandler(Handler&& handler)

7
src/common/network/rest/http/HTTPRequestHandler.h
Unescape View File

@ -39,15 +39,14 @@ namespace network
class HTTPRequestHandler {
public:
auto operator=(HTTPRequestHandler&) -> HTTPRequestHandler& = delete;
HTTPRequestHandler(HTTPRequestHandler&) = delete;
/// <summary>Initializes a new instance of the HTTPRequestHandler class.</summary>
explicit HTTPRequestHandler(const std::string& docRoot);
/// <summary>Initializes a copy instance of the HTTPRequestHandler class.</summary>
HTTPRequestHandler(const HTTPRequestHandler&) = delete;
/// <summary></summary>
HTTPRequestHandler(HTTPRequestHandler&&) = default;
/// <summary></summary>
HTTPRequestHandler& operator=(const HTTPRequestHandler&) = delete;
/// <summary></summary>
HTTPRequestHandler& operator=(HTTPRequestHandler&&) = default;

9
src/common/network/rest/http/HTTPServer.h
Unescape View File

@ -43,6 +43,10 @@ namespace network
template<typename RequestHandlerType, template<class> class ConnectionImpl = ServerConnection>
class HTTPServer {
public:
auto operator=(HTTPServer&) -> HTTPServer& = delete;
auto operator=(HTTPServer&&) -> HTTPServer& = delete;
HTTPServer(HTTPServer&) = delete;
/// <summary>Initializes a new instance of the HTTPServer class.</summary>
explicit HTTPServer(const std::string& address, uint16_t port) :
m_ioService(),
@ -63,11 +67,6 @@ namespace network
accept();
}
/// <summary>Initializes a copy instance of the HTTPServer class.</summary>
HTTPServer(const HTTPServer&) = delete;
/// <summary></summary>
HTTPServer& operator=(const HTTPServer&) = delete;
/// <summary>Helper to set the HTTP request handlers.</summary>
template<typename Handler>

14
src/common/network/rest/http/ServerConnection.h
Unescape View File

@ -49,23 +49,21 @@ namespace network
typedef std::shared_ptr<selfType> selfTypePtr;
typedef ServerConnectionManager<selfTypePtr> ConnectionManagerType;
public:
auto operator=(ServerConnection&) -> ServerConnection& = delete;
auto operator=(ServerConnection&&) -> ServerConnection& = delete;
ServerConnection(ServerConnection&) = delete;
/// <summary>Initializes a new instance of the ServerConnection class.</summary>
explicit ServerConnection(asio::ip::tcp::socket socket, ConnectionManagerType& manager, RequestHandlerType& handler,
bool persistent = false) :
m_socket(std::move(socket)),
m_connectionManager(manager),
m_requestHandler(handler),
m_buffer(),
m_lexer(HTTPLexer(false)),
m_persistent(persistent)
{
/* stub */
}
/// <summary>Initializes a copy instance of the ServerConnection class.</summary>
ServerConnection(const ServerConnection&) = delete;
/// <summary></summary>
ServerConnection& operator=(const ServerConnection&) = delete;
/// <summary>Start the first asynchronous operation for the connection.</summary>
void start() { read(); }
@ -118,7 +116,7 @@ namespace network
}
else if (ec != asio::error::operation_aborted) {
if (ec) {
::LogError(LOG_REST, "%s, code = %u", ec.message().c_str(), ec.value());
::LogError(LOG_REST, "ServerConnection::read(), %s, code = %u", ec.message().c_str(), ec.value());
}
m_connectionManager.stop(this->shared_from_this());
}
@ -157,7 +155,7 @@ namespace network
if (ec != asio::error::operation_aborted) {
if (ec) {
::LogError(LOG_REST, "%s, code = %u", ec.message().c_str(), ec.value());
::LogError(LOG_REST, "ServerConnection::write(), %s, code = %u", ec.message().c_str(), ec.value());
}
m_connectionManager.stop(this->shared_from_this());
}

9
src/common/network/rest/http/ServerConnectionManager.h
Unescape View File

@ -36,13 +36,12 @@ namespace network
template<typename ConnectionPtr>
class ServerConnectionManager {
public:
auto operator=(ServerConnectionManager&) -> ServerConnectionManager& = delete;
auto operator=(ServerConnectionManager&&) -> ServerConnectionManager& = delete;
ServerConnectionManager(ServerConnectionManager&) = delete;
/// <summary>Initializes a new instance of the ServerConnectionManager class.</summary>
ServerConnectionManager() = default;
/// <summary>Initializes a copy instance of the ServerConnectionManager class.</summary>
ServerConnectionManager(const ServerConnectionManager&) = delete;
/// <summary></summary>
ServerConnectionManager& operator=(const ServerConnectionManager&) = delete;
/// <summary>Add the specified connection to the manager and start it.</summary>
void start(ConnectionPtr c)

10
src/fne/HostFNE.cpp
Unescape View File

@ -491,7 +491,7 @@ bool HostFNE::createPeerNetworks()
if (key.size() == 32) {
// bryanb: shhhhhhh....dirty nasty hacks
key = key.append(key); // since the key is 32 characters (16 hex pairs), double it on itself for 64 characters (32 hex pairs)
LogWarning(LOG_HOST, "Half-length peer network preshared encryption key detected, doubling key on itself.");
LogWarning(LOG_HOST, "Half-length peer %u network preshared encryption key detected, doubling key on itself.", id);
}
if (key.size() == 64) {
@ -534,7 +534,7 @@ bool HostFNE::createPeerNetworks()
network::PeerNetwork* network = new PeerNetwork(masterAddress, masterPort, 0U, id, password, true, debug, m_dmrEnabled, m_p25Enabled, m_nxdnEnabled, true, true, m_allowActivityTransfer, m_allowDiagnosticTransfer, false);
network->setMetadata(identity, rxFrequency, txFrequency, 0.0F, 0.0F, 0, 0, 0, latitude, longitude, 0, location);
if (encrypted) {
m_network->setPresharedKey(presharedKey);
network->setPresharedKey(presharedKey);
}
network->enable(enabled);
@ -576,7 +576,7 @@ void HostFNE::processPeer(network::PeerNetwork* peerNetwork)
uint32_t slotNo = (data[15U] & 0x80U) == 0x80U ? 2U : 1U;
uint32_t streamId = peerNetwork->getDMRStreamId(slotNo);
m_network->dmrTrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId, true);
m_network->dmrTrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId);
}
}
@ -589,7 +589,7 @@ void HostFNE::processPeer(network::PeerNetwork* peerNetwork)
uint32_t peerId = peerNetwork->getPeerId();
uint32_t streamId = peerNetwork->getP25StreamId();
m_network->p25TrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId, true);
m_network->p25TrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId);
}
}
@ -602,7 +602,7 @@ void HostFNE::processPeer(network::PeerNetwork* peerNetwork)
uint32_t peerId = peerNetwork->getPeerId();
uint32_t streamId = peerNetwork->getNXDNStreamId();
m_network->nxdnTrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId, true);
m_network->nxdnTrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId);
}
}
}

34
src/fne/network/fne/TagDMRData.cpp
Unescape View File

@ -60,9 +60,8 @@ TagDMRData::~TagDMRData() = default;
/// <param name="peerId">Peer ID</param>
/// <param name="pktSeq"></param>
/// <param name="streamId">Stream ID</param>
/// <param name="fromPeer">Flag indicating whether this traffic is from a peer connection or not.</param>
/// <returns></returns>
bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId, bool fromPeer)
bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId)
{
hrc::hrc_t pktTime = hrc::now();
@ -108,11 +107,9 @@ bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
dmrData.setN(n);
}
// is this data from a peer connection?
if (fromPeer) {
// perform TGID route rewrites if configured
routeRewrite(buffer, peerId, dmrData, dataType, dstId, slotNo, false);
}
// perform TGID route rewrites if configured
routeRewrite(buffer, peerId, dmrData, dataType, dstId, slotNo, false);
dstId = __GET_UINT16(buffer, 8U);
// is the stream valid?
if (validate(peerId, dmrData, streamId)) {
@ -211,7 +208,14 @@ bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
continue;
}
m_network->writePeer(peer.first, { NET_FUNC_PROTOCOL, NET_PROTOCOL_SUBFUNC_DMR }, buffer, len, pktSeq, streamId, true);
uint8_t outboundPeerBuffer[len];
::memset(outboundPeerBuffer, 0x00U, len);
::memcpy(outboundPeerBuffer, buffer, len);
// perform TGID route rewrites if configured
routeRewrite(outboundPeerBuffer, peer.first, dmrData, dataType, dstId, slotNo);
m_network->writePeer(peer.first, { NET_FUNC_PROTOCOL, NET_PROTOCOL_SUBFUNC_DMR }, outboundPeerBuffer, len, pktSeq, streamId, true);
if (m_network->m_debug) {
LogDebug(LOG_NET, "DMR, srcPeer = %u, dstPeer = %u, seqNo = %u, srcId = %u, dstId = %u, flco = $%02X, slotNo = %u, len = %u, pktSeq = %u, stream = %u",
peerId, peer.first, seqNo, srcId, dstId, flco, slotNo, len, pktSeq, streamId);
@ -303,7 +307,7 @@ void TagDMRData::playbackParrot()
/// <param name="dstId"></param>
/// <param name="slotNo"></param>
/// <param name="outbound"></param>
void TagDMRData::routeRewrite(uint8_t* buffer, uint32_t peerId, dmr::data::Data dmrData, uint8_t dataType, uint32_t dstId, uint32_t slotNo, bool outbound)
void TagDMRData::routeRewrite(uint8_t* buffer, uint32_t peerId, dmr::data::Data& dmrData, uint8_t dataType, uint32_t dstId, uint32_t slotNo, bool outbound)
{
uint32_t rewriteDstId = dstId;
uint32_t rewriteSlotNo = slotNo;
@ -369,10 +373,10 @@ bool TagDMRData::peerRewrite(uint32_t peerId, uint32_t& dstId, uint32_t& slotNo,
{
lookups::TalkgroupRuleGroupVoice tg;
if (outbound) {
tg = m_network->m_tidLookup->find(dstId, slotNo);
tg = m_network->m_tidLookup->find(dstId);
}
else {
tg = m_network->m_tidLookup->findByRewrite(peerId, dstId, slotNo);
tg = m_network->m_tidLookup->findByRewrite(peerId, dstId);
}
std::vector<lookups::TalkgroupRuleRewrite> rewrites = tg.config().rewrite();
@ -382,13 +386,13 @@ bool TagDMRData::peerRewrite(uint32_t peerId, uint32_t& dstId, uint32_t& slotNo,
for (auto entry : rewrites) {
if (entry.peerId() == peerId) {
if (outbound) {
dstId = tg.source().tgId();
slotNo = tg.source().tgSlot();
}
else {
dstId = entry.tgId();
slotNo = entry.tgSlot();
}
else {
dstId = tg.source().tgId();
slotNo = tg.source().tgSlot();
}
rewrote = true;
break;
}

4
src/fne/network/fne/TagDMRData.h
Unescape View File

@ -38,7 +38,7 @@ namespace network
~TagDMRData();
/// <summary>Process a data frame from the network.</summary>
bool processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId, bool fromPeer = false);
bool processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId);
/// <summary>Helper to playback a parrot frame to the network.</summary>
void playbackParrot();
@ -65,7 +65,7 @@ namespace network
bool m_debug;
/// <summary>Helper to route rewrite the network data buffer.</summary>
void routeRewrite(uint8_t* buffer, uint32_t peerId, dmr::data::Data dmrData, uint8_t dataType, uint32_t dstId, uint32_t slotNo, bool outbound = true);
void routeRewrite(uint8_t* buffer, uint32_t peerId, dmr::data::Data& dmrData, uint8_t dataType, uint32_t dstId, uint32_t slotNo, bool outbound = true);
/// <summary>Helper to route rewrite destination ID and slot.</summary>
bool peerRewrite(uint32_t peerId, uint32_t& dstId, uint32_t& slotNo, bool outbound = true);

26
src/fne/network/fne/TagNXDNData.cpp
Unescape View File

@ -59,9 +59,8 @@ TagNXDNData::~TagNXDNData() = default;
/// <param name="peerId">Peer ID</param>
/// <param name="pktSeq"></param>
/// <param name="streamId">Stream ID</param>
/// <param name="fromPeer">Flag indicating whether this traffic is from a peer connection or not.</param>
/// <returns></returns>
bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId, bool fromPeer)
bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId)
{
hrc::hrc_t pktTime = hrc::now();
@ -74,6 +73,10 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI
uint32_t srcId = __GET_UINT16(data, 5U);
uint32_t dstId = __GET_UINT16(data, 8U);
// perform TGID route rewrites if configured
routeRewrite(buffer, peerId, messageType, dstId, false);
dstId = __GET_UINT16(buffer, 8U);
lc::RTCH lc;
lc.setMessageType(messageType);
@ -83,12 +86,6 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI
bool group = (data[15U] & 0x40U) == 0x40U ? false : true;
lc.setGroup(group);
// is this data from a peer connection?
if (fromPeer) {
// perform TGID route rewrites if configured
routeRewrite(buffer, peerId, messageType, dstId, false);
}
// is the stream valid?
if (validate(peerId, lc, messageType, streamId)) {
// is this peer ignored?
@ -181,7 +178,14 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI
continue;
}
m_network->writePeer(peer.first, { NET_FUNC_PROTOCOL, NET_PROTOCOL_SUBFUNC_NXDN }, buffer, len, pktSeq, streamId, true);
uint8_t outboundPeerBuffer[len];
::memset(outboundPeerBuffer, 0x00U, len);
::memcpy(outboundPeerBuffer, buffer, len);
// perform TGID route rewrites if configured
routeRewrite(outboundPeerBuffer, peer.first, messageType, dstId);
m_network->writePeer(peer.first, { NET_FUNC_PROTOCOL, NET_PROTOCOL_SUBFUNC_NXDN }, outboundPeerBuffer, len, pktSeq, streamId, true);
if (m_network->m_debug) {
LogDebug(LOG_NET, "NXDN, srcPeer = %u, dstPeer = %u, messageType = $%02X, srcId = %u, dstId = %u, len = %u, pktSeq = %u, streamId = %u",
peerId, peer.first, messageType, srcId, dstId, len, pktSeq, streamId);
@ -305,10 +309,10 @@ bool TagNXDNData::peerRewrite(uint32_t peerId, uint32_t& dstId, bool outbound)
for (auto entry : rewrites) {
if (entry.peerId() == peerId) {
if (outbound) {
dstId = tg.source().tgId();
dstId = entry.tgId();
}
else {
dstId = entry.tgId();
dstId = tg.source().tgId();
}
rewrote = true;
break;

2
src/fne/network/fne/TagNXDNData.h
Unescape View File

@ -38,7 +38,7 @@ namespace network
~TagNXDNData();
/// <summary>Process a data frame from the network.</summary>
bool processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId, bool fromPeer = false);
bool processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId);
/// <summary>Helper to playback a parrot frame to the network.</summary>
void playbackParrot();

32
src/fne/network/fne/TagP25Data.cpp
Unescape View File

@ -62,9 +62,8 @@ TagP25Data::~TagP25Data() = default;
/// <param name="peerId">Peer ID</param>
/// <param name="pktSeq"></param>
/// <param name="streamId">Stream ID</param>
/// <param name="fromPeer">Flag indicating whether this traffic is from a peer connection or not.</param>
/// <returns></returns>
bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId, bool fromPeer)
bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId)
{
hrc::hrc_t pktTime = hrc::now();
@ -85,6 +84,10 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
uint8_t duid = data[22U];
uint8_t frameType = P25_FT_DATA_UNIT;
// perform TGID route rewrites if configured
routeRewrite(buffer, peerId, duid, dstId, false);
dstId = __GET_UINT16(buffer, 8U);
lc::LC control;
data::LowSpeedData lsd;
@ -127,12 +130,6 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
lsd.setLSD1(lsd1);
lsd.setLSD2(lsd2);
// is this data from a peer connection?
if (fromPeer) {
// perform TGID route rewrites if configured
routeRewrite(buffer, peerId, duid, dstId, false);
}
// is the stream valid?
if (validate(peerId, control, duid, streamId)) {
// is this peer ignored?
@ -233,7 +230,14 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId
continue;
}
m_network->writePeer(peer.first, { NET_FUNC_PROTOCOL, NET_PROTOCOL_SUBFUNC_P25 }, buffer, len, pktSeq, streamId, true);
uint8_t outboundPeerBuffer[len];
::memset(outboundPeerBuffer, 0x00U, len);
::memcpy(outboundPeerBuffer, buffer, len);
// perform TGID route rewrites if configured
routeRewrite(outboundPeerBuffer, peer.first, duid, dstId);
m_network->writePeer(peer.first, { NET_FUNC_PROTOCOL, NET_PROTOCOL_SUBFUNC_P25 }, outboundPeerBuffer, len, pktSeq, streamId, true);
if (m_network->m_debug) {
LogDebug(LOG_NET, "P25, srcPeer = %u, dstPeer = %u, duid = $%02X, lco = $%02X, MFId = $%02X, srcId = %u, dstId = %u, len = %u, pktSeq = %u, streamId = %u",
peerId, peer.first, duid, lco, MFId, srcId, dstId, len, pktSeq, streamId);
@ -429,23 +433,21 @@ bool TagP25Data::peerRewrite(uint32_t peerId, uint32_t& dstId, bool outbound)
std::vector<lookups::TalkgroupRuleRewrite> rewrites = tg.config().rewrite();
bool rewrote = false;
if (rewrites.size() > 0) {
for (auto entry : rewrites) {
if (entry.peerId() == peerId) {
if (outbound) {
dstId = tg.source().tgId();
dstId = entry.tgId();
}
else {
dstId = entry.tgId();
dstId = tg.source().tgId();
}
rewrote = true;
break;
return true;
}
}
}
return rewrote;
return false;
}
/// <summary>

2
src/fne/network/fne/TagP25Data.h
Unescape View File

@ -44,7 +44,7 @@ namespace network
~TagP25Data();
/// <summary>Process a data frame from the network.</summary>
bool processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId, bool fromPeer = false);
bool processFrame(const uint8_t* data, uint32_t len, uint32_t peerId, uint16_t pktSeq, uint32_t streamId);
/// <summary>Helper to playback a parrot frame to the network.</summary>
void playbackParrot();

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.