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, 4 insertions, 3 deletions

diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/cpp/src/qpid/sys/posix/SystemInfo.cpp
index 3c11b04d29..a19ab6885c 100755
--- a/cpp/src/qpid/sys/posix/SystemInfo.cpp
+++ b/cpp/src/qpid/sys/posix/SystemInfo.cpp
@@ -50,7 +50,7 @@ long  SystemInfo::concurrency() {
 #endif
 }
 
-bool SystemInfo::getLocalHostname (TcpAddress &address) {
+bool SystemInfo::getLocalHostname (Address &address) {
     char name[HOST_NAME_MAX];
     if (::gethostname(name, sizeof(name)) != 0)
         return false;
@@ -59,6 +59,7 @@ bool SystemInfo::getLocalHostname (TcpAddress &address) {
 }
 
 static const string LOCALHOST("127.0.0.1");
+static const string TCP("tcp");
 
 void SystemInfo::getLocalIpAddresses (uint16_t port,
                                       std::vector<Address> &addrList) {
@@ -83,7 +84,7 @@ void SystemInfo::getLocalIpAddresses (uint16_t port,
             }
             string addr(dispName);
             if (addr != LOCALHOST) {
-                addrList.push_back(TcpAddress(addr, port));
+                addrList.push_back(Address(TCP, addr, port));
             }
             break;
         }
@@ -97,7 +98,7 @@ void SystemInfo::getLocalIpAddresses (uint16_t port,
     freeifaddrs(ifaddr);
 
     if (addrList.empty()) {
-        addrList.push_back(TcpAddress(LOCALHOST, port));
+        addrList.push_back(Address(TCP, LOCALHOST, port));
     }
 }