[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  5b5087822af513760276e8420960475109a0189d (commit)
       via  b9808b2a2ee906fc26c83da3ffbb45d0dff74145 (commit)
       via  638e9046c77e66776a45ec35b57e1afe1bad3677 (commit)
       via  ed101f62c41865999698af473e585c077ce0fed9 (commit)
      from  cc4688ee09c041560911a127f7d8bbf615f884b7 (commit)

Summary of changes:
 slice/AsteriskSCF/SIP/SIPRegistrarIf.ice           |    4 ++--
 .../SessionCommunications/TelephonyEventsIf.ice    |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 5b5087822af513760276e8420960475109a0189d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Oct 26 16:44:41 2011 -0500

    Adjust definitions of new telephony events to not have a begin and end event.

diff --git a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
index 710bc03..2e7443b 100644
--- a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
@@ -77,42 +77,18 @@ module V1
     {
     };
 
-    unsliceable class BeginCEDEvent extends TelephonyEvent
+    unsliceable class CEDEvent extends TelephonyEvent
     {
     };
 
-    unsliceable class EndCEDEvent extends TelephonyEvent
+    unsliceable class CNGEvent extends TelephonyEvent
     {
-        /**
-         * The total duration of the event in milliseconds.
-         */
-        int duration;
-    };
-
-    unsliceable class BeginCNGEvent extends TelephonyEvent
-    {
-    };
-
-    unsliceable class EndCNGEvent extends TelephonyEvent
-    {
-        /**
-         * The total duration of the event in milliseconds.
-         */
-        int duration;
     };
 
-    unsliceable class BeginV21Event extends TelephonyEvent
+    unsliceable class V21Event extends TelephonyEvent
     {
     };
 
-    unsliceable class EndV21Event extends TelephonyEvent
-    {
-        /**
-         * The total duration of the event in milliseconds.
-         */
-        int duration;
-    };
-
     interface TelephonyEventSink;
     sequence<TelephonyEventSink*> TelephonyEventSinkSeq;
 

commit b9808b2a2ee906fc26c83da3ffbb45d0dff74145
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Oct 3 17:05:27 2011 -0500

    Add some new telephony events we'll be detecting in-band.

diff --git a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
index 4b99ba1..710bc03 100644
--- a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
@@ -77,6 +77,42 @@ module V1
     {
     };
 
+    unsliceable class BeginCEDEvent extends TelephonyEvent
+    {
+    };
+
+    unsliceable class EndCEDEvent extends TelephonyEvent
+    {
+        /**
+         * The total duration of the event in milliseconds.
+         */
+        int duration;
+    };
+
+    unsliceable class BeginCNGEvent extends TelephonyEvent
+    {
+    };
+
+    unsliceable class EndCNGEvent extends TelephonyEvent
+    {
+        /**
+         * The total duration of the event in milliseconds.
+         */
+        int duration;
+    };
+
+    unsliceable class BeginV21Event extends TelephonyEvent
+    {
+    };
+
+    unsliceable class EndV21Event extends TelephonyEvent
+    {
+        /**
+         * The total duration of the event in milliseconds.
+         */
+        int duration;
+    };
+
     interface TelephonyEventSink;
     sequence<TelephonyEventSink*> TelephonyEventSinkSeq;
 

commit 638e9046c77e66776a45ec35b57e1afe1bad3677
Merge: cc4688e ed101f6
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 20 13:14:21 2011 -0600

    Merge branch 'registrar-bugs'


commit ed101f62c41865999698af473e585c077ce0fed9
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Dec 8 16:00:20 2011 -0600

    s/BindingDict/BindingsDict/g

diff --git a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
index dde63e9..c9ec943 100644
--- a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@ -54,7 +54,7 @@ class Binding
 
 sequence<Binding> BindingSeq;
 
-dictionary<string, BindingSeq> BindingDict;
+dictionary<string, BindingSeq> BindingsDict;
 
 struct BindingUpdate
 {
@@ -114,7 +114,7 @@ interface Registrar
      /**
       * Get the mapping of all active registrations.
       */
-     ["amd"] BindingDict getAllBindings();
+     ["amd"] BindingsDict getAllBindings();
      /**
       * Get all bindings associated with a particular AoR
       */

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


-- 
asterisk-scf/release/slice.git