vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

no

Browse source
This commit is contained in:
jinxing 2014-04-15 21:21:23 +08:00
parent b78d98c3a2
commit 09378d3931
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -25,3 +25,6 @@ pip-log.txt
#Mr Developer #Mr Developer
.mr.developer.cfg .mr.developer.cfg
#
config.json

6
config.json
View file

@ -1,8 +1,8 @@
{ {
"server":"localhost", "server":"asia.jinxing.me",
"server_port":8388, "server_port":28388,
"local_port":1080, "local_port":1080,
"password":"barfoo!", "password":"x980barfoo!",
"timeout":600, "timeout":600,
"method":"table" "method":"table"
} }

5
shadowsocks/ioloop.py
View file

@ -12,6 +12,7 @@ import select
import logging import logging
import socket import socket
import errno import errno
import binascii
try: try:
from cStringIO import StringIO from cStringIO import StringIO
@ -201,8 +202,8 @@ class IOHandler(BaseHandler):
self._ios.real_write() self._ios.real_write()
def handle_error(self, events): def handle_error(self, events):
logging.error("handle_error fd(%s)", self._fd) logging.error("handle_error fd(%s), events: %s", self._fd, binascii.b2a_hex(events))
raise IOLoopError("io error: %x" % events) self._ios.close()
class SimpleCopyFileHandler(IOHandler): class SimpleCopyFileHandler(IOHandler):

3
shadowsocks/server-epoll.py
View file

@ -204,14 +204,13 @@ class LeftTunnelHandler(BaseTunnelHandler):
try: try:
logging.info('connecting to remote %s:%d', addr, port) logging.info('connecting to remote %s:%d', addr, port)
_start_time = time.time() _start_time = time.time()
# remote_socket = socket.create_connection((addr, port), G_CONFIG['timeout'])
remote_socket = socket.socket() remote_socket = socket.socket()
remote_socket.connect((addr, port)) remote_socket.connect((addr, port))
remote_socket.setblocking(0) remote_socket.setblocking(0)
logging.info('cost time: %d', time.time()-_start_time) logging.info('cost time: %d', time.time()-_start_time)
except socket.error, e: except socket.error, e:
# Connection refused # Connection refused
logging.warn("connect_to_remote(): %s, args: %r", e, e.args) logging.warn(e)
return None return None
remote_ts = TunnelStream(remote_socket) remote_ts = TunnelStream(remote_socket)