[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "client-registration" updated.

[Commits to the Asterisk SCF project code repositories]

branch "client-registration" has been updated
       via  081f82acfed7cc21734b83c470e521b0fadf652a (commit)
      from  ed312ad27eeb19dc1fe4a4742e5bc1b0ee57bcfc (commit)

Summary of changes:
 src/AuthManager.h           |   12 -----------
 src/Component.cpp           |   45 -------------------------------------------
 src/SipClientRegistration.h |    6 +++-
 3 files changed, 4 insertions(+), 59 deletions(-)


- Log -----------------------------------------------------------------
commit 081f82acfed7cc21734b83c470e521b0fadf652a
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Sep 1 18:31:57 2011 -0500

    Adjust for slice changes to combine both hooks.

diff --git a/src/AuthManager.h b/src/AuthManager.h
index e2d7188..100f1eb 100644
--- a/src/AuthManager.h
+++ b/src/AuthManager.h
@@ -175,18 +175,6 @@ public:
      * Remove all registered authentication hooks from the AuthManager
      */
     void clearAuthHooks();
-    /**
-     * Register a new authentication client hook with the AuthManager
-     */
-    void addAuthClientHook(const AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx &hook, int priority, const AsteriskSCF::SIP::ExtensionPoint::V1::RequestTypeSeq &types);
-    /**
-     * Remove a registered authentication client hook from the AuthManager
-     */
-    void removeAuthClientHook(const AsteriskSCF::SIP::ExtensionPoint::V1::AuthHookPrx &hook);
-    /**
-     * Remove all registered authentication client hooks from the AuthManager
-     */
-    void clearAuthClientHooks();
 
 private:
     boost::shared_ptr<AuthManagerPriv> mImpl;
diff --git a/src/Component.cpp b/src/Component.cpp
index 12ff379..ca64fe9 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -104,38 +104,6 @@ private:
 
 typedef IceUtil::Handle<SipAuthExtensionPoint> SipAuthExtensionPointPtr;
 
-class SipAuthClientExtensionPoint : public AuthClientExtensionPoint
-{
-public:
-    SipAuthClientExtensionPoint(const PJSipManagerPtr& manager)
-        : mPJSipManager(manager)
-    {
-    }
-    
-    void addAuthClientHook(
-            const AuthClientHookPrx &hook,
-            int priority,
-            const RequestTypeSeq &requestTypes,
-            const Ice::Current&)
-    {
-        mPJSipManager->addAuthClientHook(hook, priority, requestTypes);
-    }
-    
-    void removeAuthHook(const AuthClientHookPrx &hook, const Ice::Current&)
-    {
-        mPJSipManager->removeAuthClientHook(hook);
-    }
-    
-    void clearAuthHooks(const Ice::Current&)
-    {
-        mPJSipManager->clearAuthClientHooks();
-    }
-private:
-    PJSipManagerPtr mPJSipManager;
-};
-
-typedef IceUtil::Handle<SipAuthClientExtensionPoint> SipAuthClientExtensionPointPtr;
-
 /**
  * This private class initializes the startup and controls the shutdown of the component.
  */
@@ -211,10 +179,6 @@ private:
     AuthExtensionPointPrx mAuthExtensionPrx;
     LocatorRegistrationWrapperPtr mAuthExtensionRegistration;
 
-    SipAuthClientExtensionPointPtr mAuthClientExtension;
-    AuthExtensionPointPrx mAuthClientExtensionPrx;
-    LocatorRegistrationWrapperPtr mAuthClientExtensionRegistration;
-
     RegistrarListenerPtr mDefaultRegistrarListener;
     RegistrarListenerPrx mDefaultRegistrarListenerPrx;
 
@@ -249,10 +213,6 @@ void Component::preparePrimaryServicesForDiscovery()
         mAuthExtensionRegistration = wrapServiceForRegistration(mAuthExtensionPrx, 
                                                                  AsteriskSCF::SIP::V1::AuthExtensionPointCategory);
         managePrimaryService(mAuthExtensionRegistration);
-
-        mAuthClientExtensionRegistration = wrapServiceForRegistration(mAuthClientExtensionPrx, 
-                                                                 AsteriskSCF::SIP::V1::AuthClientExtensionPointCategory);
-        managePrimaryService(mAuthClientExtensionRegistration);
     }
     catch(const std::exception& e)
     {
@@ -590,11 +550,6 @@ void Component::createPrimaryServices()
         mAuthExtensionPrx = AuthExtensionPointPrx::uncheckedCast(
              getServiceAdapter()->add(mAuthExtension, getCommunicator()->stringToIdentity(AuthServiceId)));
         lg(Debug) << "Added Authentication extension point to object adapter";
-
-        mAuthClientExtension = new SipAuthClientExtensionPoint(mPJSipManager);
-        mAuthClientExtensionPrx = AuthClientExtensionPointPrx::uncheckedCast(
-             getServiceAdapter()->add(mAuthClientExtension, getCommunicator()->stringToIdentity(AuthClientServiceId)));
-        lg(Debug) << "Added Authentication client extension point to object adapter";
     }
     catch(const Ice::Exception& e)
     {
diff --git a/src/SipClientRegistration.h b/src/SipClientRegistration.h
index 79c7d18..9fce858 100644
--- a/src/SipClientRegistration.h
+++ b/src/SipClientRegistration.h
@@ -14,7 +14,9 @@
  * at the top of the source tree.
  */
 
-#include <pjsipua.h>
+#pragma once
+
+#include "AuthManager.h"
 
 namespace AsteriskSCF
 {
@@ -34,7 +36,7 @@ namespace SipSessionManager
 class SipRegistrationClientManager 
 {
 public:
-    SipRegistraitonClientManager();
+    SipRegistrationClientManager();
 
     void addAllow(const Ice::StringSeq& allows);
 

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


-- 
asterisk-scf/integration/sip.git