[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Jul 14 17:54:05 CDT 2011
branch "master" has been updated
via 94ad9deef3e73d3dc1562e60d65e0ab6983a1338 (commit)
via c853d2a6d817055093fbbfa854bf337a6d6874d5 (commit)
via 88ffb9a73f100b9ff902a0fc5be754c57d6e9646 (commit)
via 219a552954cf8b42990dd2e0eac55ec77be841c3 (commit)
via 922a60880d6a1a313aa250f243ef671d10d64c27 (commit)
via bb2ce37d33e6da470bb55622c5354e81f7551ef0 (commit)
via 2b555571b4b13f4de4b60f42b5b7058f2f692ca3 (commit)
from d14c43207fc22427d0c882c58c777bddddcae8e8 (commit)
Summary of changes:
AsteriskSCF/SIP/SIPRegistrarIf.ice | 125 +++++++++++++++++++++++++++++
slice/AsteriskSCF/SIP/SIPRegistrarIf.ice | 127 ++++++++++++++++++++++++++++++
2 files changed, 252 insertions(+), 0 deletions(-)
create mode 100644 AsteriskSCF/SIP/SIPRegistrarIf.ice
create mode 100644 slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
- Log -----------------------------------------------------------------
commit 94ad9deef3e73d3dc1562e60d65e0ab6983a1338
Merge: c853d2a d14c432
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Jul 14 17:54:29 2011 -0500
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice
commit c853d2a6d817055093fbbfa854bf337a6d6874d5
Merge: 1672cd3 88ffb9a
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Jul 14 17:14:48 2011 -0500
Merge branch 'sip-registrar'
commit 88ffb9a73f100b9ff902a0fc5be754c57d6e9646
Author: Mark Michelson <mmichelson at digium.com>
Date: Sun Jun 26 22:39:22 2011 -0500
Switch Registrar operations to be AMD.
diff --git a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
index 1b4c843..9190677 100644
--- a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@ -106,19 +106,19 @@ interface Registrar
* The return value is the map of all AoRs and their
* bindings.
*/
- ContactDict addListener(RegistrarListener *listener);
+ ["amd"] ContactDict addListener(RegistrarListener *listener);
/**
* Remove a listener.
*/
- void removeListener(RegistrarListener *listener);
+ ["amd"] void removeListener(RegistrarListener *listener);
/**
* Get the mapping of all active registrations.
*/
- BindingDict getAllBindings();
+ ["amd"] BindingDict getAllBindings();
/**
* Get all bindings associated with a particular AoR
*/
- BindingSeq getAORBindings(string aor);
+ ["amd"] BindingSeq getAORBindings(string aor);
};
}; // end module V1
commit 219a552954cf8b42990dd2e0eac55ec77be841c3
Merge: 922a608 c1445ed
Author: Mark Michelson <mmichelson at digium.com>
Date: Sat Jun 25 16:06:19 2011 -0500
Merge branch 'master' into sip-registrar
commit 922a60880d6a1a313aa250f243ef671d10d64c27
Merge: bb2ce37 6786e05
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jun 24 16:16:42 2011 -0500
Merge branch 'master' into sip-registrar
Conflicts:
CMakeLists.txt
diff --cc slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
index 0000000,0000000..1b4c843
new file mode 100644
--- /dev/null
+++ b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@@ -1,0 -1,0 +1,127 @@@
++/*
++ * Asterisk SCF -- An open-source communications framework.
++ *
++ * Copyright (C) 2011, Digium, Inc.
++ *
++ * See http://www.asterisk.org for more information about
++ * the Asterisk SCF project. Please do not directly contact
++ * any of the maintainers of this project for assistance;
++ * the project provides a web site, mailing lists and IRC
++ * channels for your use.
++ *
++ * This program is free software, distributed under the terms of
++ * the GNU General Public License Version 2. See the LICENSE.txt file
++ * at the top of the source tree.
++ */
++
++#pragma once
++
++#include <Ice/BuiltinSequences.ice>
++
++module AsteriskSCF
++{
++
++module SIP
++{
++
++module Registration
++{
++
++["suppress"]
++module V1
++{
++
++class Binding
++{
++ /**
++ * The contact URI associated with this particular Binding.
++ */
++ string contact;
++ /**
++ * The Call-ID from the latest successful Binding.
++ */
++ string callid;
++ /**
++ * The CSeq from the latest successful Binding.
++ */
++ int cseq;
++ /**
++ * A UNIX timestamp indicating when the Binding is set
++ * to expire
++ */
++ int expiration;
++};
++
++sequence<Binding> BindingSeq;
++
++dictionary<string, BindingSeq> BindingDict;
++
++struct BindingUpdate
++{
++ /**
++ * The AoR for which bindings have been updated
++ */
++ string aor;
++ /**
++ * The contacts from all bindings for this AoR
++ */
++ Ice::StringSeq contacts;
++};
++
++sequence<BindingUpdate> BindingUpdateSeq;
++
++/**
++ * A RegistrarListener is updated when a binding changes.
++ * Typical RegistrarListeners will be SIP services that
++ * require up-to-date information.
++ */
++interface RegistrarListener
++{
++ /**
++ * Alerts the listener that contacts have been added.
++ * The AoR may be new or it may have previous
++ * bindings.
++ */
++ void contactsAdded(BindingUpdateSeq contacts);
++ /**
++ * Alerts the listener that contacts have been removed.
++ * There is no specific call for indicating that an AoR
++ * no longer has contacts associated with it. After this
++ * method has been called, listeners should take
++ * appropriate action if the AoR has no bound contacts.
++ */
++ void contactsRemoved(BindingUpdateSeq contacts);
++};
++
++/**
++ * A dictionary mapping
++ * AoRs to their bound contacts
++ */
++dictionary<string, Ice::StringSeq> ContactDict;
++
++interface Registrar
++{
++ /**
++ * Add a new listener to the registrar.
++ * The return value is the map of all AoRs and their
++ * bindings.
++ */
++ ContactDict addListener(RegistrarListener *listener);
++ /**
++ * Remove a listener.
++ */
++ void removeListener(RegistrarListener *listener);
++ /**
++ * Get the mapping of all active registrations.
++ */
++ BindingDict getAllBindings();
++ /**
++ * Get all bindings associated with a particular AoR
++ */
++ BindingSeq getAORBindings(string aor);
++};
++
++}; // end module V1
++}; // end module Registration
++}; // end module SIP
++}; // end module AsteriskSCF
commit bb2ce37d33e6da470bb55622c5354e81f7551ef0
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon May 9 10:49:54 2011 -0500
Use proper cmake command for adding ice libraries to a component.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f26841..426d6c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
asterisk_scf_component_add_slice(asterisk-scf-api
GLOB_RECURSE "AsteriskSCF/*.ice")
-asterisk_scf_add_ice_libraries(Ice IceUtil)
+asterisk_scf_component_add_ice_libraries(asterisk-scf-api Ice IceUtil)
asterisk_scf_component_build_library(asterisk-scf-api)
set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
commit 2b555571b4b13f4de4b60f42b5b7058f2f692ca3
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Mar 25 17:15:25 2011 -0500
Copy Registrar interface from wiki.
diff --git a/AsteriskSCF/SIP/SIPRegistrarIf.ice b/AsteriskSCF/SIP/SIPRegistrarIf.ice
new file mode 100644
index 0000000..508871c
--- /dev/null
+++ b/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@ -0,0 +1,125 @@
+/*
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2011, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
+
+#pragma once
+
+#include <Ice/BuiltinSequences.ice>
+
+module AsteriskSCF
+{
+
+module SIP
+{
+
+module Registration
+{
+
+["suppress"]
+module V1
+{
+
+class Binding
+{
+ /**
+ * The contact URI associated with this particular Binding.
+ */
+ string contact;
+ /**
+ * The Call-ID from the latest successful Binding.
+ */
+ string callid;
+ /**
+ * The CSeq from the latest successful Binding.
+ */
+ int cseq;
+ /**
+ * A UNIX timestamp indicating when the Binding is set
+ * to expire
+ */
+ int expiration;
+};
+
+sequence<Binding> BindingSeq;
+
+dictionary<string, BindingSeq> BindingDict;
+
+struct BindingUpdate
+{
+ /**
+ * The AoR for which bindings have been updated
+ */
+ string aor;
+ /**
+ * The contacts from all bindings for this AoR
+ */
+ Ice::StringSeq contacts;
+};
+
+/**
+ * A RegistrarListener is updated when a binding changes.
+ * Typical RegistrarListeners will be SIP services that
+ * require up-to-date information.
+ */
+interface RegistrarListener
+{
+ /**
+ * Alerts the listener that contacts have been added.
+ * The AoR may be new or it may have previous
+ * bindings.
+ */
+ void contactsAdded(BindingUpdate contacts);
+ /**
+ * Alerts the listener that contacts have been removed.
+ * There is no specific call for indicating that an AoR
+ * no longer has contacts associated with it. After this
+ * method has been called, listeners should take
+ * appropriate action if the AoR has no bound contacts.
+ */
+ void contactsRemoved(BindingUpdate contacts);
+};
+
+/**
+ * A dictionary mapping
+ * AoRs to their bound contacts
+ */
+dictionary<string, Ice::StringSeq> ContactDict;
+
+interface Registrar
+{
+ /**
+ * Add a new listener to the registrar.
+ * The return value is the map of all AoRs and their
+ * bindings.
+ */
+ ContactDict addListener(RegistrarListener *listener);
+ /**
+ * Remove a listener.
+ */
+ void removeListener(RegistrarListener *listener);
+ /**
+ * Get the mapping of all active registrations.
+ */
+ BindingDict getAllBindings();
+ /**
+ * Get all bindings associated with a particular AoR
+ */
+ BindingSeq getAORBindings(string aor);
+};
+
+}; // end module V1
+}; // end module Registration
+}; // end module SIP
+}; // end module AsteriskSCF
-----------------------------------------------------------------------
--
asterisk-scf/release/slice.git
More information about the asterisk-scf-commits
mailing list