diff --git a/src/common/p25/dfsi/frames/MotTSBKFrame.cpp b/src/common/p25/dfsi/frames/MotTSBKFrame.cpp index 03b91e60..f302d30e 100644 --- a/src/common/p25/dfsi/frames/MotTSBKFrame.cpp +++ b/src/common/p25/dfsi/frames/MotTSBKFrame.cpp @@ -79,7 +79,7 @@ bool MotTSBKFrame::decode(const uint8_t* data) // decode start of stream startOfStream->decode(startBuffer); - ::memcpy(tsbkData, data + 8U, P25_TSBK_LENGTH_BYTES); + ::memcpy(tsbkData, data + 7U, P25_TSBK_LENGTH_BYTES); return true; } @@ -103,6 +103,6 @@ void MotTSBKFrame::encode(uint8_t* data) // encode TSBK - scope is intentional { data[0U] = DFSIFrameType::TSBK; - ::memcpy(data + 8U, tsbkData, P25_TSBK_LENGTH_BYTES); + ::memcpy(data + 7U, tsbkData, P25_TSBK_LENGTH_BYTES); } } diff --git a/src/fne/network/FNENetwork.cpp b/src/fne/network/FNENetwork.cpp index d377e606..41f71cc6 100644 --- a/src/fne/network/FNENetwork.cpp +++ b/src/fne/network/FNENetwork.cpp @@ -859,8 +859,8 @@ void* FNENetwork::threadedNetworkRx(void* arg) dt, now); if (connection->pktLastSeq() == RTP_END_OF_CALL_SEQ) { network->peerACLUpdate(peerId); - connection->lastACLUpdate(now); } + connection->lastACLUpdate(now); } uint8_t payload[8U];