[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "auth-corrections" updated.

[Commits to the Asterisk SCF project code repositories]

branch "auth-corrections" has been updated
       via  3cd729fbb9dc4d0a75185a443f9f433552ddf47d (commit)
       via  a0abb129f930f8dfe4e3c625323dcd08a34923f5 (commit)
      from  e8f492df476df52ba8c37ad0be6647646c4f41b9 (commit)

Summary of changes:
 src/AuthManager.cpp      |   12 ++++++------
 src/AuthManager.h        |    4 ++--
 src/SipEndpointFactory.h |    1 -
 3 files changed, 8 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 3cd729fbb9dc4d0a75185a443f9f433552ddf47d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Nov 30 13:38:16 2011 -0600

    Remove an unnecessary #include

diff --git a/src/SipEndpointFactory.h b/src/SipEndpointFactory.h
index e8102a9..115fd8e 100644
--- a/src/SipEndpointFactory.h
+++ b/src/SipEndpointFactory.h
@@ -23,7 +23,6 @@
 #include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.h>
 #include <AsteriskSCF/SIP/SIPRegistrarIf.h>
-#include <AsteriskSCF/logger.h>
 #include "SipReplicationContext.h"
 #include "PJSipManager.h"
 

commit a0abb129f930f8dfe4e3c625323dcd08a34923f5
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Nov 30 12:23:38 2011 -0600

    s/moduleHookVector/ModuleHookVector/

diff --git a/src/AuthManager.cpp b/src/AuthManager.cpp
index d5e75f9..277eac3 100644
--- a/src/AuthManager.cpp
+++ b/src/AuthManager.cpp
@@ -48,7 +48,7 @@ public:
 class ServerAuthInstancePriv
 {
 public:
-    ServerAuthInstancePriv(pjsip_rx_data *rdata, const moduleHookVector &moduleHooks,
+    ServerAuthInstancePriv(pjsip_rx_data *rdata, const ModuleHookVector &moduleHooks,
             RequestType type, pjsip_endpoint *endpoint, const Logger &logger)
         : mEndpoint(endpoint),
         mPool(pjsip_endpt_create_pool(mEndpoint, "auth%p", 500, 256)),
@@ -61,7 +61,7 @@ public:
             return;
         }
 
-        for (moduleHookVector::const_iterator iter = moduleHooks.begin(); iter != moduleHooks.end(); ++iter)
+        for (ModuleHookVector::const_iterator iter = moduleHooks.begin(); iter != moduleHooks.end(); ++iter)
         {
             RequestTypeSeq types = (*iter)->mTypes;
             AuthHookPrx hook = (*iter)->mHook;
@@ -134,7 +134,7 @@ public:
     std::string callId;
 };
 
-ServerAuthInstance::ServerAuthInstance(pjsip_rx_data *rdata, const moduleHookVector &hooks,
+ServerAuthInstance::ServerAuthInstance(pjsip_rx_data *rdata, const ModuleHookVector &hooks,
         RequestType type, pjsip_endpoint *endpoint, const Logger &logger)
         : mImpl(new ServerAuthInstancePriv(rdata, hooks, type, endpoint, logger)) { }
 
@@ -351,7 +351,7 @@ public:
 
     std::vector<ServerAuthInstancePtr> mServerAuthInstances;
     pjsip_endpoint *mEndpoint;
-    moduleHookVector mRegisteredHooks;
+    ModuleHookVector mRegisteredHooks;
     Logger mLogger;
     int mCounter;
     boost::mutex mHooksLock;
@@ -532,7 +532,7 @@ void AuthManager::addAuthHook(const AsteriskSCF::SIP::ExtensionPoint::V1::AuthHo
 void AuthManager::removeAuthHook(const AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx &hook)
 {
     boost::lock_guard<boost::mutex> lock(mImpl->mHooksLock);
-    for (moduleHookVector::iterator iter = mImpl->mRegisteredHooks.begin();
+    for (ModuleHookVector::iterator iter = mImpl->mRegisteredHooks.begin();
             iter != mImpl->mRegisteredHooks.end(); ++iter)
     {
         if ((*iter)->mHook == hook)
@@ -553,7 +553,7 @@ AuthHookSeq AuthManager::getHooks()
 {
     boost::lock_guard<boost::mutex> lock(mImpl->mHooksLock);
     AuthHookSeq retSeq;
-    for (moduleHookVector::iterator iter = mImpl->mRegisteredHooks.begin();
+    for (ModuleHookVector::iterator iter = mImpl->mRegisteredHooks.begin();
             iter != mImpl->mRegisteredHooks.end(); ++ iter)
     {
         retSeq.push_back((*iter)->mHook);
diff --git a/src/AuthManager.h b/src/AuthManager.h
index d9bdb23..c5a0431 100644
--- a/src/AuthManager.h
+++ b/src/AuthManager.h
@@ -32,7 +32,7 @@ namespace SipSessionManager
 
 class AuthHookWrapper;
 
-typedef std::vector<boost::shared_ptr<AuthHookWrapper> > moduleHookVector;
+typedef std::vector<boost::shared_ptr<AuthHookWrapper> > ModuleHookVector;
 
 void sessionAuthTimeout(pj_timer_heap_t *timer_heap, pj_timer_entry *entry);
 
@@ -99,7 +99,7 @@ public:
 private:
 
     ServerAuthInstance(pjsip_rx_data *rdata,
-            const moduleHookVector &hooks,
+            const ModuleHookVector &hooks,
             AsteriskSCF::SIP::ExtensionPoint::V1::RequestType type,
             pjsip_endpoint *endpoint,
             const AsteriskSCF::System::Logging::Logger &logger);

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


-- 
asterisk-scf/integration/sip.git