[Opalvoip-svn] SF.net SVN: opalvoip:[33789] opal/trunk/src/opal/mediasession.cxx

[<rjo...@us...>]

Revision: 33789
          http://sourceforge.net/p/opalvoip/code/33789
Author:   rjongbloed
Date:     2015-07-31 10:23:39 +0000 (Fri, 31 Jul 2015)
Log Message:
-----------
Make logic for bundled ICE work.

Modified Paths:
--------------
    opal/trunk/src/opal/mediasession.cxx

Modified: opal/trunk/src/opal/mediasession.cxx
===================================================================
--- opal/trunk/src/opal/mediasession.cxx	2015-07-31 10:06:55 UTC (rev 33788)
+++ opal/trunk/src/opal/mediasession.cxx	2015-07-31 10:23:39 UTC (rev 33789)
@@ -1161,13 +1161,6 @@
 {
   m_maxICESetUpTime  = session.GetMaxICESetUpTime();
 
-  m_localCandidates.SetSize(count);
-  m_remoteCandidates.SetSize(count);
-  for (PINDEX i = 0; i < count; ++i) {
-    m_localCandidates.SetAt(i, new CandidateStateList);
-    m_remoteCandidates.SetAt(i, new CandidateStateList);
-  }
-
   return OpalUDPMediaTransport::Open(session, count, localInterface, remoteAddress);
 }
 
@@ -1192,7 +1185,7 @@
     return;
   }
 
-  CandidatesArray newCandidates(m_remoteCandidates.GetSize());
+  CandidatesArray newCandidates(m_subchannels.size());
   for (PINDEX i = 0; i < newCandidates.GetSize(); ++i)
     newCandidates.SetAt(i, new CandidateStateList);
 
@@ -1299,8 +1292,9 @@
   if (m_state != e_AnsweringCandidates)
     m_state = e_OfferingCandidates;
 
+  m_localCandidates.SetSize(m_subchannels.size());
   for (size_t subchannel = 0; subchannel < m_subchannels.size(); ++subchannel) {
-    m_localCandidates[subchannel].clear();
+    m_localCandidates.SetAt(subchannel, new CandidateStateList);
 
     // Only do ICE-Lite right now so just offer "host" type using local address.
     static const PNatMethod::Component ComponentId[2] = { PNatMethod::eComponent_RTP, PNatMethod::eComponent_RTCP };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.