diff options
Diffstat (limited to 'cpp/src/qpid/sys')
| -rwxr-xr-x | cpp/src/qpid/sys/posix/SystemInfo.cpp | 7 | ||||
| -rwxr-xr-x | cpp/src/qpid/sys/solaris/SystemInfo.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/ssl/util.cpp | 6 | ||||
| -rwxr-xr-x | cpp/src/qpid/sys/windows/SystemInfo.cpp | 8 |
4 files changed, 17 insertions, 11 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)); } } diff --git a/cpp/src/qpid/sys/solaris/SystemInfo.cpp b/cpp/src/qpid/sys/solaris/SystemInfo.cpp index 0075a89021..765e5a7eb0 100755 --- a/cpp/src/qpid/sys/solaris/SystemInfo.cpp +++ b/cpp/src/qpid/sys/solaris/SystemInfo.cpp @@ -49,7 +49,7 @@ long SystemInfo::concurrency() { return sysconf(_SC_NPROCESSORS_ONLN); } -bool SystemInfo::getLocalHostname(TcpAddress &address) { +bool SystemInfo::getLocalHostname(Address &address) { char name[MAXHOSTNAMELEN]; if (::gethostname(name, sizeof(name)) != 0) return false; @@ -58,6 +58,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) { @@ -71,10 +72,10 @@ void SystemInfo::getLocalIpAddresses(uint16_t port, struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.lifr_addr; std::string addr(inet_ntoa(sin->sin_addr)); if (addr != LOCALHOST) - addrList.push_back(TcpAddress(addr, port)); + addrList.push_back(Address(TCP, addr, port)); } if (addrList.empty()) { - addrList.push_back(TcpAddress(LOCALHOST, port)); + addrList.push_back(Address(TCP, LOCALHOST, port)); } close (s); } diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/cpp/src/qpid/sys/ssl/util.cpp index 53326e2f55..3078e894df 100644 --- a/cpp/src/qpid/sys/ssl/util.cpp +++ b/cpp/src/qpid/sys/ssl/util.cpp @@ -38,13 +38,15 @@ namespace qpid { namespace sys { namespace ssl { +static const std::string LOCALHOST("127.0.0.1"); + std::string defaultCertName() { - TcpAddress address; + Address address; if (SystemInfo::getLocalHostname(address)) { return address.host; } else { - return "localhost"; + return LOCALHOST; } } 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<Address> &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); |