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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  01eef6fe209394a617e6d4c60c7e221f922e746e (commit)
      from  58022e8f814fef7c99f0b61a204c2d6a35fdf4aa (commit)

Summary of changes:
 local-slice/CMakeLists.txt            |    2 +
 local-slice/SipStateReplicationIf.ice |   43 ++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 17 deletions(-)


- Log -----------------------------------------------------------------
commit 01eef6fe209394a617e6d4c60c7e221f922e746e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Sep 10 13:59:45 2010 -0500

    Get the SipStateReplication.ice file compiling correctly.

diff --git a/local-slice/CMakeLists.txt b/local-slice/CMakeLists.txt
index 3c4aecb..11fc349 100644
--- a/local-slice/CMakeLists.txt
+++ b/local-slice/CMakeLists.txt
@@ -1,3 +1,5 @@
 # Compile SIP Channel Service Component's own slice
+hydra_slice_include_directories("${CMAKE_SOURCE_DIR}/slice") 
 hydra_compile_slice(SipIf.ice lib "SIP Service Slice Types" SipChannelService)
+hydra_compile_slice(SipStateReplicationIf.ice lib "SIP State Replicator" SipChannelService)
 #hydra_compile_slice(SipConfigurationIf.ice lib "SIP Configuration Slice Types" SipChannelService)
diff --git a/local-slice/SipStateReplicationIf.ice b/local-slice/SipStateReplicationIf.ice
index 98c9123..82eaafc 100644
--- a/local-slice/SipStateReplicationIf.ice
+++ b/local-slice/SipStateReplicationIf.ice
@@ -1,4 +1,7 @@
 #pragma once
+#include <Ice/BuiltinSequences.ice>
+#include "Media/MediaIf.ice"
+#include "SessionCommunications/SessionCommunicationsIf.ice"
 
 module AsteriskSCF
 {
@@ -8,20 +11,27 @@ module SIP
 module V1
 {
 
-   interface SipStateReplicator
+   class SipStateItem
    {
-      void addListener(SipStateReplicatorListener);
-	  idempotent void removeListener(SipStateReplicatorListener);
-	  void setDataItems(SipStateItemSeq);
-	  idempotent void removeDataItems(SipStateItemSeq);
-	  SipStateItemSeq getDataItems(Ice::StringSeq);
-	  SipStateItemSeq getAllDataItems();
    };
 
-   class SipStateItem
+   sequence<SipStateItem> SipStateItemSeq;
+
+   interface SipStateReplicatorListener
    {
+      void removeStateNotice(Ice::StringSeq itemKeys);
+	  void setStateNotice(SipStateItemSeq items);
    };
 
+   interface SipStateReplicator
+   {
+      void addListener(SipStateReplicatorListener listener);
+	  idempotent void removeListener(SipStateReplicatorListener listener);
+	  void setState (SipStateItemSeq items);
+	  idempotent void removeState(SipStateItemSeq items);
+	  SipStateItemSeq getState(Ice::StringSeq itemKeys);
+	  SipStateItemSeq getAllStates();
+   };
    class SipDialogStateItem extends SipStateItem
    {
       string mCallId;
@@ -43,21 +53,21 @@ module V1
 
 	  //Before any messages are sent. We'll likely not ever
 	  //have a transaction in this state, tbh.
-	  TRANSACTION_STATE_NULL,
+	  TransactionStateNull,
 	  //As UAC, we have sent a request
-	  TRANSACTION_STATE_CALLING,
+	  TransactionStateCalling,
 	  //As UAS, We have received a request
-	  TRANSACTION_STATE_TRYING,
+	  TransactionStateTrying,
 	  //We have sent or received a provisional response
-	  TRANSACTION_STATE_PROCEEDING,
+	  TransactionStateProceeding,
 	  //We have sent or received a final response
-	  TRANSACTION_STATE_COMPLETED,
+	  TransactionStateCompleted,
 	  //As UAS, we have received an ACK
-	  TRANSACTION_STATE_CONFIRMED,
+	  TransactionStateConfirmed,
 	  //As UAS or UAC, before the transaction is destroyed
-	  TRANSACTION_STATE_TERMINATED,
+	  TransactionStateTerminated,
 	  //As UAS or UAC, transaction has been destroyed
-	  TRANSACTION_STATE_DESTROYED,
+	  TransactionStateDestroyed
    };
 
    class TransactionStateItem extends SipStateItem
@@ -82,7 +92,6 @@ module V1
       AsteriskSCF::Media::V1::StreamSourceSeq mSources;
       AsteriskSCF::Media::V1::StreamSinkSeq mSinks;
       MediaSessionSeq mMediaSessions;
-      AsteriskSCF::SessionCommunications::V1::SessionListenerSeq mListeners;
    };
 
 }; //module V1

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


-- 
asterisk-scf/integration/sip.git