[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "client-auth" updated.

[Commits to the Asterisk SCF project code repositories]

branch "client-auth" has been updated
       via  1b7505e4fffb20d625ee87a9fc4609ac342d97c1 (commit)
      from  e1d7bec2ebf996566cdf548790c8e4b8d6f7af70 (commit)

Summary of changes:
 slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice |   35 ++++++++-----------------
 1 files changed, 11 insertions(+), 24 deletions(-)


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

    There's no good reason to have two separate hooks.

diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index accefb4..06ef9be 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -169,9 +169,19 @@ module V1
 
     sequence<DigestChallenge> DigestChallengeSeq;
 
+    struct ClientAuth
+    {
+        string realm;
+        string user;
+        string password;
+    };
+
+    sequence<ClientAuth> ClientAuthSeq;
+
     interface AuthHook
     {
-	AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+	    AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+        AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
     };
 
     enum RequestType
@@ -201,29 +211,6 @@ module V1
 	void clearAuthHooks();
     };
 
-    struct ClientAuth
-    {
-        string realm;
-        string user;
-        string password;
-    };
-
-    sequence<ClientAuth> ClientAuthSeq;
-
-    interface AuthClientHook
-    {
-        AsteriskSCF::System::Hook::V1::HookResult getCredentials(string endpointName, Ice::StringSeq realms, out ClientAuthSeq auths);
-    };
-
-    sequence<AuthClientHook*> AuthClientHookSeq;
-
-    interface AuthClientExtensionPoint
-    {
-        void addAuthClientHook(AuthClientHook *hook, int priority, RequestTypeSeq requestTypes);
-        void removeAuthClientHook(AudhClientHook *hook);
-        void clearAuthClientHooks();
-    }
-
 }; /* End of module V1 */
 
 }; /* End of module ExtensionPoint */

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


-- 
asterisk-scf/integration/slice.git