[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  3e6890a1c616c573260409589f5ef24a4140b00f (commit)
       via  bf1d09e293294d67c6ea1dfdc44aec2ba04c6f10 (commit)
      from  c6ca0dfe65e803448db58511ad44538a8871594c (commit)

Summary of changes:
 src/ICETransport.cpp |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
 mode change 100755 => 100644 config/RTPConfigurator.py
 mode change 100755 => 100644 src/Configuration.h
 mode change 100755 => 100644 src/ICETransport.cpp
 mode change 100755 => 100644 src/RTPSession.cpp
 mode change 100755 => 100644 src/RTPSink.cpp
 mode change 100755 => 100644 src/RTPTelephonyEventSink.cpp
 mode change 100755 => 100644 src/RTPTelephonyEventSink.h
 mode change 100755 => 100644 src/RTPTelephonyEventSource.cpp
 mode change 100755 => 100644 test/CMakeLists.txt


- Log -----------------------------------------------------------------
commit 3e6890a1c616c573260409589f5ef24a4140b00f
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Apr 17 15:39:52 2012 -0230

    Permission fixups.

diff --git a/config/RTPConfigurator.py b/config/RTPConfigurator.py
old mode 100755
new mode 100644
diff --git a/src/Configuration.h b/src/Configuration.h
old mode 100755
new mode 100644
diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
old mode 100755
new mode 100644
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
old mode 100755
new mode 100644
diff --git a/src/RTPSink.cpp b/src/RTPSink.cpp
old mode 100755
new mode 100644
diff --git a/src/RTPTelephonyEventSink.cpp b/src/RTPTelephonyEventSink.cpp
old mode 100755
new mode 100644
diff --git a/src/RTPTelephonyEventSink.h b/src/RTPTelephonyEventSink.h
old mode 100755
new mode 100644
diff --git a/src/RTPTelephonyEventSource.cpp b/src/RTPTelephonyEventSource.cpp
old mode 100755
new mode 100644
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
old mode 100755
new mode 100644

commit bf1d09e293294d67c6ea1dfdc44aec2ba04c6f10
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Apr 17 15:02:24 2012 -0230

    Improved the localAddress resolution detection by adding a timed wait in the
    loop and catching (and ignoring) certain exceptions that might be thrown.

diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
index 280c5a6..b36c996 100755
--- a/src/ICETransport.cpp
+++ b/src/ICETransport.cpp
@@ -758,9 +758,21 @@ AddressPtr ICETransport::localAddress()
     {
         return mLocalAddress;
     }
+    //
+    // Retry check for local address for max of 2.5 seconds, then proceed as if it was unknown.
+    //
     for (size_t i = 0; i < 5 && !mLocalAddress; ++i)
     {
-        mMonitor.wait(lock);
+        try
+        {
+            mMonitor.timed_wait(lock, boost::posix_time::milliseconds(500));
+        }
+        catch (const boost::thread_interrupted&)
+        {
+        }
+        catch (const boost::thread_resource_error&)
+        {
+        }
     }
     return mLocalAddress;
 }

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_rtp_pjmedia.git