1 files changed, 20 insertions, 100 deletions

diff --git a/cpp/src/qpid/sys/windows/SocketAddress.cpp b/cpp/src/qpid/sys/windows/SocketAddress.cpp
index 77bbf85810..501cff1297 100644
--- a/cpp/src/qpid/sys/windows/SocketAddress.cpp
+++ b/cpp/src/qpid/sys/windows/SocketAddress.cpp
@@ -21,13 +21,7 @@
 
 #include "qpid/sys/SocketAddress.h"
 
-#include "qpid/Exception.h"
-#include "qpid/Msg.h"
-
-// Ensure we get all of winsock2.h
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
+#include "qpid/sys/windows/check.h"
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -41,111 +35,37 @@ SocketAddress::SocketAddress(const std::string& host0, const std::string& port0)
     port(port0),
     addrInfo(0)
 {
-}
-
-SocketAddress::SocketAddress(const SocketAddress& sa) :
-    host(sa.host),
-    port(sa.port),
-    addrInfo(0)
-{
-}
-
-SocketAddress& SocketAddress::operator=(const SocketAddress& sa)
-{
-    SocketAddress temp(sa);
-
-    std::swap(temp, *this);
-    return *this;
-}
-
-SocketAddress::~SocketAddress()
-{
-    if (addrInfo) {
-        ::freeaddrinfo(addrInfo);
+    ::addrinfo hints;
+    ::memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_INET; // In order to allow AF_INET6 we'd have to change createTcp() as well
+    hints.ai_socktype = SOCK_STREAM;
+
+    const char* node = 0;
+    if (host.empty()) {
+        hints.ai_flags |= AI_PASSIVE;
+    } else {
+        node = host.c_str();
     }
-}
+    const char* service = port.empty() ? "0" : port.c_str();
 
-std::string SocketAddress::asString(::sockaddr const * const addr, size_t addrlen)
-{
-    char servName[NI_MAXSERV];
-    char dispName[NI_MAXHOST];
-    if (int rc=::getnameinfo(addr, addrlen,
-        dispName, sizeof(dispName),
-                             servName, sizeof(servName),
-                             NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-        throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-    std::string s;
-    switch (addr->sa_family) {
-        case AF_INET: s += dispName; break;
-        case AF_INET6: s += "["; s += dispName; s+= "]"; break;
-        default: throw Exception(QPID_MSG("Unexpected socket type"));
-    }
-    s += ":";
-    s += servName;
-    return s;
+    int n = ::getaddrinfo(node, service, &hints, &addrInfo);
+    if (n != 0)
+        throw Exception(QPID_MSG("Cannot resolve " << host << ": " << ::gai_strerror(n)));
 }
 
-uint16_t SocketAddress::getPort(::sockaddr const * const addr)
+SocketAddress::~SocketAddress()
 {
-    switch (addr->sa_family) {
-        case AF_INET: return ntohs(((::sockaddr_in*)addr)->sin_port);
-        case AF_INET6: return ntohs(((::sockaddr_in6*)addr)->sin6_port);
-        default:throw Exception(QPID_MSG("Unexpected socket type"));
-    }
+    ::freeaddrinfo(addrInfo);
 }
 
-std::string SocketAddress::asString(bool numeric) const
+std::string SocketAddress::asString() const
 {
-    if (!numeric)
-        return host + ":" + port;
-    // Canonicalise into numeric id
-    const ::addrinfo& ai = getAddrInfo(*this);
-
-    return asString(ai.ai_addr, ai.ai_addrlen);
-}
-
-bool SocketAddress::nextAddress() {
-    bool r = currentAddrInfo->ai_next != 0;
-    if (r)
-        currentAddrInfo = currentAddrInfo->ai_next;
-    return r;
-}
-
-void SocketAddress::setAddrInfoPort(uint16_t port) {
-    if (!currentAddrInfo) return;
-
-    ::addrinfo& ai = *currentAddrInfo;
-    switch (ai.ai_family) {
-    case AF_INET: ((::sockaddr_in*)ai.ai_addr)->sin_port = htons(port); return;
-    case AF_INET6:((::sockaddr_in6*)ai.ai_addr)->sin6_port = htons(port); return;
-    default: throw Exception(QPID_MSG("Unexpected socket type"));
-    }
+    return host + ":" + port;
 }
 
 const ::addrinfo& getAddrInfo(const SocketAddress& sa)
 {
-    if (!sa.addrInfo) {
-        ::addrinfo hints;
-        ::memset(&hints, 0, sizeof(hints));
-        hints.ai_flags = AI_ADDRCONFIG; // Only use protocols that we have configured interfaces for
-        hints.ai_family = AF_UNSPEC; // Allow both IPv4 and IPv6
-        hints.ai_socktype = SOCK_STREAM;
-
-        const char* node = 0;
-        if (sa.host.empty()) {
-            hints.ai_flags |= AI_PASSIVE;
-        } else {
-            node = sa.host.c_str();
-        }
-        const char* service = sa.port.empty() ? "0" : sa.port.c_str();
-
-        int n = ::getaddrinfo(node, service, &hints, &sa.addrInfo);
-        if (n != 0)
-            throw Exception(QPID_MSG("Cannot resolve " << sa.asString(false) << ": " << ::gai_strerror(n)));
-        sa.currentAddrInfo = sa.addrInfo;
-    }
-
-    return *sa.currentAddrInfo;
+    return *sa.addrInfo;
 }
 
 }}