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

[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-7] 

don't close the socket until the destructor -- we may drop a session before the socket is actually finished
This commit is contained in:
Robey Pointer 2005-05-04 02:44:00 +00:00
parent 2c264c7df5
commit e8efe095a6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
paramiko/packet.py
View File

@ -25,6 +25,7 @@ Packetizer.
import select, socket, struct, threading, time import select, socket, struct, threading, time
from Crypto.Hash import HMAC from Crypto.Hash import HMAC
from common import * from common import *
from ssh_exception import SSHException
from message import Message from message import Message
import util import util
@ -75,6 +76,12 @@ class Packetizer (object):
self.__keepalive_last = time.time() self.__keepalive_last = time.time()
self.__keepalive_callback = None self.__keepalive_callback = None
def __del__(self):
# this is not guaranteed to be called, but we should try.
try:
self.__socket.close()
except:
pass
def set_log(self, log): def set_log(self, log):
""" """
@ -111,9 +118,6 @@ class Packetizer (object):
def close(self): def close(self):
self.__closed = True self.__closed = True
self.__block_engine_in = None
self.__block_engine_out = None
self.__socket.close()
def set_hexdump(self, hexdump): def set_hexdump(self, hexdump):
self.__dump_packets = hexdump self.__dump_packets = hexdump
@ -146,7 +150,6 @@ class Packetizer (object):
self.__keepalive_interval = interval self.__keepalive_interval = interval
self.__keepalive_callback = callback self.__keepalive_callback = callback
self.__keepalive_last = time.time() self.__keepalive_last = time.time()
self._log(DEBUG, 'SET KEEPALIVE %r' % interval)
def read_all(self, n): def read_all(self, n):
""" """