From 36e23bcefbf0a6893370cb041bd05a662f0b2758 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 18 Mar 2008 21:31:08 +0000 Subject: Make AsyncIOAcceptor multi-protocol: - ConnectionCodec interface replaces ConnectionInputHandle, moves encoding/decoding out of AsyncIOAcceptor. - ConnectionCodec::Factory replaces ConnectionInputHandlerFactory - Acceptor creates version-specific ConnectionCodec based on protocol header. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@638590 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/broker/MultiVersionConnectionInputHandler.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp') diff --git a/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp b/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp index 6c3d960d1f..f1bbf7d10e 100644 --- a/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp +++ b/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp @@ -31,19 +31,6 @@ MultiVersionConnectionInputHandler::MultiVersionConnectionInputHandler( Broker& _broker, const std::string& _id) : linkVersion(99,0), out(_out), broker(_broker), id(_id) {} - -void MultiVersionConnectionInputHandler::initiated(const qpid::framing::ProtocolInitiation& i) -{ - if (i.getMajor() == 99 && i.getMinor() == 0) { - handler = std::auto_ptr(new PreviewConnection(out, broker, id)); - } else if (i.getMajor() == 0 && i.getMinor() == 10) { - handler = std::auto_ptr(new Connection(out, broker, id)); - } else { - throw qpid::framing::InternalErrorException("Unsupported version: " + i.getVersion().toString()); - } - handler->initiated(i); -} - void MultiVersionConnectionInputHandler::received(qpid::framing::AMQFrame& f) { check(); @@ -67,11 +54,6 @@ bool MultiVersionConnectionInputHandler::doOutput() return handler.get() && handler->doOutput(); } -qpid::framing::ProtocolInitiation MultiVersionConnectionInputHandler::getInitiation() -{ - return qpid::framing::ProtocolInitiation(linkVersion); -} - void MultiVersionConnectionInputHandler::closed() { if (handler.get()) handler->closed(); -- cgit v1.2.1