[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "party-id" updated.

[Commits to the Asterisk SCF project code repositories]

branch "party-id" has been updated
       via  2d131fb37e5d7e26958a4e8ebab1834bf54be44d (commit)
      from  5633e5d190e1e490fe108583808c2feb5572d2da (commit)

Summary of changes:
 .../SessionCommunicationsIf.ice                    |   84 ++++++++++++--------
 1 files changed, 52 insertions(+), 32 deletions(-)


- Log -----------------------------------------------------------------
commit 2d131fb37e5d7e26958a4e8ebab1834bf54be44d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Dec 2 16:02:44 2011 -0600

    Change to pass SessionInfo to addSessions and replaceSession so that
    identity information can be sent out.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 1202c50..b938374 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -95,37 +95,52 @@ module V1
      */
     class SessionInfo
     {
-    /**
-     * A proxy to the endpoint that initiated the current session.
-     */
-    SessionEndpoint* caller;
+        /**
+         * A proxy to the endpoint that initiated the current session.
+         */
+        SessionEndpoint* caller;
 
-    /**
-     * The duration of the 'connected' time for this session.
-     */
-    long connectedTime = 0;
+        /**
+         * The duration of the 'connected' time for this session.
+         */
+        long connectedTime = 0;
 
-    /**
-     * A textual description of the current state of the session. For
-     * example: pending, connected, hanging up.
-     */
-    string currentState;
+        /**
+         * A textual description of the current state of the session. For
+         * example: pending, connected, hanging up.
+         */
+        string currentState;
 
-    /**
-     * A proxy to the endpoint handling the destination session.
-     */
-    SessionEndpoint* destination;
+        /**
+         * A proxy to the endpoint handling the destination session.
+         */
+        SessionEndpoint* destination;
 
-    /**
-     * A textual description of this Session's role in the
-     * current communications.
-     */
-    string role;
+        /**
+         * A textual description of this Session's role in the
+         * current communications.
+         */
+        string role;
 
-    /**
-     * When the session was initiated.
-     */
-    AsteriskSCF::System::Time::V1::TimeMarker startTime;
+        /**
+         * When the session was initiated.
+         */
+        AsteriskSCF::System::Time::V1::TimeMarker startTime;
+
+        /**
+         * Id of the session
+         */
+        AsteriskSCF::SessionCommunications::PartyIdentification::V1::SessionOwnerId sessionOwner;
+
+        /**
+         * The connected line information for the session
+         */
+        AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine connectedLine;
+
+        /**
+         * The calling party for the session 
+         */
+        AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller callerID;
     };
 
     /**
@@ -816,8 +831,7 @@ module V1
                 string operationId,
                 Session* sessionToReplace,
                 Session* bridgedSession,
-                bool replaceSession,
-                AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine connectedLine)
+                bool replaceSession)
            throws SourceTerminatedPreBridgingException, BridgingException, NotBridged ;
     };
 
@@ -962,6 +976,14 @@ module V1
      */
     interface BridgeListener;
 
+    struct SessionWithSessionInfo
+    {
+        Session* sessionProxy;
+        SessionInfo info;
+    };
+
+    sequence<SessionWithSessionInfo> SessionWithSessionInfoSeq;
+
     /**
      * Bridge object manages the association of multiple sessions in the process
      * of communicating with each other.
@@ -981,8 +1003,7 @@ module V1
          */
         ["amd"]
         void addSessions(
-            SessionSeq session,
-            AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLineSeq connectedLines)
+            SessionWithSessionInfoSeq sessionInfos)
             throws InvalidSessions, BridgeSessionOperationFailed;
 
         /**
@@ -1053,8 +1074,7 @@ module V1
          */
         ["amd"]
         void replaceSession(Session* sessionToReplace,
-            SessionSeq newSessions,
-            AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLineSeq newConnectedLines)
+            SessionWithSessionInfoSeq newSessionInfos)
             throws InvalidSessions, SessionNotFound, BridgeSessionOperationFailed;
 
         /**

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


-- 
asterisk-scf/integration/slice.git