QPID-3514: Allow SSL and non SSL connections on the same port.

- Fixes to allow tcp to report the correct port so that the correct
  name gets used for the pidfile
- Improved the ssl tests: refactoring them,
  and adding a new test for broker chosen ssl muxed ports

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1196319 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 0 deletions

diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/cpp/src/qpid/sys/TCPIOPlugin.cpp
index 8a99d8db71..bd10a5555a 100644
--- a/cpp/src/qpid/sys/TCPIOPlugin.cpp
+++ b/cpp/src/qpid/sys/TCPIOPlugin.cpp
@@ -91,9 +91,11 @@ static class TCPIOPlugin : public Plugin {
                     opts.connectionBacklog,
                     opts.tcpNoDelay,
                     shouldListen));
+
             if (shouldListen) {
                 QPID_LOG(notice, "Listening on TCP/TCP6 port " << protocolt->getPort());
             }
+
             broker->registerProtocolFactory("tcp", protocolt);
         }
     }
@@ -103,6 +105,7 @@ AsynchIOProtocolFactory::AsynchIOProtocolFactory(const std::string& host, const
     tcpNoDelay(nodelay)
 {
     if (!shouldListen) {
+        listeningPort = boost::lexical_cast<uint16_t>(port);
         return;
     }