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

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  1ac463d54b213bb4ba983193fdf5d72a1000db21 (commit)
      from  c51039745464e204ba2ba63bbb595035fb64fb7d (commit)

Summary of changes:
 src/Component.cpp                    |    3 +--
 src/ICETransport.cpp                 |    4 +---
 src/UDPTLSession.cpp                 |    6 ++----
 src/UDPTLSink.cpp                    |    4 +---
 src/UdptlStateReplicatorListener.cpp |    4 +---
 5 files changed, 6 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit 1ac463d54b213bb4ba983193fdf5d72a1000db21
Author: David M. Lee <dlee at digium.com>
Date:   Thu Apr 5 10:55:01 2012 -0500

    Used shared default TTL

diff --git a/src/Component.cpp b/src/Component.cpp
index 11557ad..4e8c7b9 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -62,7 +62,6 @@ Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaUDPTL");
 
 const string ReplicaServiceId("MediaUdptlReplica");
 const string MediaServiceId("UDPTLMediaService");
-const int TTL_SECONDS = 180;
 
 typedef ContextResultData<UDPTLSessionPrx> UDPTLSessionPrxCookie;
 
@@ -78,7 +77,7 @@ public:
     UDPTLMediaServiceImpl(const Ice::ObjectAdapterPtr& adapter,
                           const UdptlReplicationContextPtr& replicationContext,
                           const ConfigurationServiceImplPtr& configurationService) :
-        mOperationContextCache(OperationContextCache::create(TTL_SECONDS)),
+        mOperationContextCache(OperationContextCache::create(DEFAULT_TTL_SECONDS)),
         mAdapter(adapter),
         mEnvironment(PJMediaEnvironment::create(adapter->getCommunicator()->getProperties(), configurationService)),
         mReplicationContext(replicationContext),
diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
index ae798d6..45bb1b6 100644
--- a/src/ICETransport.cpp
+++ b/src/ICETransport.cpp
@@ -48,15 +48,13 @@ namespace
 {
 Logger logger = getLoggerFactory().getLogger("AsteriskSCF.MediaUDPTL");
 
-const int TTL_SECONDS = 180;
-
 class ICEAgentImpl : public InteractiveConnectionAgent
 {
 public:
 
     ICEAgentImpl(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& id, const PJMediaEnvironmentPtr& env,
         const PJMediaEndpointPtr& ep) :
-        mOperationContextCache(OperationContextCache::create(TTL_SECONDS)),
+        mOperationContextCache(OperationContextCache::create(DEFAULT_TTL_SECONDS)),
         mAdapter(adapter),
         mId(id),
         mShuttingDown(false),
diff --git a/src/UDPTLSession.cpp b/src/UDPTLSession.cpp
index 243132a..6fb5934 100644
--- a/src/UDPTLSession.cpp
+++ b/src/UDPTLSession.cpp
@@ -50,8 +50,6 @@ using namespace AsteriskSCF::System::V1;
 using namespace AsteriskSCF::UDPTL;
 using namespace std;
 
-const int TTL_SECONDS = 180;
-
 /**
  * Implementation of the UDPTLSession interface as defined in MediaUDPTLIf.ice
  */
@@ -231,7 +229,7 @@ UDPTLSessionImpl::UDPTLSessionImpl(const Ice::ObjectAdapterPtr& adapter,
                                    const UDPTLServiceLocatorParamsPtr& params,
                                    const UdptlReplicationContextPtr& replicationContext,
                                    const ConfigurationServiceImplPtr& configurationService) :
-    mOperationContextCache(OperationContextCache::create(TTL_SECONDS)),
+    mOperationContextCache(OperationContextCache::create(DEFAULT_TTL_SECONDS)),
     mEnvironment(env),
     mEndpoint(PJMediaEndpoint::create(env)),
     mId(id),
@@ -273,7 +271,7 @@ UDPTLSessionImpl::UDPTLSessionImpl(const Ice::ObjectAdapterPtr& adapter,
                                    bool ipv6,
                                    const UdptlReplicationContextPtr& replicationContext,
                                    const ConfigurationServiceImplPtr& configurationService) :
-    mOperationContextCache(OperationContextCache::create(TTL_SECONDS)),
+    mOperationContextCache(OperationContextCache::create(DEFAULT_TTL_SECONDS)),
     mEnvironment(env),
     mEndpoint(PJMediaEndpoint::create(env)),
     mId(sessionIdentity),
diff --git a/src/UDPTLSink.cpp b/src/UDPTLSink.cpp
index 61bfc4d..84bb021 100644
--- a/src/UDPTLSink.cpp
+++ b/src/UDPTLSink.cpp
@@ -41,8 +41,6 @@ using namespace AsteriskSCF::Replication::UDPTL::V1;
 using namespace AsteriskSCF::UDPTL;
 using namespace std;
 
-const int TTL_SECONDS = 180;
-
 /**
  * Private implementation details for the StreamSinkUDPTLImpl class.
  */
@@ -94,7 +92,7 @@ StreamSinkUDPTLImplPriv::StreamSinkUDPTLImplPriv(const SessionAdapterPtr& sessio
                                                  const PJMediaTransportPtr& transport,
                                                  const string& sessionId,
                                                  struct udptl *udptl) :
-    mOperationContextCache(OperationContextCache::create(TTL_SECONDS)),
+    mOperationContextCache(OperationContextCache::create(DEFAULT_TTL_SECONDS)),
     mSessionAdapter(session),
     mTransport(transport),
     mSinkStateItem(new UdptlStreamSinkStateItem),
diff --git a/src/UdptlStateReplicatorListener.cpp b/src/UdptlStateReplicatorListener.cpp
index 61acb1d..a231696 100644
--- a/src/UdptlStateReplicatorListener.cpp
+++ b/src/UdptlStateReplicatorListener.cpp
@@ -33,8 +33,6 @@ using namespace AsteriskSCF::System::V1;
 using namespace AsteriskSCF::UDPTL;
 using namespace std;
 
-const int TTL_SECONDS = 180;
-
 class UdptlStateReplicatorItem
 {
 public:
@@ -70,7 +68,7 @@ public:
                                      const UdptlGeneralStateItemPtr& generalState,
                                      const UdptlReplicationContextPtr& replicationContext,
                                      const ConfigurationServiceImplPtr& configurationService)
-        : mOperationContextCache(OperationContextCache::create(TTL_SECONDS)),
+        : mOperationContextCache(OperationContextCache::create(DEFAULT_TTL_SECONDS)),
           mId(IceUtil::generateUUID()),
           mAdapter(adapter),
           mEnvironment(env),

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


-- 
asterisk-scf/integration/mediatransportudptl.git