diff options
Diffstat (limited to 'qpid/cpp/src/qpid')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Connection.cpp | 10 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.cpp | 16 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp | 4 |
3 files changed, 20 insertions, 10 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp index abe3f8d1f9..2582877bb6 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp @@ -109,6 +109,7 @@ struct ConnectionTickerTask : public qpid::sys::TimerTask connection.requestIO(); } }; +const std::string ANONYMOUS_RELAY("ANONYMOUS-RELAY"); } Connection::Connection(qpid::sys::OutputControl& o, const std::string& i, BrokerContext& b, bool saslInUse, bool brokerInitiated) @@ -351,6 +352,15 @@ void Connection::open() << " remote=" << pn_transport_get_remote_idle_timeout(transport)); } + pn_data_t* offered_capabilities = pn_connection_offered_capabilities(connection); + if (offered_capabilities) { + pn_data_put_array(offered_capabilities, false, PN_SYMBOL); + pn_data_enter(offered_capabilities); + pn_data_put_symbol(offered_capabilities, pn_bytes(ANONYMOUS_RELAY.size(), ANONYMOUS_RELAY.c_str())); + pn_data_exit(offered_capabilities); + pn_data_rewind(offered_capabilities); + } + // QPID-6592: put self-identifying information into the connection // properties. Use keys defined by the 0-10 spec, as AMQP 1.0 has yet to // define any. diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index e0ca8f58e0..33d3373bd7 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -430,13 +430,7 @@ void Session::attach(pn_link_t* link) std::string name; if (pn_terminus_get_type(target) == PN_UNSPECIFIED) { pn_terminus_set_type(pn_link_target(link), PN_UNSPECIFIED); - authorise.access("ANONYMOUS-RELAY"); - boost::shared_ptr<Incoming> r(new AnonymousRelay(connection.getBroker(), connection, *this, link)); - incoming[link] = r; - if (connection.getBroker().isAuthenticating() && !connection.isLink()) - r->verify(connection.getUserId(), connection.getBroker().getRealm()); - QPID_LOG(debug, "Incoming link attached for ANONYMOUS-RELAY"); - return; + throw Exception(qpid::amqp::error_conditions::PRECONDITION_FAILED, "No target specified!"); } else if (pn_terminus_get_type(target) == PN_COORDINATOR) { QPID_LOG(debug, "Received attach request for incoming link to transaction coordinator on " << this); boost::shared_ptr<Incoming> i(new IncomingToCoordinator(link, connection.getBroker(), *this)); @@ -446,6 +440,14 @@ void Session::attach(pn_link_t* link) name = generateName(link); QPID_LOG(debug, "Received attach request for incoming link to " << name); pn_terminus_set_address(pn_link_target(link), qualifyName(name).c_str()); + } else if (pn_terminus_get_type(target) == PN_TARGET && !pn_terminus_get_address(target)) { + authorise.access("ANONYMOUS-RELAY"); + boost::shared_ptr<Incoming> r(new AnonymousRelay(connection.getBroker(), connection, *this, link)); + incoming[link] = r; + if (connection.getBroker().isAuthenticating() && !connection.isLink()) + r->verify(connection.getUserId(), connection.getBroker().getRealm()); + QPID_LOG(debug, "Incoming link attached for ANONYMOUS-RELAY"); + return; } else { name = pn_terminus_get_address(target); QPID_LOG(debug, "Received attach request for incoming link to " << name); diff --git a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp index 608d6c2883..513556ba53 100644 --- a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp +++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp @@ -612,9 +612,7 @@ void AddressHelper::configure(pn_link_t* link, pn_terminus_t* terminus, CheckMod //application expects a name to be generated pn_terminus_set_dynamic(terminus, true); setNodeProperties(terminus); - } else if (name == NULL_ADDRESS) { - pn_terminus_set_type(terminus, PN_UNSPECIFIED); - } else { + } else if (name != NULL_ADDRESS) { pn_terminus_set_address(terminus, name.c_str()); if (createEnabled(mode)) { //application expects name of node to be as specified |