|
From: <rjo...@us...> - 2012-03-31 03:38:09
|
Revision: 27393
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=27393&view=rev
Author: rjongbloed
Date: 2012-03-31 03:38:02 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
Added check for started session read before opening.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-03-31 02:43:11 UTC (rev 27392)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-03-31 03:38:02 UTC (rev 27393)
@@ -1974,6 +1974,9 @@
OpalRTPSession::SendReceiveStatus OpalRTPSession::InternalReadData2(RTP_DataFrame & frame)
{
+ if (PAssertNULL(dataSocket) == NULL || PAssertNULL(controlSocket) == NULL)
+ return e_AbortTransport;
+
int selectStatus = WaitForPDU(*dataSocket, *controlSocket, PMaxTimeInterval);
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-04-12 04:24:04
|
Revision: 27442
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=27442&view=rev
Author: rjongbloed
Date: 2012-04-12 04:23:58 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Fixed issue where some systems send duplicate RTP packets (same sequence number) and when they arrive over the 'net out of order, the re-order algorithm then decides there are 4 billion missing packets, going into a lengthy loop.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-04-12 03:53:36 UTC (rev 27441)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-04-12 04:23:58 UTC (rev 27442)
@@ -931,9 +931,22 @@
// the lowest numbered packet.
SaveOutOfOrderPacket(frame);
- frame = m_outOfOrderPackets.back();
- m_outOfOrderPackets.pop_back();
- sequenceNumber = frame.GetSequenceNumber();
+ for (;;) {
+ if (m_outOfOrderPackets.empty())
+ return e_IgnorePacket;
+
+ frame = m_outOfOrderPackets.back();
+ m_outOfOrderPackets.pop_back();
+
+ sequenceNumber = frame.GetSequenceNumber();
+ if (sequenceNumber >= expectedSequenceNumber)
+ break;
+
+ PTRACE(2, "RTP\tSession " << m_sessionId << ", ssrc=" << syncSourceIn
+ << ", incorrect sequence after re-ordering, got "
+ << sequenceNumber << " expected " << expectedSequenceNumber);
+ }
+
outOfOrderPacketTime = tick;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-05-21 07:20:54
|
Revision: 27674
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=27674&view=rev
Author: rjongbloed
Date: 2012-05-21 07:20:47 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Added trace logs for when sending/receiving TMMBR RTCP command
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-05-21 02:47:47 UTC (rev 27673)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-05-21 07:20:47 UTC (rev 27674)
@@ -1313,6 +1313,7 @@
case RTP_ControlFrame::e_TMMBR :
if (size >= sizeof(RTP_ControlFrame::FbTMMB)) {
const RTP_ControlFrame::FbTMMB * tmmb = (const RTP_ControlFrame::FbTMMB *)payload;
+ PTRACE(4, "RTP\tSession " << m_sessionId << ", received TMMBR " << tmmb->GetBitRate());
m_connection.ExecuteMediaCommand(OpalMediaFlowControl(tmmb->GetBitRate()), m_sessionId);
}
else {
@@ -1495,6 +1496,7 @@
void OpalRTPSession::SendFlowControl(unsigned maxBitRate, unsigned overhead, bool notify)
{
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", SendFlowControl(" << maxBitRate << ") using TMMBR");
// Create packet
RTP_ControlFrame request;
InsertReportPacket(request);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-06-06 01:59:15
|
Revision: 27774
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=27774&view=rev
Author: rjongbloed
Date: 2012-06-06 01:59:09 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Something in the standard "C" headers defined min/max which interferes with standard C++ min/max. Undefined them.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-06-06 01:56:57 UTC (rev 27773)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-06-06 01:59:09 UTC (rev 27774)
@@ -488,7 +488,7 @@
void OpalRTPSession::SetTxStatisticsInterval(unsigned packets)
{
- txStatisticsInterval = PMAX(packets, 2);
+ txStatisticsInterval = std::max(packets, 2U);
txStatisticsCount = 0;
averageSendTimeAccum = 0;
maximumSendTimeAccum = 0;
@@ -498,7 +498,7 @@
void OpalRTPSession::SetRxStatisticsInterval(unsigned packets)
{
- rxStatisticsInterval = PMAX(packets, 2);
+ rxStatisticsInterval = std::max(packets, 2U);
rxStatisticsCount = 0;
averageReceiveTimeAccum = 0;
maximumReceiveTimeAccum = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-07-13 04:11:09
|
Revision: 28017
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28017&view=rev
Author: rjongbloed
Date: 2012-07-13 04:11:03 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Added missing mutex to OpalRTPSession::Close()
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-07-13 04:07:31 UTC (rev 28016)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-07-13 04:11:03 UTC (rev 28017)
@@ -1797,6 +1797,8 @@
// over them and exits the reading thread.
SetJitterBufferSize(0, 0);
+ PWaitAndSignal mutex(m_dataMutex);
+
delete m_dataSocket;
m_dataSocket = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-07-13 04:20:49
|
Revision: 28018
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28018&view=rev
Author: rjongbloed
Date: 2012-07-13 04:20:43 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Added trace log for socket write error to unblock RTP session.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-07-13 04:11:03 UTC (rev 28017)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-07-13 04:20:43 UTC (rev 28018)
@@ -1825,7 +1825,7 @@
return false;
}
- PTRACE(3, "RTP_UDP\tSession " << m_sessionId << ", Shutting down read.");
+ PTRACE(3, "RTP_UDP\tSession " << m_sessionId << ", shutting down read.");
syncSourceIn = 0;
m_shutdownRead = true;
@@ -1835,7 +1835,10 @@
m_controlSocket->PUDPSocket::InternalGetLocalAddress(addrAndPort);
if (!addrAndPort.IsValid())
addrAndPort.SetAddress(PIPSocket::GetHostName());
- m_dataSocket->WriteTo("", 1, addrAndPort);
+ if (!m_dataSocket->WriteTo("", 1, addrAndPort)) {
+ PTRACE(1, "RTP_UDP\tSession " << m_sessionId << ", could not write to unblock read socket: "
+ << m_dataSocket->GetErrorText(PChannel::LastReadError));
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-07-19 23:07:45
|
Revision: 28067
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28067&view=rev
Author: rjongbloed
Date: 2012-07-19 23:07:39 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Fixed endless loop in TMMBR transmit, thanks Dave Corrie
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-07-19 23:06:40 UTC (rev 28066)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-07-19 23:07:39 UTC (rev 28067)
@@ -1422,7 +1422,7 @@
unsigned exponent = 0;
unsigned mantissa = maxBitRate;
- while (maxBitRate >= 0x20000) {
+ while (mantissa >= 0x20000) {
mantissa >>= 1;
++exponent;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-08-10 07:46:58
|
Revision: 28178
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28178&view=rev
Author: rjongbloed
Date: 2012-08-10 07:46:51 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Move RTP data flush to just before jitter buffer creating and not when it already exists and is just being resized. This can cause simultaneous reads of the same socket by two threads causing and assert in Unix.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-08-10 07:39:07 UTC (rev 28177)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-08-10 07:46:51 UTC (rev 28178)
@@ -431,12 +431,12 @@
}
else {
resequenceOutOfOrderPackets = false;
- FlushData();
if (m_jitterBuffer != NULL) {
PTRACE(4, "RTP\tSetting jitter buffer time from " << minJitterDelay << " to " << maxJitterDelay);
m_jitterBuffer->SetDelay(minJitterDelay, maxJitterDelay, packetSize);
}
else {
+ FlushData();
m_jitterBuffer = new RTP_JitterBuffer(*this, minJitterDelay, maxJitterDelay, m_timeUnits, packetSize);
PTRACE(4, "RTP\tCreated RTP jitter buffer " << *m_jitterBuffer);
m_jitterBuffer->Start();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-09-04 08:16:12
|
Revision: 28298
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28298&view=rev
Author: rjongbloed
Date: 2012-09-04 08:16:01 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Cleaned up setting UDP socket buffer sizes for RTP. Allow for several different vagaries of implementation.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-09-04 05:13:19 UTC (rev 28297)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-09-04 08:16:01 UTC (rev 28298)
@@ -1512,37 +1512,43 @@
/////////////////////////////////////////////////////////////////////////////
-static void SetMinBufferSize(PUDPSocket & sock, int buftype, int bufsz)
+static void SetMinBufferSize(PUDPSocket & sock, int bufType, int newSize)
{
- int sz = 0;
- if (!sock.GetOption(buftype, sz)) {
- PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << buftype << ") failed: " << sock.GetErrorText());
+ int originalSize = 0;
+ if (!sock.GetOption(bufType, originalSize)) {
+ PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << bufType << ") failed: " << sock.GetErrorText());
return;
}
// Already big enough
- if (sz >= bufsz)
+ if (originalSize >= newSize)
return;
- for (; bufsz >= 1024; bufsz /= 2) {
+ for (; newSize >= 1024; newSize -= newSize/10) {
// Set to new size
- if (!sock.SetOption(buftype, bufsz)) {
- PTRACE(1, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << buftype << ',' << bufsz << ") failed: " << sock.GetErrorText());
+ if (!sock.SetOption(bufType, newSize)) {
+ PTRACE(1, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") failed: " << sock.GetErrorText());
continue;
}
// As some stacks lie about setting the buffer size, we double check.
- if (!sock.GetOption(buftype, sz)) {
- PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << buftype << ") failed: " << sock.GetErrorText());
+ int adjustedSize;
+ if (!sock.GetOption(bufType, adjustedSize)) {
+ PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << bufType << ") failed: " << sock.GetErrorText());
return;
}
- if (sz >= bufsz) {
- PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << buftype << ',' << bufsz << ") succeeded.");
+ if (adjustedSize >= newSize) {
+ PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") succeeded.");
return;
}
- PTRACE(1, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << buftype << ',' << bufsz << ") failed, even though it said it succeeded!");
+ if (adjustedSize > originalSize) {
+ PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") clamped to maximum " << adjustedSize);
+ return;
+ }
+
+ PTRACE(2, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") failed, even though it said it succeeded!");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-09-06 23:45:18
|
Revision: 28314
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28314&view=rev
Author: rjongbloed
Date: 2012-09-06 23:45:12 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Fixed issue with RTCP jitter calculation on some 64 bit platforms/compilers, thanks Alexander Sbitnev
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-09-06 23:40:51 UTC (rev 28313)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-09-06 23:45:12 UTC (rev 28314)
@@ -790,7 +790,7 @@
// As per RFC3550 Appendix 8
diff *= GetJitterTimeUnits(); // Convert to timestamp units
- long variance = diff - lastTransitTime;
+ long variance = (long)diff - (long)lastTransitTime;
lastTransitTime = diff;
if (variance < 0)
variance = -variance;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-09-06 23:55:18
|
Revision: 28315
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28315&view=rev
Author: rjongbloed
Date: 2012-09-06 23:55:12 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Fixed subtle bug where RCP packets could upset the jitter buffer by causing last received data packet to be re-processed. Thanks Alexander Sbitnev for the hard yards.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-09-06 23:45:12 UTC (rev 28314)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-09-06 23:55:12 UTC (rev 28315)
@@ -1982,8 +1982,10 @@
if (selectStatus == 0)
receiveStatus = OnReadTimeout(frame);
- if ((-selectStatus & 2) != 0)
- receiveStatus = ReadControlPDU();
+ if ((-selectStatus & 2) != 0) {
+ if (ReadControlPDU() == e_AbortTransport)
+ return false;
+ }
if ((-selectStatus & 1) != 0)
receiveStatus = ReadDataPDU(frame);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-09-18 10:45:29
|
Revision: 28375
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28375&view=rev
Author: rjongbloed
Date: 2012-09-18 10:45:19 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Changed level for trace log that ends the out of order RTP resequencing to be same as the start.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-09-18 10:42:39 UTC (rev 28374)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-09-18 10:45:19 UTC (rev 28375)
@@ -481,7 +481,8 @@
m_outOfOrderPackets.pop_back();
expectedSequenceNumber = (WORD)(sequenceNumber + 1);
- PTRACE(5, "RTP\tSession " << m_sessionId << ", ssrc=" << syncSourceIn << ", resequenced "
+ PTRACE(m_outOfOrderPackets.empty() ? 2 : 5,
+ "RTP\tSession " << m_sessionId << ", ssrc=" << syncSourceIn << ", resequenced "
<< (m_outOfOrderPackets.empty() ? "last" : "next") << " out of order packet " << sequenceNumber);
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2012-09-19 00:13:55
|
Revision: 28384
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28384&view=rev
Author: rjongbloed
Date: 2012-09-19 00:13:49 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
Stop jitter buffer before detaching sockets from RTP sssion
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2012-09-19 00:13:25 UTC (rev 28383)
+++ opal/trunk/src/rtp/rtp_session.cxx 2012-09-19 00:13:49 UTC (rev 28384)
@@ -316,6 +316,9 @@
{
Transport temp;
+ // Stop jitter buffer before detaching
+ m_jitterBuffer.SetNULL();
+
if (m_dataSocket != NULL) {
temp.Append(m_dataSocket);
m_dataSocket = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-08-06 05:54:13
|
Revision: 30248
http://sourceforge.net/p/opalvoip/code/30248
Author: rjongbloed
Date: 2013-08-06 05:54:09 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Fixed SDP connect address when NAT is used on incoming call, extra part for trunk.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-08-06 05:40:30 UTC (rev 30247)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-08-06 05:54:09 UTC (rev 30248)
@@ -609,7 +609,8 @@
<< " ts=" << frameTimestamp
<< " src=" << frame.GetSyncSource()
<< " ccnt=" << frame.GetContribSrcCount()
- << ' ' << GetRemoteAddress());
+ << " rem=" << GetRemoteAddress()
+ << " local=" << GetLocalAddress());
}
else {
@@ -1708,7 +1709,7 @@
if (m_singlePort) {
if (natMethod->CreateSocket(m_dataSocket, bindingAddress))
- m_dataSocket->GetLocalAddress(bindingAddress, m_localDataPort);
+ m_dataSocket->GetLocalAddress(m_localAddress, m_localDataPort);
else {
delete m_dataSocket;
m_dataSocket = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-09-05 23:19:40
|
Revision: 30472
http://sourceforge.net/p/opalvoip/code/30472
Author: rjongbloed
Date: 2013-09-05 23:19:38 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Fixed detection of single port multiplexed RTCP, an invalid packet should not be regarded as an RTP packet.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-09-05 08:48:30 UTC (rev 30471)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-09-05 23:19:38 UTC (rev 30472)
@@ -2161,10 +2161,14 @@
// Check for single port operation, incoming RTCP on RTP
RTP_ControlFrame control(frame, pduSize, false);
- if (control.IsValid())
- return OnReceiveControl(control);
+ unsigned type = control.GetPayloadType();
+ if (type < RTP_ControlFrame::e_FirstValidPayloadType || type > RTP_ControlFrame::e_LastValidPayloadType)
+ return OnReceiveData(frame, pduSize);
- return OnReceiveData(frame, pduSize);
+ return OnReceiveControl(control);
+ if (status == e_ProcessPacket)
+ status = e_IgnorePacket;
+ return status;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-09-06 02:25:26
|
Revision: 30473
http://sourceforge.net/p/opalvoip/code/30473
Author: rjongbloed
Date: 2013-09-06 02:25:23 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Fixed merge error in previous check in: detection of single port multiplexed RTCP, an invalid packet should not be regarded as an RTP packet.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-09-05 23:19:38 UTC (rev 30472)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-09-06 02:25:23 UTC (rev 30473)
@@ -2165,7 +2165,7 @@
if (type < RTP_ControlFrame::e_FirstValidPayloadType || type > RTP_ControlFrame::e_LastValidPayloadType)
return OnReceiveData(frame, pduSize);
- return OnReceiveControl(control);
+ status = OnReceiveControl(control);
if (status == e_ProcessPacket)
status = e_IgnorePacket;
return status;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-09-12 04:19:12
|
Revision: 30494
http://sourceforge.net/p/opalvoip/code/30494
Author: rjongbloed
Date: 2013-09-12 04:19:09 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
Improved logging around the socket SO_RCVBUF/SO_SNDBUF adjustment.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-09-12 04:17:35 UTC (rev 30493)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-09-12 04:19:09 UTC (rev 30494)
@@ -1524,43 +1524,57 @@
/////////////////////////////////////////////////////////////////////////////
+#if PTRACING
+#define SetMinBufferSize(sock, bufType, newSize) SetMinBufferSizeFn(sock, bufType, newSize, #bufType)
+static void SetMinBufferSizeFn(PUDPSocket & sock, int bufType, int newSize, const char * bufTypeName)
+#else
static void SetMinBufferSize(PUDPSocket & sock, int bufType, int newSize)
+#endif
{
int originalSize = 0;
if (!sock.GetOption(bufType, originalSize)) {
- PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << bufType << ") failed: " << sock.GetErrorText());
+ PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << bufTypeName << ")"
+ " failed: " << sock.GetErrorText());
return;
}
// Already big enough
- if (originalSize >= newSize)
+ if (originalSize >= newSize) {
+ PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufTypeName << ',' << newSize << ")"
+ " unecessary, already " << originalSize);
return;
+ }
for (; newSize >= 1024; newSize -= newSize/10) {
// Set to new size
if (!sock.SetOption(bufType, newSize)) {
- PTRACE(1, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") failed: " << sock.GetErrorText());
+ PTRACE(1, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufTypeName << ',' << newSize << ")"
+ " failed: " << sock.GetErrorText());
continue;
}
// As some stacks lie about setting the buffer size, we double check.
int adjustedSize;
if (!sock.GetOption(bufType, adjustedSize)) {
- PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << bufType << ") failed: " << sock.GetErrorText());
+ PTRACE(1, "RTP_UDP\tGetOption(" << sock.GetHandle() << ',' << bufTypeName << ")"
+ " failed: " << sock.GetErrorText());
return;
}
if (adjustedSize >= newSize) {
- PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") succeeded.");
+ PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufTypeName << ',' << newSize << ")"
+ " succeeded, actually " << adjustedSize);
return;
}
if (adjustedSize > originalSize) {
- PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") clamped to maximum " << adjustedSize);
+ PTRACE(4, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufTypeName << ',' << newSize << ")"
+ " clamped to maximum " << adjustedSize);
return;
}
- PTRACE(2, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufType << ',' << newSize << ") failed, even though it said it succeeded!");
+ PTRACE(2, "RTP_UDP\tSetOption(" << sock.GetHandle() << ',' << bufTypeName << ',' << newSize << ")"
+ " failed, even though it said it succeeded!");
}
}
@@ -1810,8 +1824,8 @@
#ifndef __BEOS__
// Increase internal buffer size on media UDP sockets
- SetMinBufferSize(*m_dataSocket, SO_RCVBUF, m_isAudio ? RTP_AUDIO_RX_BUFFER_SIZE : RTP_VIDEO_RX_BUFFER_SIZE);
- SetMinBufferSize(*m_dataSocket, SO_SNDBUF, RTP_DATA_TX_BUFFER_SIZE);
+ SetMinBufferSize(*m_dataSocket, SO_RCVBUF, m_isAudio ? RTP_AUDIO_RX_BUFFER_SIZE : RTP_VIDEO_RX_BUFFER_SIZE);
+ SetMinBufferSize(*m_dataSocket, SO_SNDBUF, RTP_DATA_TX_BUFFER_SIZE);
if (m_controlSocket != NULL) {
SetMinBufferSize(*m_controlSocket, SO_RCVBUF, RTP_CTRL_BUFFER_SIZE);
SetMinBufferSize(*m_controlSocket, SO_SNDBUF, RTP_CTRL_BUFFER_SIZE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-10-16 01:33:52
|
Revision: 30727
http://sourceforge.net/p/opalvoip/code/30727
Author: rjongbloed
Date: 2013-10-16 01:33:49 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
Reversed out change from Eridani that does not apply to Lacaille.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-10-16 01:06:32 UTC (rev 30726)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-10-16 01:33:49 UTC (rev 30727)
@@ -1641,9 +1641,6 @@
if (IsOpen())
return true;
- if (IsExternalTransport())
- return true;
-
PWaitAndSignal mutex1(m_readMutex);
PWaitAndSignal mutex2(m_dataMutex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-11-14 07:14:03
|
Revision: 30909
http://sourceforge.net/p/opalvoip/code/30909
Author: rjongbloed
Date: 2013-11-14 07:14:00 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Fixed GNU compile
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-11-14 07:03:17 UTC (rev 30908)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-11-14 07:14:00 UTC (rev 30909)
@@ -1827,7 +1827,8 @@
m_dataSocket->PUDPSocket::InternalGetLocalAddress(addrAndPort);
if (!addrAndPort.IsValid())
addrAndPort.Parse(PIPSocket::GetHostName());
- PUDPSocket::Slice slice("", 1);
+ BYTE dummy = 0;
+ PUDPSocket::Slice slice(&dummy, 1);
if (!m_dataSocket->PUDPSocket::InternalWriteTo(&slice, 1, addrAndPort)) {
PTRACE(1, "RTP_UDP\tSession " << m_sessionId << ", could not write to unblock read socket: "
<< m_dataSocket->GetErrorText(PChannel::LastReadError));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-11-28 21:37:16
|
Revision: 30999
http://sourceforge.net/p/opalvoip/code/30999
Author: rjongbloed
Date: 2013-11-28 21:37:11 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
More logging for RTCP commands.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-11-28 16:41:12 UTC (rev 30998)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-11-28 21:37:11 UTC (rev 30999)
@@ -1208,7 +1208,10 @@
case RTP_ControlFrame::e_TMMBR :
if (size >= sizeof(RTP_ControlFrame::FbTMMB)) {
const RTP_ControlFrame::FbTMMB * tmmb = (const RTP_ControlFrame::FbTMMB *)payload;
- PTRACE(4, "RTP\tSession " << m_sessionId << ", received TMMBR " << tmmb->GetBitRate());
+ PTRACE(4, "RTP\tSession " << m_sessionId << ", "
+ "sender SSRC=" << RTP_TRACE_SRC(tmmb->fci.senderSSRC) << ", "
+ "request SSRC=" << RTP_TRACE_SRC(tmmb->requestSSRC) << ", "
+ "received TMMBR " << tmmb->GetBitRate());
m_connection.ExecuteMediaCommand(OpalMediaFlowControl(tmmb->GetBitRate()), m_sessionId);
}
else {
@@ -1235,12 +1238,19 @@
case RTP_ControlFrame::e_PayloadSpecificFeedBack :
switch (frame.GetFbType()) {
case RTP_ControlFrame::e_PictureLossIndication :
- PTRACE(4, "RTP\tSession " << m_sessionId << ", received RFC5104 PLI");
+ PTRACE(4, "RTP\tSession " << m_sessionId << ", "
+ "sender SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFCI *)payload)->senderSSRC) << ", "
+ "media SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFCI *)payload)->mediaSSRC) << ", "
+ "received RFC4585 PLI");
m_connection.OnRxIntraFrameRequest(*this, false);
break;
case RTP_ControlFrame::e_FullIntraRequest :
- PTRACE(4, "RTP\tSession " << m_sessionId << ", received RFC5104 FIR");
+ PTRACE(4, "RTP\tSession " << m_sessionId << ", "
+ "sender SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFIR *)payload)->fci.senderSSRC) << ", "
+ "request SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFIR *)payload)->requestSSRC) << ", "
+ "received RFC5104 FIR, "
+ "sn=" << (unsigned)((const RTP_ControlFrame::FbFIR *)payload)->sequenceNumber);
m_connection.OnRxIntraFrameRequest(*this, true);
break;
@@ -1321,7 +1331,15 @@
void OpalRTPSession::OnRxGoodbye(const PDWORDArray & PTRACE_PARAM(src), const PString & PTRACE_PARAM(reason))
{
- PTRACE(3, "RTP\tSession " << m_sessionId << ", OnGoodbye: \"" << reason << "\" srcs=" << src);
+#if PTRACING
+ if (PTrace::CanTrace(3)) {
+ ostream & strm = PTrace::Begin(3, __FILE__, __LINE__, this);
+ strm << "RTP\tSession " << m_sessionId << ", OnGoodbye: " << reason << "\" SSRC=";
+ for (PINDEX i = 0; i < src.GetSize(); i++)
+ strm << RTP_TRACE_SRC(src[i]) << ' ';
+ strm << PTrace::End;
+ }
+#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-11-29 02:42:10
|
Revision: 31015
http://sourceforge.net/p/opalvoip/code/31015
Author: rjongbloed
Date: 2013-11-29 02:42:04 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
Merged revision(s) 31014 from /opal/branches/EpsilonEridani:
More RTP session logging tweaks.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-11-29 02:40:35 UTC (rev 31014)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-11-29 02:42:04 UTC (rev 31015)
@@ -351,6 +351,8 @@
RTP_ControlFrame report;
InitialiseControlFrame(report);
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending BYE, SSRC=" << RTP_TRACE_SRC(syncSourceOut));
+
static char const ReasonStr[] = "Session ended";
static size_t ReasonLen = sizeof(ReasonStr);
@@ -543,7 +545,7 @@
receiver.dlsr = 0;
}
- PTRACE(3, "RTP\tSession " << m_sessionId << ", SentReceiverReport:"
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending ReceiverReport:"
" SSRC=" << RTP_TRACE_SRC(syncSourceIn)
<< " fraction=" << (unsigned)receiver.fraction
<< " lost=" << receiver.GetLostPackets()
@@ -932,8 +934,7 @@
// add the SSRC to the start of the payload
*(PUInt32b *)report.GetPayloadPtr() = syncSourceOut;
- PTRACE(3, "RTP\tSession " << m_sessionId << ", SentReceiverReport:"
- " SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending ReceiverReport: SSRC=" << RTP_TRACE_SRC(syncSourceIn));
}
else {
report.SetPayloadSize(sizeof(PUInt32b) + sizeof(RTP_ControlFrame::ReceiverReport)); // length is SSRC of packet sender plus RR
@@ -966,7 +967,7 @@
sender->psent = packetsSent;
sender->osent = octetsSent;
- PTRACE(3, "RTP\tSession " << m_sessionId << ", SentSenderReport:"
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending SenderReport:"
" SSRC=" << RTP_TRACE_SRC(syncSourceOut)
<< " ntp=" << sender->ntp_sec << '.' << sender->ntp_frac
<< " rtp=" << sender->rtp_ts
@@ -983,7 +984,7 @@
report.EndPacket();
// Add the SDES part to compound RTCP packet
- PTRACE(3, "RTP\tSession " << m_sessionId << ", sending SDES: " << m_canonicalName);
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending SDES: " << m_canonicalName);
report.StartNewPacket();
report.SetCount(0); // will be incremented automatically
@@ -1410,11 +1411,13 @@
void OpalRTPSession::SendFlowControl(unsigned maxBitRate, unsigned overhead, bool notify)
{
- PTRACE(3, "RTP\tSession " << m_sessionId << ", SendFlowControl(" << maxBitRate << ") using TMMBR");
// Create packet
RTP_ControlFrame request;
InitialiseControlFrame(request);
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending TMMBR (flow control) "
+ "rate=" << maxBitRate << ", SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+
request.StartNewPacket();
request.SetPayloadType(RTP_ControlFrame::e_TransportLayerFeedBack);
@@ -1446,14 +1449,14 @@
void OpalRTPSession::SendIntraFrameRequest(bool rfc2032, bool pictureLoss)
{
- PTRACE(3, "RTP\tSession " << m_sessionId << ", SendIntraFrameRequest using "
- << (rfc2032 ? "RFC2032" : (pictureLoss ? "RFC4585 PLI" : "RFC5104 FIR"))
- << " for SSRC=" << RTP_TRACE_SRC(syncSourceIn));
-
// Create packet
RTP_ControlFrame request;
InitialiseControlFrame(request);
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending "
+ << (rfc2032 ? "RFC2032" : (pictureLoss ? "RFC4585 PLI" : "RFC5104 FIR"))
+ << ", SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+
request.StartNewPacket();
if (rfc2032) {
@@ -1491,11 +1494,12 @@
void OpalRTPSession::SendTemporalSpatialTradeOff(unsigned tradeOff)
{
- PTRACE(3, "RTP\tSession " << m_sessionId << ", SendTemporalSpatialTradeOff " << tradeOff);
-
RTP_ControlFrame request;
InitialiseControlFrame(request);
+ PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending TSTO (temporal spatial trade off) "
+ "value=" << tradeOff << ", SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+
request.StartNewPacket();
request.SetPayloadType(RTP_ControlFrame::e_PayloadSpecificFeedBack);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2013-11-29 08:19:07
|
Revision: 31018
http://sourceforge.net/p/opalvoip/code/31018
Author: rjongbloed
Date: 2013-11-29 08:19:05 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
Fixed merge error
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2013-11-29 06:35:20 UTC (rev 31017)
+++ opal/trunk/src/rtp/rtp_session.cxx 2013-11-29 08:19:05 UTC (rev 31018)
@@ -1211,7 +1211,7 @@
const RTP_ControlFrame::FbTMMB * tmmb = (const RTP_ControlFrame::FbTMMB *)payload;
PTRACE(4, "RTP\tSession " << m_sessionId << ", "
"received TMMBR: rate=" << tmmb->GetBitRate() << ", "
- "sender SSRC=" << RTP_TRACE_SRC(tmmb->fci.senderSSRC) << ", "
+ "sender SSRC=" << RTP_TRACE_SRC(tmmb->hdr.senderSSRC) << ", "
"request SSRC=" << RTP_TRACE_SRC(tmmb->requestSSRC));
m_connection.ExecuteMediaCommand(OpalMediaFlowControl(tmmb->GetBitRate()), m_sessionId);
}
@@ -1241,16 +1241,16 @@
case RTP_ControlFrame::e_PictureLossIndication :
PTRACE(4, "RTP\tSession " << m_sessionId << ", "
"received RFC4585 PLI: " << ", "
- "sender SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFCI *)payload)->senderSSRC) << ", "
- "media SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFCI *)payload)->mediaSSRC));
+ "sender SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbHeader *)payload)->senderSSRC) << ", "
+ "media SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbHeader *)payload)->mediaSSRC));
m_connection.OnRxIntraFrameRequest(*this, false);
break;
case RTP_ControlFrame::e_FullIntraRequest :
PTRACE(4, "RTP\tSession " << m_sessionId << ", "
"received RFC5104 FIR: "
- "sender SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFIR *)payload)->fci.senderSSRC) << ", "
- "request SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFIR *)payload)->requestSSRC)
+ "sender SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFIR *)payload)->hdr.senderSSRC) << ", "
+ "request SSRC=" << RTP_TRACE_SRC(((const RTP_ControlFrame::FbFIR *)payload)->requestSSRC) << ", "
"sn=" << (unsigned)((const RTP_ControlFrame::FbFIR *)payload)->sequenceNumber);
m_connection.OnRxIntraFrameRequest(*this, true);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-01-18 06:04:22
|
Revision: 31217
http://sourceforge.net/p/opalvoip/code/31217
Author: rjongbloed
Date: 2014-01-18 06:04:19 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
Fixed compile without some configure options
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2014-01-17 10:56:38 UTC (rev 31216)
+++ opal/trunk/src/rtp/rtp_session.cxx 2014-01-18 06:04:19 UTC (rev 31217)
@@ -47,6 +47,7 @@
#include <ptclib/random.h>
#include <ptclib/pnat.h>
+#include <ptclib/cypher.h>
#include <algorithm>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-01-27 02:03:09
|
Revision: 31272
http://sourceforge.net/p/opalvoip/code/31272
Author: rjongbloed
Date: 2014-01-27 02:03:06 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
Fixed incorrect setting of local RTP single port mode when remote is in single port mode. Two things are independent of each other.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2014-01-27 01:39:49 UTC (rev 31271)
+++ opal/trunk/src/rtp/rtp_session.cxx 2014-01-27 02:03:06 UTC (rev 31272)
@@ -1998,9 +1998,8 @@
if ((port&1) == 1 && m_remoteDataPort == 0)
m_remoteDataPort = (WORD)(port - 1);
}
- m_singlePort = m_remoteDataPort == m_remoteControlPort;
- PTRACE_IF(3, m_singlePort, "RTP_UDP\tSession " << m_sessionId << ", single port mode");
- PTRACE_IF(3, m_remoteDataPort+1 != m_remoteControlPort, "RTP_UDP\tSession " << m_sessionId << ", disjoint control port");
+ PTRACE_IF(3, m_remoteDataPort == m_remoteControlPort, "RTP_UDP\tSession " << m_sessionId << ", remote using single port mode");
+ PTRACE_IF(3, m_remoteDataPort != (m_remoteControlPort&0xfffe), "RTP_UDP\tSession " << m_sessionId << ", remote has disjoint control port");
}
if (m_localHasRestrictedNAT) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-01-27 05:31:41
|
Revision: 31278
http://sourceforge.net/p/opalvoip/code/31278
Author: rjongbloed
Date: 2014-01-27 05:31:38 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
See to get continual STUN packets in ICE even after "completed". So don't remove the STUN server we have to handle those packets.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp_session.cxx
Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx 2014-01-27 05:30:42 UTC (rev 31277)
+++ opal/trunk/src/rtp/rtp_session.cxx 2014-01-27 05:31:38 UTC (rev 31278)
@@ -2095,10 +2095,6 @@
m_stunServer->OnReceiveMessage(message, PSTUNServer::SocketInfo(&socket));
return e_IgnorePacket;
}
-
- delete m_stunServer;
- m_stunServer = NULL;
- PTRACE(4, "RTP\tSession " << m_sessionId << ", deleted STUN server as ICE completed");
}
// If remote address never set from higher levels, then try and figure
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
