replace gethostbyname() with getaddrinfo(), which supports IPv6 addresses and is thread-safe

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

2 files changed, 3 insertions, 3 deletions

diff --git a/python/qmf/console.py b/python/qmf/console.py
index a75c65addc..6326b777e5 100644
--- a/python/qmf/console.py
+++ b/python/qmf/console.py
@@ -97,12 +97,12 @@ class Console:
 class BrokerURL(URL):
   def __init__(self, text):
     URL.__init__(self, text)
-    socket.gethostbyname(self.host)
     if self.port is None:
       if self.scheme == URL.AMQPS:
         self.port = 5671
       else:
         self.port = 5672
+    socket.getaddrinfo(self.host, self.port)[0][4][0]
     self.authName = None
     self.authPass = None
     if self.user:
@@ -114,7 +114,7 @@ class BrokerURL(URL):
     return self.host + ":" + str(self.port)
 
   def match(self, host, port):
-    return socket.gethostbyname(self.host) == socket.gethostbyname(host) and self.port == port
+    return socket.getaddrinfo(self.host, self.port)[0][4] == socket.gethostbyname(host, port)[0][4]
 
 class Object(object):
   """ This class defines a 'proxy' object representing a real managed object on an agent.
diff --git a/python/qpid/managementdata.py b/python/qpid/managementdata.py
index 655ee13464..a01dda0a7b 100644
--- a/python/qpid/managementdata.py
+++ b/python/qpid/managementdata.py
@@ -48,9 +48,9 @@ class Broker:
     if not match: raise ValueError("'%s' is not a valid broker url" % (text))
     user, password, host, port = match.groups()
 
-    self.host = socket.gethostbyname (host)
     if port: self.port = int(port)
     else: self.port = 5672
+    self.host = socket.getaddrinfo(host, self.port)[0][4][0]
     self.username = user or "guest"
     self.password = password or "guest"