Skip to content

Commit e9abdf6

Browse files
committed
BUGFIX: correct scenario where traffic from an upstream master to a downstream peer FNE would lose the RTP sequence numbering;
1 parent 236073a commit e9abdf6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/fne/HostFNE.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ void HostFNE::processPeerDMR(network::PeerNetwork* peerNetwork, const uint8_t* d
10211021
// process DMR data
10221022
if (length > 0U) {
10231023
uint32_t peerId = peerNetwork->getPeerId();
1024-
m_network->dmrTrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), peerNetwork->pktLastSeq(), streamId, true);
1024+
m_network->dmrTrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), rtpHeader.getSequence(), streamId, true);
10251025
}
10261026
}
10271027

@@ -1043,7 +1043,7 @@ void HostFNE::processPeerP25(network::PeerNetwork* peerNetwork, const uint8_t* d
10431043
// process P25 data
10441044
if (length > 0U) {
10451045
uint32_t peerId = peerNetwork->getPeerId();
1046-
m_network->p25TrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), peerNetwork->pktLastSeq(), streamId, true);
1046+
m_network->p25TrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), rtpHeader.getSequence(), streamId, true);
10471047
}
10481048
}
10491049

@@ -1065,7 +1065,7 @@ void HostFNE::processPeerNXDN(network::PeerNetwork* peerNetwork, const uint8_t*
10651065
// process NXDN data
10661066
if (length > 0U) {
10671067
uint32_t peerId = peerNetwork->getPeerId();
1068-
m_network->nxdnTrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), peerNetwork->pktLastSeq(), streamId, true);
1068+
m_network->nxdnTrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), rtpHeader.getSequence(), streamId, true);
10691069
}
10701070
}
10711071

@@ -1087,6 +1087,6 @@ void HostFNE::processPeerAnalog(network::PeerNetwork* peerNetwork, const uint8_t
10871087
// process analog data
10881088
if (length > 0U) {
10891089
uint32_t peerId = peerNetwork->getPeerId();
1090-
m_network->analogTrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), peerNetwork->pktLastSeq(), streamId, true);
1090+
m_network->analogTrafficHandler()->processFrame(data, length, peerId, rtpHeader.getSSRC(), rtpHeader.getSequence(), streamId, true);
10911091
}
10921092
}

0 commit comments

Comments
 (0)