- leaving new features in public trunk but backing P3.1 branch back to C3.1 for stability

git-svn-id: http://wush.net/svn/range/software/public/openbts/branches/P3.1@6518 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Michael Iedema
2013-09-19 09:46:21 +00:00
parent 2f1394a646
commit aab8237962
50 changed files with 3020 additions and 3737 deletions

View File

@@ -1068,9 +1068,9 @@ string TransactionEntry::handoverString() const
mSIP.RTPSession()->rtp.last_rcv_SR_ts << "," <<
mSIP.RTPSession()->rtp.last_rcv_SR_time.tv_sec << "," << mSIP.RTPSession()->rtp.last_rcv_SR_time.tv_usec << "," <<
mSIP.RTPSession()->rtp.snd_seq << "," <<
//mSIP.RTPSession()->rtp.last_rtcp_report_snt_r << "," <<
//mSIP.RTPSession()->rtp.last_rtcp_report_snt_s << "," <<
//mSIP.RTPSession()->rtp.rtcp_report_snt_interval << "," <<
mSIP.RTPSession()->rtp.last_rtcp_report_snt_r << "," <<
mSIP.RTPSession()->rtp.last_rtcp_report_snt_s << "," <<
mSIP.RTPSession()->rtp.rtcp_report_snt_interval << "," <<
mSIP.RTPSession()->rtp.last_rtcp_packet_count << "," <<
mSIP.RTPSession()->rtp.sent_payload_bytes;
@@ -1124,11 +1124,11 @@ void TransactionEntry::setOutboundHandover(
}
void TransactionEntry::setInboundHandover(float RSSI, float timingError, double timestamp)
void TransactionEntry::setInboundHandover(float RSSI, float timingError)
{
if (mRemoved) throw RemovedTransaction(mID);
ScopedLock lock(mLock);
mChannel->setPhy(RSSI,timingError,timestamp);
mChannel->setPhy(RSSI,timingError);
mInboundRSSI = RSSI;
mInboundTimingError = timingError;
}