From b2be8be33e6494af00b9b76643870f68aace1b1e Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Wed, 17 Feb 2010 00:28:00 +0000
Subject: SSL changes for broker listening that weren't checked in with the
 original Windows broker SSL support (QPID-1403).

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@910785 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/windows/SslProtocolFactory.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
index d1dff92595..0db8fb5713 100644
--- a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
+++ b/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
@@ -49,7 +49,8 @@ struct SslServerOptions : qpid::Options
     uint16_t port;
     bool clientAuth;
 
-    SslServerOptions() : certStore("My"), port(5671), clientAuth(false)
+    SslServerOptions() : qpid::Options("SSL Options"),
+                         certStore("My"), port(5671), clientAuth(false)
     {
         qpid::TcpAddress me;
         if (qpid::sys::SystemInfo::getLocalHostname(me))
@@ -67,11 +68,11 @@ struct SslServerOptions : qpid::Options
 };
 
 class SslProtocolFactory : public qpid::sys::ProtocolFactory {
+    qpid::sys::Socket listener;
     const bool tcpNoDelay;
     const uint16_t listeningPort;
     std::string brokerHost;
     const bool clientAuthSelected;
-    qpid::sys::Socket listener;
     std::auto_ptr<qpid::sys::AsynchAcceptor> acceptor;
     ConnectFailedCallback connectFailedCallback;
     CredHandle credHandle;
@@ -129,7 +130,7 @@ SslProtocolFactory::SslProtocolFactory(const SslServerOptions& options,
                                        int backlog,
                                        bool nodelay)
     : tcpNoDelay(nodelay),
-      listeningPort(options.port),
+      listeningPort(listener.listen(options.port, backlog)),
       clientAuthSelected(options.clientAuth) {
 
     SecInvalidateHandle(&credHandle);
@@ -174,7 +175,6 @@ SslProtocolFactory::SslProtocolFactory(const SslServerOptions& options,
                                                         NULL);
     if (status != SEC_E_OK)
         throw QPID_WINDOWS_ERROR(status);
-    listener.listen(options.port, backlog);
     ::CertFreeCertificateContext(certContext);
     ::CertCloseStore(certStoreHandle, 0);
 }
-- 
cgit v1.2.1