[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "session_cookies" created.

[Commits to the Asterisk SCF project code repositories]

branch "session_cookies" has been created
        at  1ecfe71a087fe5252d51d8e0bf95251d82f80867 (commit)

- Log -----------------------------------------------------------------
commit 1ecfe71a087fe5252d51d8e0bf95251d82f80867
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Mar 21 11:58:47 2011 -0300

    Add bits for session cookies.

diff --git a/src/SessionRouter.cpp b/src/SessionRouter.cpp
index 30abafe..2f6aa6a 100644
--- a/src/SessionRouter.cpp
+++ b/src/SessionRouter.cpp
@@ -122,27 +122,29 @@ public:
 
 public: // The following operations are implementations of the SessionListener interface.
 
-    void connected(const SessionPrx& session, const Ice::Current&)
+    void connected(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
     {
     }
 
-    void flashed(const SessionPrx& session, const Ice::Current&)
+    void flashed(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
     {
     }
 
-    void held(const SessionPrx& session, const Ice::Current&)
+    void held(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
     {
     }
 
-    void progressing(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
+    void progressing(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
     {
     }
 
-    void ringing(const SessionPrx& session, const Ice::Current&)
+    void ringing(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
     {
     }
 
-    void stopped(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& responseCode, const Ice::Current&)
+    void stopped(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& responseCode, const Ice::Current&)
     {
         mTerminated = true;
 
@@ -170,7 +172,7 @@ public: // The following operations are implementations of the SessionListener i
 
     }
 
-    void unheld(const SessionPrx& session, const Ice::Current&)
+    void unheld(const SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
     {
     }
 
diff --git a/test/MockBridge.cpp b/test/MockBridge.cpp
index b383f61..3631448 100644
--- a/test/MockBridge.cpp
+++ b/test/MockBridge.cpp
@@ -33,32 +33,39 @@ public:
     }
 
     // Overrides
-    virtual void connected(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+    virtual void connected(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const Ice::Current&)
     {
         mBridge->connected(session);
     }
 
-    virtual void flashed(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
+    virtual void flashed(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const Ice::Current&)
     {
     }
 
-    virtual void held(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
+    virtual void held(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const Ice::Current&)
     {
     }
 
-    virtual void progressing(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
+    virtual void progressing(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
     {
     }
 
-    virtual void ringing(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
+    virtual void ringing(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const Ice::Current&)
     {
     }
 
-    virtual void stopped(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
+    virtual void stopped(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
     {
     }
 
-    virtual void unheld(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
+    virtual void unheld(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const AsteriskSCF::SessionCommunications::V1::SessionCookies&,
+	const Ice::Current&)
     {
     }
 
diff --git a/test/MockSession.cpp b/test/MockSession.cpp
index 31f6ea8..fa79540 100644
--- a/test/MockSession.cpp
+++ b/test/MockSession.cpp
@@ -41,7 +41,7 @@ public:
 
     void operator()(const SessionListenerPrx& l)
     {
-        l->stopped(mMyProxy, mResponse);
+        l->stopped(mMyProxy, AsteriskSCF::SessionCommunications::V1::SessionCookies(), mResponse);
     }
 
 private:
@@ -84,7 +84,7 @@ void MockSession::connect(const Ice::Current&)
 {
     for(vector<SessionListenerPrx>::iterator i = mListeners.begin(); i != mListeners.end(); ++i)
     {
-        (*i)->connected(mMyPrx);
+        (*i)->connected(mMyPrx, AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 }
 
@@ -139,7 +139,7 @@ void MockSession::start(const Ice::Current&)
     for(vector<SessionListenerPrx>::iterator i = mListeners.begin(); i != mListeners.end(); ++i)
     {
         // Auto-answer!
-        (*i)->connected(mMyPrx);
+        (*i)->connected(mMyPrx, AsteriskSCF::SessionCommunications::V1::SessionCookies());
     }
 }
 
diff --git a/test/MockSession.h b/test/MockSession.h
index 0e59151..636d0d0 100644
--- a/test/MockSession.h
+++ b/test/MockSession.h
@@ -48,6 +48,14 @@ public:
     AsteriskSCF::SessionCommunications::V1::BridgePrx getBridge(const Ice::Current &);
     AsteriskSCF::SessionCommunications::V1::SessionInfoPtr setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge, const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current &);
     void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current &);
+    void setCookies(const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&) { };
+    void removeCookies(const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&) { };
+
+    AsteriskSCF::SessionCommunications::V1::SessionCookies getCookies(const AsteriskSCF::SessionCommunications::V1::SessionCookies&, const Ice::Current&)
+    {
+	AsteriskSCF::SessionCommunications::V1::SessionCookies cookies;
+	return cookies;
+    };
 
 public:
     void setProxy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionPrx);

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


-- 
asterisk-scf/integration/routing.git