jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handled ERRNO_CONNRESET

pull/4/head
Sheng 2017-11-11 22:43:33 +08:00
parent f9a66a9e42
commit 08af39dcb8
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.py
View File

@ -1,7 +1,6 @@
import io import io
import logging import logging
import os.path import os.path
import socket
import traceback import traceback
import uuid import uuid
import weakref import weakref
@ -9,7 +8,9 @@ import paramiko
import tornado.web import tornado.web
import tornado.websocket import tornado.websocket
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from tornado.iostream import _ERRNO_CONNRESET
from tornado.options import define, options, parse_command_line from tornado.options import define, options, parse_command_line
from tornado.util import errno_from_exception
define('address', default='127.0.0.1', help='listen address') define('address', default='127.0.0.1', help='listen address')
@ -56,7 +57,13 @@ class Worker(object):
def on_read(self): def on_read(self):
logging.debug('worker {} on read'.format(self.id)) logging.debug('worker {} on read'.format(self.id))
try:
data = self.chan.recv(BUF_SIZE) data = self.chan.recv(BUF_SIZE)
except (OSError, IOError) as e:
logging.error(e)
if errno_from_exception(e) in _ERRNO_CONNRESET:
self.close()
else:
logging.debug('"{}" from {}'.format(data, self.dst_addr)) logging.debug('"{}" from {}'.format(data, self.dst_addr))
if not data: if not data:
self.close() self.close()
@ -72,15 +79,20 @@ class Worker(object):
logging.debug('worker {} on write'.format(self.id)) logging.debug('worker {} on write'.format(self.id))
if not self.data_to_dst: if not self.data_to_dst:
return return
data = ''.join(self.data_to_dst) data = ''.join(self.data_to_dst)
self.data_to_dst = []
logging.debug('"{}" to {}'.format(data, self.dst_addr)) logging.debug('"{}" to {}'.format(data, self.dst_addr))
try: try:
sent = self.chan.send(data) sent = self.chan.send(data)
except socket.error as e: except (OSError, IOError) as e:
logging.error(e) logging.error(e)
if errno_from_exception(e) in _ERRNO_CONNRESET:
self.close() self.close()
else: else:
self.loop.update_handler(self.fd, IOLoop.WRITE)
else:
self.data_to_dst = []
data = data[sent:] data = data[sent:]
if data: if data:
self.data_to_dst.append(data) self.data_to_dst.append(data)