Support for multiple protocols in qpid::Url.

- simplified qpid::Address to hold (protocol,host,port) triples.
- protocol plugins call Url:addProtocol to add tags to Url parser.
- use Address::protocol when establishing connections.
- ssl_test: tests using URL to connect.


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

1 files changed, 6 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp
index 6db6fe7637..5a1dfd9656 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/cpp/src/qpid/broker/Link.cpp
@@ -307,11 +307,12 @@ void Link::maintenanceVisit ()
         connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
 }
 
-void Link::reconnect(const qpid::TcpAddress& a)
+void Link::reconnect(const qpid::Address& a)
 {
     Mutex::ScopedLock mutex(lock);
     host = a.host;
     port = a.port;
+    transport = a.protocol;
     startConnectionLH();
     if (mgmtObject != 0) {
         stringstream errorString;
@@ -322,11 +323,10 @@ void Link::reconnect(const qpid::TcpAddress& a)
 
 bool Link::tryFailover()
 {
-    //TODO: urls only work for TCP at present, update when that has changed
-    TcpAddress next;
-    if (transport == Broker::TCP_TRANSPORT && urls.next(next) && 
-        (next.host != host || next.port != port)) {
-        links->changeAddress(TcpAddress(host, port), next);
+    Address next;
+    if (urls.next(next) && 
+        (next.host != host || next.port != port || next.protocol != transport)) {
+        links->changeAddress(Address(transport, host, port), next);
         QPID_LOG(debug, "Link failing over to " << host << ":" << port);
         return true;
     } else {