summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/RouterI.cpp2
-rw-r--r--cpp/src/Glacier2/RouterI.h2
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp125
-rw-r--r--cpp/src/Glacier2/SessionRouterI.h4
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp1
5 files changed, 97 insertions, 37 deletions
diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
index 041a687dc38..4589add1d53 100644
--- a/cpp/src/Glacier2/RouterI.cpp
+++ b/cpp/src/Glacier2/RouterI.cpp
@@ -179,7 +179,7 @@ Glacier2::RouterI::createSessionFromSecureConnection_async(const AMD_Router_crea
}
void
-Glacier2::RouterI::refreshSession(const Current&)
+Glacier2::RouterI::refreshSession_async(const AMD_Router_refreshSessionPtr&, const ::Ice::Current&)
{
assert(false); // Must not be called in this router implementation.
}
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index 0fb7f975c0d..ae14d00586b 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -48,7 +48,7 @@ public:
const Ice::Current&);
virtual void createSessionFromSecureConnection_async(const AMD_Router_createSessionFromSecureConnectionPtr&,
const Ice::Current&);
- virtual void refreshSession(const ::Ice::Current&);
+ virtual void refreshSession_async(const AMD_Router_refreshSessionPtr&, const ::Ice::Current&);
virtual void destroySession(const ::Ice::Current&);
virtual Ice::Long getSessionTimeout(const ::Ice::Current&) const;
virtual Ice::Int getACMTimeout(const ::Ice::Current&) const;
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 21145379e4e..049fc8db2d4 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -7,22 +7,91 @@
//
// **********************************************************************
-#include <Glacier2/PermissionsVerifier.h>
-#include <Glacier2/Session.h>
#include <Glacier2/SessionRouterI.h>
+#include <Glacier2/PermissionsVerifier.h>
#include <Glacier2/FilterManager.h>
#include <Glacier2/RouterI.h>
#include <IceUtil/UUID.h>
#include <IceSSL/IceSSL.h>
-#include <Ice/Connection.h>
-#include <Ice/Network.h>
using namespace std;
using namespace Ice;
using namespace Glacier2;
+namespace
+{
+class PingCallback : public IceUtil::Shared
+{
+public:
+
+ PingCallback(const SessionRouterIPtr& router,
+ const AMD_Router_refreshSessionPtr& callback,
+ const Ice::ConnectionPtr& connection) : _router(router),
+ _callback(callback),
+ _connection(connection)
+ {
+ }
+
+ void
+ finished(const Ice::AsyncResultPtr& r)
+ {
+ Ice::ObjectPrx o = r->getProxy();
+ try
+ {
+ o->end_ice_ping(r);
+ _callback->ice_response();
+ }
+ catch(const Ice::Exception&)
+ {
+ _callback->ice_exception(SessionNotExistException());
+ _router->destroySession(_connection);
+ }
+ }
+
+private:
+
+ const SessionRouterIPtr _router;
+ const AMD_Router_refreshSessionPtr _callback;
+ const Ice::ConnectionPtr _connection;
+};
+
+class ACMPingCallback : public IceUtil::Shared
+{
+public:
+
+ ACMPingCallback(const SessionRouterIPtr& router, const Ice::ConnectionPtr& connection) :
+ _router(router), _connection(connection)
+ {
+ }
+
+ void
+ finished(const Ice::AsyncResultPtr& r)
+ {
+ Ice::ObjectPrx o = r->getProxy();
+ try
+ {
+ o->end_ice_ping(r);
+ }
+ catch(const Ice::Exception&)
+ {
+ //
+ // Close the connection otherwise the peer has no way to know that
+ // the session has gone.
+ //
+ _connection->close(false);
+ _router->destroySession(_connection);
+ }
+ }
+
+private:
+
+ const SessionRouterIPtr _router;
+ const Ice::ConnectionPtr _connection;
+};
+}
+
namespace Glacier2
{
@@ -598,7 +667,6 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
_sessionThread(_sessionTimeout > IceUtil::Time() ? new SessionThread(this, _sessionTimeout) : 0),
_routersByConnectionHint(_routersByConnection.end()),
_routersByCategoryHint(_routersByCategory.end()),
- _sessionPingCallback(newCallback_Object_ice_ping(this, &SessionRouterI::sessionPingException)),
_sessionDestroyCallback(newCallback_Session_destroy(this, &SessionRouterI::sessionDestroyException)),
_destroy(false)
{
@@ -681,7 +749,6 @@ SessionRouterI::destroy()
_connectionCallback = 0;
swap(destroyCallback, _sessionDestroyCallback); // Break cyclic reference count.
- _sessionPingCallback = 0; // Break cyclic reference count.
}
//
@@ -814,56 +881,59 @@ SessionRouterI::destroySession(const Current& current)
}
void
-SessionRouterI::refreshSession(const Ice::Current& current)
+SessionRouterI::refreshSession_async(const AMD_Router_refreshSessionPtr& callback, const Ice::Current& current)
{
- Ice::Callback_Object_ice_pingPtr sessionPingCallback;
RouterIPtr router;
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
router = getRouterImpl(current.con, current.id, false); // getRouter updates the session timestamp.
if(!router)
{
- throw SessionNotExistException();
+ callback->ice_exception(SessionNotExistException());
+ return;
}
-
- //
- // Ping the session to ensure it does not timeout.
- //
- assert(_sessionPingCallback);
- sessionPingCallback = _sessionPingCallback;
}
SessionPrx session = router->getSession();
if(session)
{
- session->begin_ice_ping(sessionPingCallback, current.con);
+ //
+ // Ping the session to ensure it does not timeout.
+ //
+ session->begin_ice_ping(Ice::newCallback(
+ new PingCallback(this, callback, current.con), &PingCallback::finished));
+ }
+ else
+ {
+ callback->ice_response();
}
}
void
SessionRouterI::refreshSession(const Ice::ConnectionPtr& con)
{
- Ice::Callback_Object_ice_pingPtr sessionPingCallback;
RouterIPtr router;
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
router = getRouterImpl(con, Ice::Identity(), false); // getRouter updates the session timestamp.
if(!router)
{
+ //
+ // Close the connection otherwise the peer has no way to know that the
+ // session has gone.
+ //
+ con->close(false);
throw SessionNotExistException();
}
-
- //
- // Ping the session to ensure it does not timeout.
- //
- assert(_sessionPingCallback);
- sessionPingCallback = _sessionPingCallback;
}
SessionPrx session = router->getSession();
if(session)
{
- session->begin_ice_ping(sessionPingCallback, con);
+ //
+ // Ping the session to ensure it does not timeout.
+ //
+ session->begin_ice_ping(Ice::newCallback(new ACMPingCallback(this, con), &ACMPingCallback::finished));
}
}
@@ -1089,12 +1159,6 @@ SessionRouterI::getRouterImpl(const ConnectionPtr& connection, const Ice::Identi
}
void
-SessionRouterI::sessionPingException(const Ice::Exception&, const Ice::ConnectionPtr& con)
-{
- destroySession(con);
-}
-
-void
SessionRouterI::sessionDestroyException(const Ice::Exception& ex)
{
if(_sessionTraceLevel > 0)
@@ -1104,7 +1168,6 @@ SessionRouterI::sessionDestroyException(const Ice::Exception& ex)
}
}
-
bool
SessionRouterI::startCreateSession(const CreateSessionPtr& cb, const ConnectionPtr& connection)
{
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 36bf87ba9d6..d609809dada 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -110,7 +110,7 @@ public:
const Ice::Current&);
virtual void createSessionFromSecureConnection_async(const AMD_Router_createSessionFromSecureConnectionPtr&,
const Ice::Current&);
- virtual void refreshSession(const Ice::Current&);
+ virtual void refreshSession_async(const AMD_Router_refreshSessionPtr&, const Ice::Current&);
virtual void destroySession(const ::Ice::Current&);
virtual Ice::Long getSessionTimeout(const ::Ice::Current&) const;
virtual Ice::Int getACMTimeout(const ::Ice::Current&) const;
@@ -133,7 +133,6 @@ private:
RouterIPtr getRouterImpl(const Ice::ConnectionPtr&, const Ice::Identity&, bool) const;
- void sessionPingException(const Ice::Exception&, const ::Ice::ConnectionPtr&);
void sessionDestroyException(const Ice::Exception&);
bool startCreateSession(const CreateSessionPtr&, const Ice::ConnectionPtr&);
@@ -179,7 +178,6 @@ private:
std::map<Ice::ConnectionPtr, CreateSessionPtr> _pending;
- Ice::Callback_Object_ice_pingPtr _sessionPingCallback;
Callback_Session_destroyPtr _sessionDestroyCallback;
bool _destroy;
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index 5f0b9bb2730..ba2b347cebc 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -83,7 +83,6 @@ public:
virtual void
closed(const Ice::ConnectionPtr&)
{
- cout << "session destroyed" << endl;
_app->sessionDestroyed();
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 04:07:55 +0000