From 16da0e0c511c0c1cf4ea592640c522754065200a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 11 May 2010 14:39:58 +0000 Subject: 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 --- cpp/src/qpid/sys/windows/SystemInfo.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/sys/windows') diff --git a/cpp/src/qpid/sys/windows/SystemInfo.cpp b/cpp/src/qpid/sys/windows/SystemInfo.cpp index ea53fc199c..4da440bdd4 100755 --- a/cpp/src/qpid/sys/windows/SystemInfo.cpp +++ b/cpp/src/qpid/sys/windows/SystemInfo.cpp @@ -51,7 +51,7 @@ long SystemInfo::concurrency() { return activeProcessors; } -bool SystemInfo::getLocalHostname (TcpAddress &address) { +bool SystemInfo::getLocalHostname (Address &address) { char name[HOST_NAME_MAX]; if (::gethostname(name, sizeof(name)) != 0) { errno = WSAGetLastError(); @@ -61,10 +61,12 @@ bool SystemInfo::getLocalHostname (TcpAddress &address) { return true; } +static const std::string LOCALHOST("127.0.0.1"); +static const std::string TCP("tcp"); + void SystemInfo::getLocalIpAddresses (uint16_t port, std::vector
&addrList) { enum { MAX_URL_INTERFACES = 100 }; - static const std::string LOCALHOST("127.0.0.1"); SOCKET s = socket (PF_INET, SOCK_STREAM, 0); if (s != INVALID_SOCKET) { @@ -84,7 +86,7 @@ void SystemInfo::getLocalIpAddresses (uint16_t port, if (interfaces[i].iiFlags & IFF_UP) { std::string addr(inet_ntoa(interfaces[i].iiAddress.AddressIn.sin_addr)); if (addr != LOCALHOST) - addrList.push_back(TcpAddress(addr, port)); + addrList.push_back(Address(TCP, addr, port)); } } closesocket (s); -- cgit v1.2.1