bug 411910: when asking for a sockaddr, ask for streams only.

chrisglass · Nov 2, 2009 · c628faa · c628faa
1 parent a60c69c
commit c628faa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/paramiko/client.py b/paramiko/client.py
@@ -273,7 +273,7 @@ def connect(self, hostname, port=22, username=None, password=None, pkey=None,
             establishing an SSH session
         @raise socket.error: if a socket error occurred while connecting
         """
-        for (family, socktype, proto, canonname, sockaddr) in socket.getaddrinfo(hostname, port):
+        for (family, socktype, proto, canonname, sockaddr) in socket.getaddrinfo(hostname, port, socket.AF_UNSPEC, socket.SOCK_STREAM):
             if socktype == socket.SOCK_STREAM:
                 af = family
                 addr = sockaddr

diff --git a/paramiko/transport.py b/paramiko/transport.py
@@ -285,7 +285,7 @@ def __init__(self, sock):
         if type(sock) is tuple:
             # connect to the given (host, port)
             hostname, port = sock
-            for (family, socktype, proto, canonname, sockaddr) in socket.getaddrinfo(hostname, port):
+            for (family, socktype, proto, canonname, sockaddr) in socket.getaddrinfo(hostname, port, socket.AF_UNSPEC, socket.SOCK_STREAM):
                 if socktype == socket.SOCK_STREAM:
                     af = family
                     addr = sockaddr