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

remove stream ID handling from DiagNetwork (these are always sent with a stream ID of 0 anyway...); revert Rx stream ID to stream ID validation check in Network;

Browse Source
pull/86/head
Bryan Biedenkapp 11 months ago
parent ef1a0df496
commit 20a096ab49
3 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File

43
src/fne/network/DiagNetwork.cpp
Unescape View File

@ -162,7 +162,6 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
if (req->length > 0) { if (req->length > 0) {
uint32_t peerId = req->fneHeader.getPeerId(); uint32_t peerId = req->fneHeader.getPeerId();
uint32_t streamId = req->fneHeader.getStreamId();
std::stringstream peerName; std::stringstream peerName;
peerName << peerId << ":diag-rx-pckt"; peerName << peerId << ":diag-rx-pckt";
@ -170,30 +169,6 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
::pthread_setname_np(req->thread, peerName.str().c_str()); ::pthread_setname_np(req->thread, peerName.str().c_str());
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
// update current peer packet sequence and stream ID
if (peerId > 0 && (network->m_peers.find(peerId) != network->m_peers.end()) && streamId != 0U) {
FNEPeerConnection* connection = network->m_peers[peerId];
uint16_t pktSeq = req->rtpHeader.getSequence();
if (connection != nullptr) {
if (pktSeq == RTP_END_OF_CALL_SEQ) {
connection->eraseStreamPktSeq(streamId); // attempt to erase packet sequence for the stream
} else {
if (connection->hasStreamPktSeq(streamId)) {
uint16_t currPkt = connection->getStreamPktSeq(streamId);
if ((pktSeq != currPkt) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U)) && pktSeq != 0U) {
LogWarning(LOG_NET, "PEER %u (%s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(),
streamId, pktSeq, currPkt);
}
}
connection->incStreamPktSeq(streamId, pktSeq + 1U);
}
}
network->m_peers[peerId] = connection;
}
// process incoming message frame opcodes // process incoming message frame opcodes
switch (req->fneHeader.getFunction()) { switch (req->fneHeader.getFunction()) {
case NET_FUNC::TRANSFER: case NET_FUNC::TRANSFER:
@ -255,7 +230,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
sockaddr_storage addr = peer.second->socketStorage(); sockaddr_storage addr = peer.second->socketStorage();
uint32_t addrLen = peer.second->sockStorageLen(); uint32_t addrLen = peer.second->sockStorageLen();
network->m_frameQueue->write(req->buffer, req->length, streamId, pktPeerId, network->m_peerId, network->m_frameQueue->write(req->buffer, req->length, network->createStreamId(), pktPeerId, network->m_peerId,
{ NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_ACTIVITY }, RTP_END_OF_CALL_SEQ, addr, addrLen); { NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_ACTIVITY }, RTP_END_OF_CALL_SEQ, addr, addrLen);
} }
} else { } else {
@ -270,14 +245,14 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
if (peer.second != nullptr) { if (peer.second != nullptr) {
if (peer.second->isEnabled() && peer.second->isPeerLink()) { if (peer.second->isEnabled() && peer.second->isPeerLink()) {
peer.second->writeMaster({ NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_ACTIVITY }, peer.second->writeMaster({ NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_ACTIVITY },
req->buffer, req->length, RTP_END_OF_CALL_SEQ, streamId, false, true, pktPeerId); req->buffer, req->length, RTP_END_OF_CALL_SEQ, 0U, false, true, pktPeerId);
} }
} }
} }
} }
} }
else { else {
network->writePeerNAK(pktPeerId, streamId, TAG_TRANSFER_ACT_LOG, NET_CONN_NAK_FNE_UNAUTHORIZED); network->writePeerNAK(pktPeerId, network->createStreamId(), TAG_TRANSFER_ACT_LOG, NET_CONN_NAK_FNE_UNAUTHORIZED);
} }
} }
} }
@ -315,7 +290,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
} }
} }
else { else {
network->writePeerNAK(peerId, streamId, TAG_TRANSFER_DIAG_LOG, NET_CONN_NAK_FNE_UNAUTHORIZED); network->writePeerNAK(peerId, network->createStreamId(), TAG_TRANSFER_DIAG_LOG, NET_CONN_NAK_FNE_UNAUTHORIZED);
} }
} }
} }
@ -341,7 +316,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
LogDebug(LOG_NET, "SysView, srcPeer = %u, dstPeer = %u, peer status message, len = %u", LogDebug(LOG_NET, "SysView, srcPeer = %u, dstPeer = %u, peer status message, len = %u",
pktPeerId, peer.first, req->length); pktPeerId, peer.first, req->length);
} }
network->m_frameQueue->write(req->buffer, req->length, streamId, pktPeerId, network->m_peerId, network->m_frameQueue->write(req->buffer, req->length, network->createStreamId(), pktPeerId, network->m_peerId,
{ NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_STATUS }, RTP_END_OF_CALL_SEQ, addr, addrLen); { NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_STATUS }, RTP_END_OF_CALL_SEQ, addr, addrLen);
} }
} else { } else {
@ -355,7 +330,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
if (peer.second != nullptr) { if (peer.second != nullptr) {
if (peer.second->isEnabled() && peer.second->isPeerLink()) { if (peer.second->isEnabled() && peer.second->isPeerLink()) {
peer.second->writeMaster({ NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_STATUS }, peer.second->writeMaster({ NET_FUNC::TRANSFER, NET_SUBFUNC::TRANSFER_SUBFUNC_STATUS },
req->buffer, req->length, RTP_END_OF_CALL_SEQ, streamId, false, true, pktPeerId); req->buffer, req->length, RTP_END_OF_CALL_SEQ, 0U, false, true, pktPeerId);
} }
} }
} }
@ -363,13 +338,13 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
} }
} }
else { else {
network->writePeerNAK(pktPeerId, streamId, TAG_TRANSFER_STATUS, NET_CONN_NAK_FNE_UNAUTHORIZED); network->writePeerNAK(pktPeerId, network->createStreamId(), TAG_TRANSFER_STATUS, NET_CONN_NAK_FNE_UNAUTHORIZED);
} }
} }
} }
} }
else { else {
network->writePeerNAK(peerId, streamId, TAG_TRANSFER, NET_CONN_NAK_ILLEGAL_PACKET); network->writePeerNAK(peerId, network->createStreamId(), TAG_TRANSFER, NET_CONN_NAK_ILLEGAL_PACKET);
Utils::dump("unknown transfer opcode from the peer", req->buffer, req->length); Utils::dump("unknown transfer opcode from the peer", req->buffer, req->length);
} }
} }
@ -409,7 +384,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
} }
} }
else { else {
network->writePeerNAK(peerId, streamId, TAG_PEER_LINK, NET_CONN_NAK_FNE_UNAUTHORIZED); network->writePeerNAK(peerId, 0U, TAG_PEER_LINK, NET_CONN_NAK_FNE_UNAUTHORIZED);
} }
} }
} }

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

