[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "initial_file_media_service" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Jan 5 07:41:42 CST 2012
branch "initial_file_media_service" has been updated
via 7eaa6b677537d7807cfff2899a7d56fe32da5b71 (commit)
via 3a6a28ee51aa76ece476458a9ed2f2644a2e2ea8 (commit)
via e6781a0e2c4e59afc64f0516ee00c9db4d2a2fcd (commit)
via 04a04a8c8e5680ff6f7078ad8f43a0f2e266fd38 (commit)
via 91b58e9770baa1a061ead750dfa37735de2d3f96 (commit)
via e66f3f817c0040399079e694a2daf9f2428a806f (commit)
via 5b5087822af513760276e8420960475109a0189d (commit)
via b9808b2a2ee906fc26c83da3ffbb45d0dff74145 (commit)
via 638e9046c77e66776a45ec35b57e1afe1bad3677 (commit)
via cc4688ee09c041560911a127f7d8bbf615f884b7 (commit)
via ed101f62c41865999698af473e585c077ce0fed9 (commit)
via 805907d78323c80802f17e1929ba1051bf2e1276 (commit)
via 2d131fb37e5d7e26958a4e8ebab1834bf54be44d (commit)
via d30be6ad2e0df0dce54107fcb38fb3a073372c7c (commit)
via 5633e5d190e1e490fe108583808c2feb5572d2da (commit)
via 67b49913b4b02e87aeab0c79f4ce756bf0c33f39 (commit)
via 6d3c833f9b9d44131d6738239b62f99b435fa1d3 (commit)
via 8a390c3ad711cc3a727019128083a523fa4c19cf (commit)
from 46af0e69c824bdd354740441115a7b93d98b926c (commit)
Summary of changes:
.../Core/Discovery/ServiceLocatorIf.ice | 10 +
.../{AudioFormats.ice => AudioFormatsIf.ice} | 0
.../{OtherFormats.ice => OtherFormatsIf.ice} | 0
.../{T38UdptlFormat.ice => T38UDPTLFormatIf.ice} | 0
slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice | 7 +-
slice/AsteriskSCF/Presence/PresenceIf.ice | 208 ++++++++++++++++++++
slice/AsteriskSCF/SIP/SIPRegistrarIf.ice | 4 +-
.../PartyIdentificationIf.ice | 69 +++++++-
.../SessionCommunicationsExtensionPointsIf.ice | 38 ++++
.../SessionCommunicationsIf.ice | 105 +++++++---
.../SessionCommunications/TelephonyEventsIf.ice | 12 ++
11 files changed, 417 insertions(+), 36 deletions(-)
rename slice/AsteriskSCF/Media/Formats/{AudioFormats.ice => AudioFormatsIf.ice} (100%)
rename slice/AsteriskSCF/Media/Formats/{OtherFormats.ice => OtherFormatsIf.ice} (100%)
rename slice/AsteriskSCF/Media/Formats/{T38UdptlFormat.ice => T38UDPTLFormatIf.ice} (100%)
create mode 100644 slice/AsteriskSCF/Presence/PresenceIf.ice
- Log -----------------------------------------------------------------
commit 7eaa6b677537d7807cfff2899a7d56fe32da5b71
Merge: e66f3f8 3a6a28e
Author: Brent Eagles <beagles at digium.com>
Date: Wed Jan 4 18:28:37 2012 -0330
Merge remote-tracking branch 'origin/master' into initial_file_media_service
commit 3a6a28ee51aa76ece476458a9ed2f2644a2e2ea8
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Jan 3 10:02:37 2012 -0600
The rename commit caused some issues...
Add "If" to the end of T38UDPTLFormat.ice
diff --git a/slice/AsteriskSCF/Media/Formats/T38UdptlFormatIf.ice b/slice/AsteriskSCF/Media/Formats/T38UDPTLFormatIf.ice
similarity index 100%
rename from slice/AsteriskSCF/Media/Formats/T38UdptlFormatIf.ice
rename to slice/AsteriskSCF/Media/Formats/T38UDPTLFormatIf.ice
commit e6781a0e2c4e59afc64f0516ee00c9db4d2a2fcd
Merge: 91b58e9 04a04a8
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Jan 3 10:01:16 2012 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice
commit 04a04a8c8e5680ff6f7078ad8f43a0f2e266fd38
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Jan 2 18:39:25 2012 -0400
Add a const for a dynamic payload.
diff --git a/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice b/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
index 6b166fb..f6489b2 100644
--- a/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
+++ b/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
@@ -51,6 +51,11 @@ module V1
sequence<string> SDPFormatParameterSeq;
/**
+ * Constant which indicates the payload is dynamic.
+ */
+ const int DynamicPayload = -1;
+
+ /**
* SDP Descriptor class. Contains description information for a media format.
*/
class SDPDescriptor
@@ -58,7 +63,7 @@ module V1
/**
* Numerical payload value given in the SDP.
*
- * If this is set to -1 the user of this descriptor should assign a dynamic payload
+ * If this is set to DynamicPayload the user of this descriptor should assign a dynamic payload
* themselves.
*/
int payload;
commit 91b58e9770baa1a061ead750dfa37735de2d3f96
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 27 12:18:54 2011 -0600
Add 'If' suffix to slice files that had this missing.
diff --git a/slice/AsteriskSCF/Media/Formats/AudioFormats.ice b/slice/AsteriskSCF/Media/Formats/AudioFormatsIf.ice
similarity index 100%
rename from slice/AsteriskSCF/Media/Formats/AudioFormats.ice
rename to slice/AsteriskSCF/Media/Formats/AudioFormatsIf.ice
diff --git a/slice/AsteriskSCF/Media/Formats/OtherFormats.ice b/slice/AsteriskSCF/Media/Formats/OtherFormatsIf.ice
similarity index 100%
rename from slice/AsteriskSCF/Media/Formats/OtherFormats.ice
rename to slice/AsteriskSCF/Media/Formats/OtherFormatsIf.ice
diff --git a/slice/AsteriskSCF/Media/Formats/T38UdptlFormat.ice b/slice/AsteriskSCF/Media/Formats/T38UdptlFormatIf.ice
similarity index 100%
rename from slice/AsteriskSCF/Media/Formats/T38UdptlFormat.ice
rename to slice/AsteriskSCF/Media/Formats/T38UdptlFormatIf.ice
commit e66f3f817c0040399079e694a2daf9f2428a806f
Merge: 46af0e6 5b50878
Author: Brent Eagles <beagles at digium.com>
Date: Thu Dec 22 15:38:49 2011 -0330
Merge remote-tracking branch 'origin/master' into initial_file_media_service
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 cc4688ee09c041560911a127f7d8bbf615f884b7
Merge: 2d131fb 805907d
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Dec 19 16:11:17 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice
commit 805907d78323c80802f17e1929ba1051bf2e1276
Author: Joshua Colp <jcolp at digium.com>
Date: Sun Dec 4 19:47:13 2011 -0400
Add facet for Service Locator Management interface and category for IceStorm topic manager. (issue ASTSCF-317)
diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index e8d5f8a..4874c9d 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -51,6 +51,16 @@ module V1
exception CompareNotFound { };
/**
+ * Category name used to find the built-in IceStorm topic manager service.
+ */
+ const string TopicManagerCategory = "TopicManager";
+
+ /**
+ * Facet used to retrieve the management interface using a locator proxy.
+ */
+ const string ServiceLocatorManagementFacet = "management";
+
+ /**
* Generic service locator parameters class that more specific parameter classes can extend.
* These parameters are used to register a service with the ServiceLocator, and to
* locate (i.e. query) the service.
commit d30be6ad2e0df0dce54107fcb38fb3a073372c7c
Author: Joshua Colp <jcolp at digium.com>
Date: Fri Nov 11 14:44:02 2011 -0400
Add presence design.
diff --git a/slice/AsteriskSCF/Presence/PresenceIf.ice b/slice/AsteriskSCF/Presence/PresenceIf.ice
new file mode 100644
index 0000000..dad6e6c
--- /dev/null
+++ b/slice/AsteriskSCF/Presence/PresenceIf.ice
@@ -0,0 +1,208 @@
+/*
+ * 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 Presence
+{
+
+["suppress"]
+module V1
+{
+ /**
+ * String representation of the version of this interface
+ */
+ const string Version = "V1";
+
+ /**
+ * Various states for presence
+ */
+ enum State
+ {
+ /**
+ * State of the given resource is not yet known.
+ */
+ UNKNOWN,
+
+ /**
+ * Resource is not in use.
+ */
+ NOTINUSE,
+
+ /**
+ * Resource is in use.
+ */
+ INUSE,
+
+ /**
+ * Resource is busy.
+ */
+ BUSY,
+
+ /**
+ * Given resource is invalid.
+ */
+ INVALID,
+
+ /**
+ * Resource is currently unavailable.
+ */
+ UNAVAILABLE,
+
+ /**
+ * Resource is ringing.
+ */
+ RINGING,
+
+ /**
+ * Resource is ringing and in use.
+ */
+ RINGINGINUSE,
+
+ /**
+ * Resource is on hold.
+ */
+ ONHOLD,
+
+ /**
+ * Resource is away.
+ */
+ AWAY,
+
+ /**
+ * Resource does not wish to be disturbed.
+ */
+ DONOTDISTURB,
+
+ /**
+ * Resource has been away for quite awhile.
+ */
+ EXTENDEDAWAY,
+
+ /**
+ * The state is not permitted to be known.
+ */
+ NOTPERMITTED,
+ };
+
+ /**
+ * Class which contains presence information about an resource
+ *
+ * This class can be extended to provide additional status information specific to
+ * the type of resource.
+ */
+ unsliceable class Status
+ {
+ /**
+ * Current state of the resource
+ */
+ State currentState;
+ };
+
+ /**
+ * Dictionary of resources and their status
+ */
+ dictionary<string, Status> ResourceStatusDict;
+
+ /**
+ * Interface for a presence consumer
+ */
+ interface Consumer
+ {
+ /**
+ * Method used to indicate that an resource has updated its status.
+ *
+ * @param resource Name of the resource that the status is for.
+ *
+ * @param newStatus Concrete class containing the status of the resource.
+ */
+ void update(ResourceStatusDict newStatus);
+ };
+
+ /**
+ * Class which contains authentication credentials, extended by the router implementation.
+ */
+ unsliceable class Credentials
+ {
+ };
+
+ /**
+ * Class which contains an authentication token, extended by the router implementation.
+ */
+ unsliceable class Token
+ {
+ };
+
+ /**
+ * Interface for a presence router
+ */
+ interface Router extends Consumer
+ {
+ /**
+ * Method used to authenticate with the router.
+ *
+ * @param authDetails Authentication credentials.
+ *
+ * @return Token An authentication token if authenticated, none if not.
+ */
+ idempotent Token authenticate(Credentials authDetails);
+
+ /**
+ * Method used to query for the current status of an resource.
+ *
+ * @param authToken Authentication token received when authenticate was called.
+ *
+ * @param resources Name of the resources to get the status for.
+ *
+ * @return ResourceStatusDict Dictionary containing status of requested resources.
+ */
+ idempotent ResourceStatusDict query(Token authToken, Ice::StringSeq resources);
+
+ /**
+ * Method used to subscribe to specific resource status updates.
+ *
+ * Note that the current status for each resource will be sent to the consumer before returning.
+ *
+ * @param authToken Authentication token received when authenticate was called.
+ *
+ * @param resources A sequence of resources to subscribe to.
+ *
+ * @param presenceConsumer A proxy to a consumer that will receive status updates for the resources.
+ *
+ * @see Consumer
+ */
+ void subscribe(Token authToken, Ice::StringSeq resources, Consumer *presenceConsumer);
+
+ /**
+ * Method used to unsubscribe from specific resource status updates.
+ *
+ * @param resources A sequence of resources that will no longer be subscribed to.
+ *
+ * @param presenceConsumer A proxy to the consumer that was subscribed.
+ */
+ void unsubscribe(Ice::StringSeq resources, Consumer *presenceConsumer);
+ };
+
+}; /* End of module V1 */
+
+}; /* End of module Presence */
+
+}; /* End of module AsteriskSCF */
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list