[asterisk-scf-commits] asterisk-scf/release/sip.git branch "authexten" updated.

[Commits to the Asterisk SCF project code repositories]

branch "authexten" has been updated
       via  53b69af9a3afc348e8a00f2ca45ccd1225155c07 (commit)
      from  f3343d7b5205f981b8d4002991f233a4e4e9645e (commit)

Summary of changes:
 src/AuthManager.cpp |   22 +++++++++++++++++++---
 src/AuthManager.h   |   21 +--------------------
 2 files changed, 20 insertions(+), 23 deletions(-)


- Log -----------------------------------------------------------------
commit 53b69af9a3afc348e8a00f2ca45ccd1225155c07
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Feb 14 17:08:09 2011 -0600

    Make the AuthHookData class private.

diff --git a/src/AuthManager.cpp b/src/AuthManager.cpp
index 23c733d..d212f6c 100644
--- a/src/AuthManager.cpp
+++ b/src/AuthManager.cpp
@@ -26,6 +26,22 @@ namespace AsteriskSCF
 namespace SipSessionManager
 {
 
+class AuthHookData
+{
+public:
+    AuthHookData(int priority, AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx hook, AsteriskSCF::SIP::ExtensionPoint::V1::RequestTypeSeq types)
+        : mPriority(priority), mHook(hook), mTypes(types) { }
+
+    bool operator< (const AuthHookData &rhs) const
+    {
+        return mPriority < rhs.mPriority;
+    }
+
+    int mPriority;
+    AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx mHook;
+    AsteriskSCF::SIP::ExtensionPoint::V1::RequestTypeSeq mTypes;
+};
+
 class AuthInstancePriv
 {
 public:
@@ -41,8 +57,8 @@ public:
 
         for (moduleHookVector::iterator iter = moduleHooks.begin(); iter != moduleHooks.end(); ++iter)
         {
-            RequestTypeSeq types = (*iter)->getRequestTypes();
-            AuthHookPrx hook = (*iter)->getHook();
+            RequestTypeSeq types = (*iter)->mTypes;
+            AuthHookPrx hook = (*iter)->mHook;
             for (RequestTypeSeq::iterator typeIter = types.begin(); typeIter != types.end(); ++typeIter)
             {
                 if (*typeIter == type)
@@ -375,7 +391,7 @@ void AuthManager::removeAuthHook(AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookP
     for (moduleHookVector::iterator iter = mImpl->mRegisteredHooks.begin();
             iter != mImpl->mRegisteredHooks.end(); ++iter)
     {
-        if ((*iter)->getHook() == hook)
+        if ((*iter)->mHook == hook)
         {
             mImpl->mRegisteredHooks.erase(iter);
             break;
diff --git a/src/AuthManager.h b/src/AuthManager.h
index 6dc696c..b67bd4a 100644
--- a/src/AuthManager.h
+++ b/src/AuthManager.h
@@ -30,26 +30,7 @@ namespace AsteriskSCF
 namespace SipSessionManager
 {
 
-class AuthHookData
-{
-public:
-    AuthHookData(int priority, AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx hook, AsteriskSCF::SIP::ExtensionPoint::V1::RequestTypeSeq types)
-        : mPriority(priority), mHook(hook), mTypes(types) { }
-
-    int getPriority() const { return mPriority; }
-    AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx getHook() const { return mHook; }
-    AsteriskSCF::SIP::ExtensionPoint::V1::RequestTypeSeq getRequestTypes() const { return mTypes; }
-
-    bool operator< (const AuthHookData &rhs) const
-    {
-        return getPriority() < rhs.getPriority();
-    }
-
-private:
-    int mPriority;
-    AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx mHook;
-    AsteriskSCF::SIP::ExtensionPoint::V1::RequestTypeSeq mTypes;
-};
+class AuthHookData;
 
 typedef std::vector<boost::shared_ptr<AuthHookData> > moduleHookVector;
 

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


-- 
asterisk-scf/release/sip.git