[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "srtp-support" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jul 15 14:29:57 CDT 2011
branch "srtp-support" has been updated
via dfddb7451c6a3f01e9115315c21084487903b006 (commit)
via 94ad9deef3e73d3dc1562e60d65e0ab6983a1338 (commit)
via d14c43207fc22427d0c882c58c777bddddcae8e8 (commit)
via c853d2a6d817055093fbbfa854bf337a6d6874d5 (commit)
via 1672cd37f8e1dbb9d2e8627387839939a95d9c43 (commit)
via 88ffb9a73f100b9ff902a0fc5be754c57d6e9646 (commit)
via 219a552954cf8b42990dd2e0eac55ec77be841c3 (commit)
via 922a60880d6a1a313aa250f243ef671d10d64c27 (commit)
via bb2ce37d33e6da470bb55622c5354e81f7551ef0 (commit)
via 2b555571b4b13f4de4b60f42b5b7058f2f692ca3 (commit)
from 1b4850227cc3f579cec510fc124fa013a1363888 (commit)
Summary of changes:
AsteriskSCF/SIP/SIPRegistrarIf.ice | 125 +++++++++++++++++++
slice/AsteriskSCF/Media/MediaIf.ice | 2 +-
slice/AsteriskSCF/SIP/SIPRegistrarIf.ice | 127 ++++++++++++++++++++
.../SessionCommunicationsIf.ice | 80 ++++++++++++-
4 files changed, 328 insertions(+), 6 deletions(-)
create mode 100644 AsteriskSCF/SIP/SIPRegistrarIf.ice
create mode 100644 slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
- Log -----------------------------------------------------------------
commit dfddb7451c6a3f01e9115315c21084487903b006
Merge: 1b48502 94ad9de
Author: Brent Eagles <beagles at digium.com>
Date: Fri Jul 15 14:16:52 2011 -0230
Merge branch 'master' into srtp-support
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 d14c43207fc22427d0c882c58c777bddddcae8e8
Author: Brent Eagles <beagles at digium.com>
Date: Thu Jul 14 20:02:29 2011 -0230
Slice changes for bridge cookie support
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 5fdec3e..3ad3bc3 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -122,7 +122,7 @@ module V1
*
* @see SessionCookies
*/
- ["preserved"] class SessionCookie
+ unsliceable class SessionCookie
{
};
@@ -695,6 +695,32 @@ module V1
};
/**
+ * Generic base class for bridge 'cookies', opaque data items that can be
+ * stored on a Bridge and retrieved via the BridgeListener
+ * interface when events occur on that Bridge.
+ *
+ * @see BridgeListener
+ *
+ * @see BridgeCookies
+ */
+ unsliceable class BridgeCookie
+ {
+ };
+
+ /**
+ * A sequence of bridge cookies, allowing for a variable number of them
+ * to be passed in a single operation or event.
+ *
+ * @see BridgeListener
+ */
+ sequence <BridgeCookie> BridgeCookies;
+
+ /**
+ * A dictionary of bridge cookies, used for storing them.
+ */
+ dictionary<string, BridgeCookie> BridgeCookieDict;
+
+ /**
* Forward declaration for the BridgeListener interface.
*/
interface BridgeListener;
@@ -789,6 +815,42 @@ module V1
["amd"]
void replaceSession(Session* sessionToReplace, SessionSeq newSessions)
throws InvalidSessions, SessionNotFound, BridgeSessionOperationFailed;
+
+ /**
+ * Set (or replace) cookies on the Bridge.
+ *
+ * @param cookies A sequence of one or more concrete objects,
+ * each of which are of a type derived from BridgeCookie. The
+ * bridge will store these cookies on the bridge, replacing any
+ * existing cookies with matching types.
+ *
+ * @note There can only be one cookie of a given type associated
+ * with a Bridge.
+ **/
+ void setCookies(BridgeCookies cookies);
+
+ /**
+ * Remove cookies from the Bridge.
+ *
+ * @param cookies A sequence of one or more concrete objects,
+ * each of which are of a type derived from BridgeCookie.
+ * The bridge will remove any cookies on the bridge
+ * with types that match the ones in this sequence; the
+ * content of the supplied cookies is not compared.
+ **/
+ void removeCookies(BridgeCookies cookies);
+
+ /**
+ * Get cookies stored on the Bridge.
+ *
+ * @param cookieTypes A sequence of zero or more concrete objects,
+ * each of which are of a type derived from BridgeCookie.
+ *
+ * @return A sequence of zero or more cookies from the bridge,
+ * with types that match the types of the template cookies
+ * provided in the cookieTypes parameter.
+ **/
+ BridgeCookies getCookies(BridgeCookies cookieTypes);
};
/**
@@ -806,8 +868,10 @@ module V1
* @param sessionBridge The bridge object the sessions were added to.
*
* @param sessions A sequence of session proxies that were added to the bridge.
+ *
+ * @param cookies A sequence of bridge cookies that are associated with the bridge.
*/
- void sessionsAdded(Bridge* sessionBridge, SessionSeq sessions);
+ void sessionsAdded(Bridge* sessionBridge, SessionSeq sessions, BridgeCookies cookies);
/**
* Called when sessions have been removed from a bridge.
@@ -816,22 +880,28 @@ module V1
*
* @param sessions A sequence of session proxies that were removed from
* the bridge.
+ *
+ * @param cookies A sequence of bridge cookies that are associated with the bridge.
*/
- void sessionsRemoved(Bridge* sessionBridge, SessionSeq sessions);
+ void sessionsRemoved(Bridge* sessionBridge, SessionSeq sessions, BridgeCookies cookies);
/**
* Called when a bridge has completed shutdown/destruction.
*
* @param sessionBridge The bridge that was stopped.
+ *
+ * @param cookies A sequence of bridge cookies that are associated with the bridge.
*/
- void stopped(Bridge* sessionBridge);
+ void stopped(Bridge* sessionBridge, BridgeCookies cookies);
/**
* Called when a bridge has started shutdown/destruction operations.
*
* @param sessionBrdige The bridge that is stopping.
+ *
+ * @param cookies A sequence of bridge cookies that are associated with the bridge.
*/
- void stopping(Bridge* sessionBridge);
+ void stopping(Bridge* sessionBridge, BridgeCookies cookies);
};
/**
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'
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list