@ -2269,7 +2269,7 @@ bool FNENetwork::writePeer(uint32_t peerId, FrameQueue::OpcodePair opcode, const
uint32_t length, uint16_t pktSeq, uint32_t streamId, bool queueOnly, bool incPktSeq, bool directWrite) const uint32_t length, uint16_t pktSeq, uint32_t streamId, bool queueOnly, bool incPktSeq, bool directWrite) const
{ {
if (streamId == 0U) { if (streamId == 0U) {
LogError(LOG_NET, "PEER %u, trying to send data with a streamId of 0? BUGBUG", peerId); LogError(LOG_NET, "BUGBUG: PEER %u, trying to send data with a streamId of 0?", peerId);
} }
auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; }); auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; });

15
src/host/network/Network.cpp
Unescape View File

@ -295,11 +295,6 @@ void Network::clock(uint32_t ms)
m_pktLastSeq = m_pktSeq; m_pktLastSeq = m_pktSeq;
} }
if (m_rxDMRStreamId[slotNo] != streamId && (rtpHeader.getSequence() != RTP_END_OF_CALL_SEQ)) {
//LogDebug(LOG_NET, "DMR Incorrect Stream; %u != %u", streamId, m_rxDMRStreamId[slotNo]);
break;
}
if (rtpHeader.getSequence() == RTP_END_OF_CALL_SEQ) { if (rtpHeader.getSequence() == RTP_END_OF_CALL_SEQ) {
m_rxDMRStreamId[slotNo] = 0U; m_rxDMRStreamId[slotNo] = 0U;
} }
@ -349,11 +344,6 @@ void Network::clock(uint32_t ms)
m_pktLastSeq = m_pktSeq; m_pktLastSeq = m_pktSeq;
} }
if (m_rxP25StreamId != streamId && (rtpHeader.getSequence() != RTP_END_OF_CALL_SEQ)) {
//LogDebug(LOG_NET, "P25 Incorrect Stream; %u != %u", streamId, m_rxP25StreamId);
break;
}
if (rtpHeader.getSequence() == RTP_END_OF_CALL_SEQ) { if (rtpHeader.getSequence() == RTP_END_OF_CALL_SEQ) {
m_rxP25StreamId = 0U; m_rxP25StreamId = 0U;
} }
@ -403,11 +393,6 @@ void Network::clock(uint32_t ms)
m_pktLastSeq = m_pktSeq; m_pktLastSeq = m_pktSeq;
} }
if (m_rxNXDNStreamId != streamId && (rtpHeader.getSequence() != RTP_END_OF_CALL_SEQ)) {
//LogDebug(LOG_NET, "NXDN Incorrect Stream; %u != %u", streamId, m_rxNXDNStreamId);
break;
}
if (rtpHeader.getSequence() == RTP_END_OF_CALL_SEQ) { if (rtpHeader.getSequence() == RTP_END_OF_CALL_SEQ) {
m_rxNXDNStreamId = 0U; m_rxNXDNStreamId = 0U;
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.