diff options
| author | Robey Pointer <robey@twitter.com> | 2009-11-01 18:58:23 -0800 |
|---|---|---|
| committer | Robey Pointer <robey@twitter.com> | 2009-11-01 18:58:23 -0800 |
| commit | c628faa102024354af9fcad47200e6e1fea42d5f (patch) | |
| tree | 06f9e7821979f7d0520144e55f97f608ddfe1253 | |
| parent | a60c69c81caefa51f75c2b68356e59e1e77bc63a (diff) | |
bug 411910: when asking for a sockaddr, ask for streams only.
| -rw-r--r-- | paramiko/client.py | 2 | ||||
| -rw-r--r-- | paramiko/transport.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/client.py b/paramiko/client.py index ff31c975..ce14f669 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -273,7 +273,7 @@ class SSHClient (object): 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 index 35539898..dd04206f 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -285,7 +285,7 @@ class Transport (threading.Thread): 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 |