You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2010/02/17 01:28:00 UTC
svn commit: r910785 -
/qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
Author: shuston
Date: Wed Feb 17 00:28:00 2010
New Revision: 910785
URL: http://svn.apache.org/viewvc?rev=910785&view=rev
Log:
SSL changes for broker listening that weren't checked in with the original Windows broker SSL support (QPID-1403).
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp?rev=910785&r1=910784&r2=910785&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp Wed Feb 17 00:28:00 2010
@@ -49,7 +49,8 @@
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 @@
};
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 @@
int backlog,
bool nodelay)
: tcpNoDelay(nodelay),
- listeningPort(options.port),
+ listeningPort(listener.listen(options.port, backlog)),
clientAuthSelected(options.clientAuth) {
SecInvalidateHandle(&credHandle);
@@ -174,7 +175,6 @@
NULL);
if (status != SEC_E_OK)
throw QPID_WINDOWS_ERROR(status);
- listener.listen(options.port, backlog);
::CertFreeCertificateContext(certContext);
::CertCloseStore(certStoreHandle, 0);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org