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@638590 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 9 deletions

diff --git a/qpid/cpp/src/qpid/broker/PreviewConnectionHandler.cpp b/qpid/cpp/src/qpid/broker/PreviewConnectionHandler.cpp
index c0f0d9f5e0..0052b0d588 100644
--- a/qpid/cpp/src/qpid/broker/PreviewConnectionHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/PreviewConnectionHandler.cpp
@@ -37,14 +37,6 @@ const std::string PLAIN = "PLAIN";
 const std::string en_US = "en_US";
 }
 
-void PreviewConnectionHandler::init(const framing::ProtocolInitiation& header) {
-    FieldTable properties;
-    string mechanisms(PLAIN);
-    string locales(en_US);
-    handler->serverMode = true;
-    handler->client.start(header.getMajor(), header.getMinor(), properties, mechanisms, locales);
-}
-
 void PreviewConnectionHandler::close(ReplyCode code, const string& text, ClassId classId, MethodId methodId)
 {
     handler->client.close(code, text, classId, methodId);
@@ -68,7 +60,13 @@ void PreviewConnectionHandler::handle(framing::AMQFrame& frame)
     }
 }
 
-PreviewConnectionHandler::PreviewConnectionHandler(PreviewConnection& connection)  : handler(new Handler(connection)) {}
+PreviewConnectionHandler::PreviewConnectionHandler(PreviewConnection& connection)  : handler(new Handler(connection)) {
+    FieldTable properties;
+    string mechanisms(PLAIN);
+    string locales(en_US);
+    handler->serverMode = true;
+    handler->client.start(0, 10, properties, mechanisms, locales);
+}
 
 PreviewConnectionHandler::Handler:: Handler(PreviewConnection& c) : client(c.getOutput()), server(c.getOutput()), 
                                                       connection(c), serverMode(false) {}