You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/11/10 12:48:48 UTC
svn commit: r1637822 - in /qpid/trunk/qpid/cpp/src: ./ qpid/broker/
qpid/broker/amqp/ qpid/sys/ tests/
Author: gsim
Date: Mon Nov 10 11:48:48 2014
New Revision: 1637822
URL: http://svn.apache.org/r1637822
Log:
QPID-6167: allow 0-10 to be disabled
Removed:
qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
qpid/trunk/qpid/cpp/src/qpid/broker/BrokerOptions.h
qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Domain.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionCodec.h
qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon Nov 10 11:48:48 2014
@@ -1099,7 +1099,6 @@ set (qpidbroker_SOURCES
qpid/broker/RecoveredDequeue.cpp
qpid/broker/RetryList.cpp
qpid/broker/SecureConnection.cpp
- qpid/broker/SecureConnectionFactory.cpp
qpid/broker/Selector.h
qpid/broker/Selector.cpp
qpid/broker/SelectorExpression.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Mon Nov 10 11:48:48 2014
@@ -32,7 +32,6 @@
#include "qpid/broker/NullMessageStore.h"
#include "qpid/broker/RecoveryManagerImpl.h"
#include "qpid/broker/SaslAuthenticator.h"
-#include "qpid/broker/SecureConnectionFactory.h"
#include "qpid/broker/TopicExchange.h"
#include "qpid/broker/Link.h"
#include "qpid/broker/PersistableObject.h"
@@ -90,6 +89,7 @@
#include <iostream>
#include <memory>
+#include <set>
using qpid::sys::TransportAcceptor;
using qpid::sys::TransportConnector;
@@ -168,6 +168,7 @@ BrokerOptions::BrokerOptions(const std::
("port,p", optValue(port,"PORT"), "Tells the broker to listen on PORT")
("interface", optValue(listenInterfaces, "<interface name>|<interface address>"), "Which network interfaces to use to listen for incoming connections")
("listen-disable", optValue(listenDisabled, "<transport name>"), "Transports to disable listening")
+ ("protocols", optValue(protocols, "<protocol name+version>"), "Which protocol versions to allow")
("worker-threads", optValue(workerThreads, "N"), "Sets the broker thread pool size")
("connection-backlog", optValue(connectionBacklog, "N"), "Sets the connection backlog limit for the server socket")
("mgmt-enable,m", optValue(enableMgmt,"yes|no"), "Enable Management")
@@ -233,7 +234,6 @@ Broker::Broker(const BrokerOptions& conf
queues(this),
exchanges(this),
links(this),
- factory(new SecureConnectionFactory(*this)),
dtxManager(*timer.get(), conf.dtxDefaultTimeout),
sessionManager(
qpid::SessionState::Configuration(
@@ -242,6 +242,7 @@ Broker::Broker(const BrokerOptions& conf
*this),
queueCleaner(queues, poller, timer.get()),
recoveryInProgress(false),
+ protocolRegistry(std::set<std::string>(conf.protocols.begin(), conf.protocols.end()), this),
timestampRcvMsgs(conf.timestampRcvMsgs),
getKnownBrokers(boost::bind(&Broker::getKnownBrokersImpl, this))
{
@@ -1327,7 +1328,7 @@ void Broker::accept() {
unsigned accepting = 0;
for (TransportMap::const_iterator i = transportMap.begin(); i != transportMap.end(); i++) {
if (i->second.acceptor) {
- i->second.acceptor->accept(poller, factory.get());
+ i->second.acceptor->accept(poller, &protocolRegistry);
++accepting;
}
}
@@ -1341,7 +1342,7 @@ void Broker::connect(
const std::string& host, const std::string& port, const std::string& transport,
boost::function2<void, int, std::string> failed)
{
- connect(name, host, port, transport, factory.get(), failed);
+ connect(name, host, port, transport, &protocolRegistry, failed);
}
void Broker::connect(
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Mon Nov 10 11:48:48 2014
@@ -149,7 +149,6 @@ class Broker : public sys::Runnable, pub
QueueRegistry queues;
ExchangeRegistry exchanges;
LinkRegistry links;
- boost::shared_ptr<sys::ConnectionCodec::Factory> factory;
DtxManager dtxManager;
SessionManager sessionManager;
qmf::org::apache::qpid::broker::Broker::shared_ptr mgmtObject;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/BrokerOptions.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerOptions.h?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/BrokerOptions.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/BrokerOptions.h Mon Nov 10 11:48:48 2014
@@ -48,6 +48,7 @@ struct BrokerOptions : public qpid::Opti
uint16_t port;
std::vector<std::string> listenInterfaces;
std::vector<std::string> listenDisabled;
+ std::vector<std::string> protocols;
int workerThreads;
int connectionBacklog;
bool enableMgmt;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.cpp?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.cpp Mon Nov 10 11:48:48 2014
@@ -19,22 +19,63 @@
*
*/
#include "Protocol.h"
-#include "qpid/sys/ConnectionCodec.h"
#include "qpid/broker/RecoverableMessageImpl.h"
+#include "qpid/amqp_0_10/Connection.h"
+#include "qpid/broker/amqp_0_10/Connection.h"
#include "qpid/broker/amqp_0_10/MessageTransfer.h"
+#include "qpid/broker/SecureConnection.h"
#include "qpid/log/Statement.h"
namespace qpid {
namespace broker {
+namespace {
+const std::string AMQP_0_10("amqp0-10");
+}
+ProtocolRegistry::ProtocolRegistry(const std::set<std::string>& e, Broker* b) : enabled(e), broker(b) {}
qpid::sys::ConnectionCodec* ProtocolRegistry::create(const qpid::framing::ProtocolVersion& v, qpid::sys::OutputControl& o, const std::string& id, const qpid::sys::SecuritySettings& s)
{
+ if (v == qpid::framing::ProtocolVersion(0, 10) && isEnabled(AMQP_0_10)) {
+ return create_0_10(o, id, s, false);
+ }
qpid::sys::ConnectionCodec* codec = 0;
for (Protocols::const_iterator i = protocols.begin(); !codec && i != protocols.end(); ++i) {
- codec = i->second->create(v, o, id, s);
+ if (isEnabled(i->first)) {
+ codec = i->second->create(v, o, id, s);
+ }
}
return codec;
}
+qpid::sys::ConnectionCodec* ProtocolRegistry::create(qpid::sys::OutputControl& o, const std::string& id, const qpid::sys::SecuritySettings& s)
+{
+ return create_0_10(o, id, s, true);
+}
+
+bool ProtocolRegistry::isEnabled(const std::string& name)
+{
+ return enabled.empty()/*if nothing is explicitly enabled, assume everything is*/ || enabled.find(name) != enabled.end();
+}
+
+
+typedef std::auto_ptr<qpid::amqp_0_10::Connection> CodecPtr;
+typedef std::auto_ptr<SecureConnection> SecureConnectionPtr;
+typedef std::auto_ptr<qpid::broker::amqp_0_10::Connection> ConnectionPtr;
+typedef std::auto_ptr<sys::ConnectionInputHandler> InputPtr;
+
+sys::ConnectionCodec*
+ProtocolRegistry::create_0_10(qpid::sys::OutputControl& out, const std::string& id,
+ const qpid::sys::SecuritySettings& external, bool brokerActsAsClient)
+{
+ assert(broker);
+ SecureConnectionPtr sc(new SecureConnection());
+ CodecPtr c(new qpid::amqp_0_10::Connection(out, id, brokerActsAsClient));
+ ConnectionPtr i(new broker::amqp_0_10::Connection(c.get(), *broker, id, external, brokerActsAsClient));
+ i->setSecureConnection(sc.get());
+ c->setInputHandler(InputPtr(i.release()));
+ sc->setCodec(std::auto_ptr<sys::ConnectionCodec>(c));
+ return sc.release();
+}
+
boost::intrusive_ptr<const qpid::broker::amqp_0_10::MessageTransfer> ProtocolRegistry::translate(const Message& m)
{
boost::intrusive_ptr<const qpid::broker::amqp_0_10::MessageTransfer> transfer;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h Mon Nov 10 11:48:48 2014
@@ -23,13 +23,14 @@
*/
#include <map>
#include <string>
+#include <set>
#include <boost/shared_ptr.hpp>
#include <boost/intrusive_ptr.hpp>
+#include "qpid/sys/ConnectionCodec.h"
#include "qpid/broker/BrokerImportExport.h"
namespace qpid {
namespace sys {
-class ConnectionCodec;
class OutputControl;
struct SecuritySettings;
}
@@ -38,6 +39,7 @@ class Buffer;
class ProtocolVersion;
}
namespace broker {
+class Broker;
class Message;
class RecoverableMessage;
namespace amqp_0_10 {
@@ -63,14 +65,16 @@ class Protocol
private:
};
-class ProtocolRegistry : public Protocol
+class ProtocolRegistry : public Protocol, public qpid::sys::ConnectionCodec::Factory
{
public:
QPID_BROKER_EXTERN qpid::sys::ConnectionCodec* create(const qpid::framing::ProtocolVersion&, qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&);
+ QPID_BROKER_EXTERN qpid::sys::ConnectionCodec* create(qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&);
QPID_BROKER_EXTERN boost::intrusive_ptr<const qpid::broker::amqp_0_10::MessageTransfer> translate(const Message&);
QPID_BROKER_EXTERN boost::shared_ptr<RecoverableMessage> recover(qpid::framing::Buffer&);
QPID_BROKER_EXTERN Message decode(qpid::framing::Buffer&);
+ QPID_BROKER_EXTERN ProtocolRegistry(const std::set<std::string>& enabled, Broker* b);
QPID_BROKER_EXTERN ~ProtocolRegistry();
QPID_BROKER_EXTERN void add(const std::string&, Protocol*);
private:
@@ -78,6 +82,12 @@ class ProtocolRegistry : public Protocol
//limited manipulation of ordering
typedef std::map<std::string, Protocol*> Protocols;
Protocols protocols;
+ const std::set<std::string> enabled;
+ Broker* broker;
+
+ qpid::sys::ConnectionCodec* create_0_10(qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&, bool);
+ bool isEnabled(const std::string&);
+
};
}} // namespace qpid::broker
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Domain.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Domain.cpp?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Domain.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Domain.cpp Mon Nov 10 11:48:48 2014
@@ -138,7 +138,7 @@ class InterconnectFactory : public Broke
boost::shared_ptr<Domain>, BrokerContext&);
InterconnectFactory(bool incoming, const std::string& name, const std::string& source, const std::string& target,
boost::shared_ptr<Domain>, BrokerContext&, boost::shared_ptr<Relay>);
- qpid::sys::ConnectionCodec* create(framing::ProtocolVersion, qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&);
+ qpid::sys::ConnectionCodec* create(const framing::ProtocolVersion&, qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&);
qpid::sys::ConnectionCodec* create(qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&);
bool connect();
void failed(int, std::string);
@@ -170,7 +170,7 @@ InterconnectFactory::InterconnectFactory
next = url.begin();
}
-qpid::sys::ConnectionCodec* InterconnectFactory::create(qpid::framing::ProtocolVersion, qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&)
+qpid::sys::ConnectionCodec* InterconnectFactory::create(const qpid::framing::ProtocolVersion&, qpid::sys::OutputControl&, const std::string&, const qpid::sys::SecuritySettings&)
{
throw qpid::Exception("Not implemented!");
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp Mon Nov 10 11:48:48 2014
@@ -91,7 +91,7 @@ struct ProtocolPlugin : public Plugin
if (broker) {
policies = new NodePolicyRegistry();
ProtocolImpl* impl = new ProtocolImpl(new Interconnects(), new TopicRegistry(), policies, *broker, options.domain);
- broker->getProtocolRegistry().add("AMQP 1.0", impl);//registry deletes on shutdown
+ broker->getProtocolRegistry().add("amqp1.0", impl);//registry deletes on shutdown
}
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionCodec.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionCodec.h?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionCodec.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionCodec.h Mon Nov 10 11:48:48 2014
@@ -52,7 +52,7 @@ class ConnectionCodec : public Codec {
/** Return 0 if version unknown */
virtual ConnectionCodec* create(
- framing::ProtocolVersion, OutputControl&, const std::string& id,
+ const framing::ProtocolVersion&, OutputControl&, const std::string& id,
const SecuritySettings&
) = 0;
Modified: qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?rev=1637822&r1=1637821&r2=1637822&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Mon Nov 10 11:48:48 2014
@@ -61,7 +61,7 @@ QPID_AUTO_TEST_CASE(testEncodeDecode)
qpid::framing::Buffer buffer(&bytes[0], bytes.size());
msg.getPersistentContext()->encode(buffer);
buffer.reset();
- ProtocolRegistry registry;
+ ProtocolRegistry registry(std::set<std::string>(), 0);
msg = registry.decode(buffer);
BOOST_CHECK_EQUAL(routingKey, msg.getRoutingKey());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org