[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "sip-registrar" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jun 24 16:33:48 CDT 2011
branch "sip-registrar" has been updated
via 922a60880d6a1a313aa250f243ef671d10d64c27 (commit)
via 6786e051d63a177aee32b9be60e2df22513f75a9 (commit)
via 5bde5f1c7c787eb41293f1e14a69290a2bb1058a (commit)
via 7d3ebe303cee764b2ce58a7499d6dbf9e2dd04e6 (commit)
via 1544a2085af033d12cdec6a9be116acf4ee4f341 (commit)
via 8751373590bafab2a98e2128342b904f0a89bea7 (commit)
via 8e88ba6bbf08d0ccf50a3a6c47cb8aad7854099e (commit)
via 4373520fd6130317f96006cbf5d46f476bfa5cf7 (commit)
via b6bd3b77265589eb3d424f17ef499a37893694c7 (commit)
via a5e49d8afb63390b01f78db08d4f3405b0f3290c (commit)
via ab03f51f5e0a740bba0de6cb3263095196e77c29 (commit)
via 245a2ce4db47a58d4b967667f4f69965e5ae0856 (commit)
via 00b74e2a2f13a5cb8f5308badf97cc3d37bd0365 (commit)
via 2563dc534c1c1dd977606e06baf9334b4317bd73 (commit)
via bd989360809bba998965c8a5a37d3f55436e7bf0 (commit)
via 66522803de9fbc42e49c39a45d677825da891ca9 (commit)
via 7d15ef019ad837e02c0380c63553981993b7fb82 (commit)
via 7a93902486638e01bb3170fa4d70eb72426b807e (commit)
via 941c14fc79f8c2e47957b2db994a9412734a49d0 (commit)
via c06dbbefb20ab2f3bb3b2fbdf1eb714d304af928 (commit)
via 1580f446b72d71abf9d49ec938d4b58e96d65792 (commit)
via 98b9c735d7af93117d6320c5df05d200659f5161 (commit)
via 1443edddb16e1ac462e51a1accbac8f225117356 (commit)
via db0812c0c896d51c136cb89fa3f7a14ba22ebf31 (commit)
via 531f5fd38f97fbc3220f902a979bf172db50fdd2 (commit)
via ccc9fef2f724df94c7b313a815eda7dcb43ddcda (commit)
via 9f9d5030c25864f2998439d0a648553a71528128 (commit)
via ed832a3e584ad82c47f5f3c76c1f024b91566420 (commit)
via 93dd1c75d62768e08bd1a36dc46b3b9fabeee9d2 (commit)
via f98052b0ad439cf31b1c3b0ba8991b095fa01fcd (commit)
via 5b26f4b5105b12808c7fe6159a947b0be28be2e6 (commit)
via e077c00402daaa531633522876fe75f3b8f4bf8b (commit)
via c2f50ada09a97344830c244f5a875cb3b6527202 (commit)
via 20084e7794523ce2a8d631b3246868a00676e92d (commit)
via 86ae6dcd9240f59c511281c63a4ee10f4d897473 (commit)
via 0e6af3eb07af0e4d4dd415d89926d368abb5d457 (commit)
via eae5f79313d4e024b751d169b9ede161327c916e (commit)
via b2f2ff479f36b49511c0ed021b488d7ca2996774 (commit)
via 015148f4e1d0f9f3853d8c4c445a0c95f260c92e (commit)
via 5264bb1474a0b712b49fd4ea7c82890bdea007f2 (commit)
from bb2ce37d33e6da470bb55622c5354e81f7551ef0 (commit)
Summary of changes:
.../SessionCommunicationsIf.ice | 819 ----------------
.../System/Component/ComponentServiceIf.ice | 89 --
AsteriskSCF/System/Component/ConfigurationIf.ice | 170 ----
AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice | 57 --
AsteriskSCF/System/WorkQueue/WorkQueueIf.ice | 115 ---
CMakeLists.txt | 26 +-
asterisk-scf-api.csproj => astscf-api.csproj | 46 +-
asterisk-scf-api.sln => astscf-api.sln | 2 +-
build.xml | 18 +-
dox-csharp.config | 4 +-
make-mono-api.sh | 10 +-
make-python-api.sh | 8 +-
make-ruby-api.sh | 8 +-
pom.xml.in | 2 +-
.../Core/Discovery/ServiceLocatorEventsIf.ice | 0
.../Core/Discovery/ServiceLocatorIf.ice | 2 +-
.../AsteriskSCF}/Core/Endpoint/EndpointIf.ice | 0
.../AsteriskSCF}/Core/Routing/RoutingIf.ice | 119 ++--
.../AsteriskSCF}/Media/MediaIf.ice | 10 +-
.../AsteriskSCF}/Media/RTP/MediaRTPIf.ice | 24 +-
.../AsteriskSCF}/SIP/SIPExtensionPointIf.ice | 0
.../AsteriskSCF}/SIP/SIPRegistrarIf.ice | 6 +-
.../ISDNPartyIdentificationIf.ice | 108 +++
.../PartyIdentificationIf.ice | 186 ++++
.../SessionCommunicationsIf.ice | 1016 ++++++++++++++++++++
.../System/Component/ComponentServiceIf.ice | 119 +++
.../System/Component/ConfigurationIf.ice | 203 ++++
.../AsteriskSCF}/System/Component/ReplicaIf.ice | 0
.../AsteriskSCF}/System/ExceptionsIf.ice | 0
.../AsteriskSCF}/System/Hook/HookIf.ice | 0
.../AsteriskSCF}/System/Logger/LoggerIf.ice | 0
.../AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice | 132 +++
.../AsteriskSCF}/System/Time/TimeIf.ice | 0
slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice | 276 ++++++
slice/CMakeLists.txt | 12 +
sliceCSharpHelp.shfbproj | 2 +-
36 files changed, 2193 insertions(+), 1396 deletions(-)
delete mode 100644 AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
delete mode 100644 AsteriskSCF/System/Component/ComponentServiceIf.ice
delete mode 100644 AsteriskSCF/System/Component/ConfigurationIf.ice
delete mode 100644 AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
delete mode 100644 AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
rename asterisk-scf-api.csproj => astscf-api.csproj (64%)
rename asterisk-scf-api.sln => astscf-api.sln (84%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Discovery/ServiceLocatorEventsIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Discovery/ServiceLocatorIf.ice (99%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Endpoint/EndpointIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Routing/RoutingIf.ice (73%)
rename {AsteriskSCF => slice/AsteriskSCF}/Media/MediaIf.ice (97%)
rename {AsteriskSCF => slice/AsteriskSCF}/Media/RTP/MediaRTPIf.ice (85%)
rename {AsteriskSCF => slice/AsteriskSCF}/SIP/SIPExtensionPointIf.ice (100%)
copy {AsteriskSCF => slice/AsteriskSCF}/SIP/SIPRegistrarIf.ice (94%)
create mode 100644 slice/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
create mode 100644 slice/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
create mode 100644 slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
create mode 100644 slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
create mode 100644 slice/AsteriskSCF/System/Component/ConfigurationIf.ice
rename {AsteriskSCF => slice/AsteriskSCF}/System/Component/ReplicaIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/ExceptionsIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Hook/HookIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Logger/LoggerIf.ice (100%)
create mode 100644 slice/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
rename {AsteriskSCF => slice/AsteriskSCF}/System/Time/TimeIf.ice (100%)
create mode 100644 slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
create mode 100644 slice/CMakeLists.txt
- Log -----------------------------------------------------------------
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 6786e051d63a177aee32b9be60e2df22513f75a9
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 23 13:24:46 2011 -0500
Provide a real path to astscf_slice_collection().
There is at least one version of CMake that has a different 'current directory'
when astscf_slice_collection() is executed than these scripts expect... so
instead, pass a complete path to that function so the current directory won't
matter.
diff --git a/slice/CMakeLists.txt b/slice/CMakeLists.txt
index 06616e2..a0e40bd 100644
--- a/slice/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -1,6 +1,6 @@
astscf_slice_collection(GLOBAL
NAME ASTSCF
- PATH .
+ PATH "${CMAKE_CURRENT_SOURCE_DIR}"
HEADERS "${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF"
LIBRARY astscf-api
)
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list