From e183227707d150b1f42e750df0e90cd7dac8744e Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 29 Aug 2007 23:27:40 +0000 Subject: * src/qpid/broker/Session.h, .cpp: Session holds all state of a session including handlers created for that session. Session is not directly associated with a channel. * src/qpid/broker/SessionAdapter.h, .cpp: SessionAdapter is bound to a channel managed by the Connection. It can be attached to and detatched from a Session. * src/qpid/broker/Connection.cpp, .h: Use SessionAdapter. * src/qpid/framing/Handler.h: Removed use of shared_ptr. Handlers belong either to a Session or a Connection and are destroyed with it. * src/qpid/framing/InputHandler.h, OutputHandler.h: Both now inherit from FrameHandler and can be used as FrameHandlers. Intermediate step to removing them entirely. * src/qpid/broker/ConnectionAdapter.h: * src/qpid/client/ConnectionHandler.h: * src/qpid/framing/ChannelAdapter.cpp, .h: Minor changes required by Handler changes. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@570982 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/ConnectionAdapter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cpp/src/qpid/broker/ConnectionAdapter.cpp') diff --git a/cpp/src/qpid/broker/ConnectionAdapter.cpp b/cpp/src/qpid/broker/ConnectionAdapter.cpp index 175f57df7d..7672daed10 100644 --- a/cpp/src/qpid/broker/ConnectionAdapter.cpp +++ b/cpp/src/qpid/broker/ConnectionAdapter.cpp @@ -66,7 +66,7 @@ framing::ProtocolVersion ConnectionAdapter::getVersion() const void ConnectionAdapter::handle(framing::AMQFrame& frame) { - getHandlers().in->handle(frame); + getHandlers().in(frame); } ConnectionAdapter::ConnectionAdapter(Connection& connection) @@ -74,27 +74,27 @@ ConnectionAdapter::ConnectionAdapter(Connection& connection) handler = std::auto_ptr(new Handler(connection, *this)); } -Handler::Handler(Connection& c, ConnectionAdapter& a) : +ConnectionAdapter::Handler:: Handler(Connection& c, ConnectionAdapter& a) : proxy(a), client(proxy.getConnection()), connection(c) {} -void Handler::startOk(const FieldTable& /*clientProperties*/, +void ConnectionAdapter::Handler::startOk(const FieldTable& /*clientProperties*/, const string& /*mechanism*/, const string& /*response*/, const string& /*locale*/) { client.tune(framing::CHANNEL_MAX, connection.getFrameMax(), connection.getHeartbeat()); } -void Handler::secureOk(const string& /*response*/){} +void ConnectionAdapter::Handler::secureOk(const string& /*response*/){} -void Handler::tuneOk(uint16_t /*channelmax*/, +void ConnectionAdapter::Handler::tuneOk(uint16_t /*channelmax*/, uint32_t framemax, uint16_t heartbeat) { connection.setFrameMax(framemax); connection.setHeartbeat(heartbeat); } -void Handler::open(const string& /*virtualHost*/, +void ConnectionAdapter::Handler::open(const string& /*virtualHost*/, const string& /*capabilities*/, bool /*insist*/) { string knownhosts; @@ -102,13 +102,13 @@ void Handler::open(const string& /*virtualHost*/, } -void Handler::close(uint16_t /*replyCode*/, const string& /*replyText*/, +void ConnectionAdapter::Handler::close(uint16_t /*replyCode*/, const string& /*replyText*/, uint16_t /*classId*/, uint16_t /*methodId*/) { client.closeOk(); connection.getOutput().close(); } -void Handler::closeOk(){ +void ConnectionAdapter::Handler::closeOk(){ connection.getOutput().close(); } -- cgit v1.2.1