dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@lag.net-20070521002334-6bx5g0zrnb10sgyd] 

add optional timeout parameter to SSHClient.connect(), based on a patch
from james bardin.
This commit is contained in:
Robey Pointer 2007-05-20 17:23:34 -07:00
parent afa5e0594e
commit 58e26ae41b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
paramiko/client.py
View File

@ -23,6 +23,7 @@ L{SSHClient}.
from binascii import hexlify from binascii import hexlify
import getpass import getpass
import os import os
import socket
from paramiko.agent import Agent from paramiko.agent import Agent
from paramiko.common import * from paramiko.common import *
@ -212,7 +213,7 @@ class SSHClient (object):
self._policy = policy self._policy = policy
def connect(self, hostname, port=22, username=None, password=None, pkey=None, def connect(self, hostname, port=22, username=None, password=None, pkey=None,
key_filename=None): key_filename=None, timeout=None):
""" """
Connect to an SSH server and authenticate to it. The server's host key Connect to an SSH server and authenticate to it. The server's host key
is checked against the system host keys (see L{load_system_host_keys}) is checked against the system host keys (see L{load_system_host_keys})
@ -246,6 +247,8 @@ class SSHClient (object):
@param key_filename: the filename of an optional private key to use @param key_filename: the filename of an optional private key to use
for authentication for authentication
@type key_filename: str @type key_filename: str
@param timeout: an optional timeout (in seconds) for the TCP connect
@type timeout: float
@raise BadHostKeyException: if the server's host key could not be @raise BadHostKeyException: if the server's host key could not be
verified verified
@ -253,7 +256,16 @@ class SSHClient (object):
@raise SSHException: if there was any other error connecting or @raise SSHException: if there was any other error connecting or
establishing an SSH session establishing an SSH session
""" """
t = self._transport = Transport((hostname, port)) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if timeout is not None:
try:
sock.settimeout(timeout)
except:
pass
sock.connect((hostname, port))
t = self._transport = Transport(sock)
if self._log_channel is not None: if self._log_channel is not None:
t.set_log_channel(self._log_channel) t.set_log_channel(self._log_channel)
t.start_client() t.start_client()