[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  705e8430d13ea8dd8f7e19e78ce87efba4a10e8d (commit)
       via  95d9346329391ea7d497cc8bf8d76b634d5f313b (commit)
       via  e7525092f2e56e26419aad5e9a43dcae4ac6fe1e (commit)
       via  af94ee80bbe26b3dc287a156e1d856c2f09a6226 (commit)
      from  863f7198cb53dd4c60b11f8bfe3d2e8a8b8f7160 (commit)

Summary of changes:
 .../SessionCommunicationsExtensionPointsIf.ice     |    1 +
 .../SessionCommunicationsIf.ice                    |   21 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 705e8430d13ea8dd8f7e19e78ce87efba4a10e8d
Merge: 95d9346 863f719
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Aug 18 12:34:53 2011 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice


commit 95d9346329391ea7d497cc8bf8d76b634d5f313b
Merge: 01d2120 e752509
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Aug 18 09:30:19 2011 -0500

    Merge branch 'oneshot-hooks'


commit e7525092f2e56e26419aad5e9a43dcae4ac6fe1e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Jul 28 13:11:00 2011 -0500

    Add cookies to the session creation hook.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
index cad714b..0ddc97b 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
@@ -38,6 +38,7 @@ module V1
     {
         AsteriskSCF::SessionCommunications::V1::Session *session;
         AsteriskSCF::SessionCommunications::V1::SessionListenerSeq listeners;
+        AsteriskSCF::SessionCommunications::V1::SessionCookies cookies;
     };
 
     interface SessionCreationHook

commit af94ee80bbe26b3dc287a156e1d856c2f09a6226
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Jul 25 15:56:20 2011 -0500

    Initial changes to allow for one-shot hooks from routing operations.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 8131772..896bd22 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -29,6 +29,18 @@ module AsteriskSCF
 module SessionCommunications
 {
 
+module ExtensionPoints
+{
+
+module V1
+{
+
+    interface SessionCreationHook;
+
+}; //module V1
+
+}; //module ExtensionPoints
+
 ["suppress"]
 module V1
 {
@@ -557,7 +569,8 @@ module V1
          * @throws BridgingException if the bridge could not be setup properly.
          */
         ["amd"]
-        void routeSession(string operationId, Session* source, string destination)
+        void routeSession(string operationId, Session* source, string destination,
+                AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook)
            throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
            EndpointUnreachableException, SessionCreationException,
            SourceTerminatedPreBridgingException, BridgingException ;
@@ -586,7 +599,8 @@ module V1
          * @throws NotBridged if the provided session is not currently in a bridge.
          */
         ["amd"]
-        void connectBridgedSessionsWithDestination(string operationId, Session* sessionToReplace, string destination)
+        void connectBridgedSessionsWithDestination(string operationId, Session* sessionToReplace, string destination,
+                AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook)
            throws AsteriskSCF::Core::Routing::V1::DestinationNotFoundException,
            SessionCreationException,
            SourceTerminatedPreBridgingException, BridgingException, NotBridged ;
@@ -639,7 +653,8 @@ module V1
          * @return A newly created session object for the destination.
          *
          */
-        Session* createSession(string destination, SessionListener* callback);
+        Session* createSession(string destination, SessionListener* callback,
+                AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* oneShotHook);
 
         /**
          * Returns the active sessions for this session endpoint.

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


-- 
asterisk-scf/release/slice.git