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

main: fix pep8 style

Browse source
This commit is contained in:
thomashuang 2014-02-22 02:07:29 +08:00
parent ffffbd4542
commit 8b69df61e7
2 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
shadowsocks/local.py
View file

@ -174,17 +174,15 @@ class ShadowSocksServer(object):
def default_options(self): def default_options(self):
return { return {
"server":"127.0.0.1", "server": "127.0.0.1",
"server_port":8388, "server_port": 8388,
"local_port":1081, "local_port": 1081,
"password":"Keep Your Password", "password": "Keep Your Password",
"timeout":60, "timeout": 60,
"method":"aes-128-cfb", "method": "aes-128-cfb",
"IPv6": False "IPv6": False
} }
def serve_forever(self): def serve_forever(self):
self.set_logging() self.set_logging()
self.run_info() self.run_info()
@ -197,7 +195,7 @@ class ShadowSocksServer(object):
KEY = self.options['password'] KEY = self.options['password']
METHOD = self.options.get('method', None) METHOD = self.options.get('method', None)
LOCAL = self.options.get('local', '') LOCAL = self.options.get('local', '')
encrypt.init_table(KEY, METHOD) encrypt.init_table(KEY, METHOD)
try: try:
@ -219,7 +217,8 @@ class ShadowSocksServer(object):
def set_logging(self): def set_logging(self):
logfmt = '[%%(levelname)s] %s%%(message)s' % '%(name)s - ' logfmt = '[%%(levelname)s] %s%%(message)s' % '%(name)s - '
config = lambda x: logging.basicConfig(level=x, format='[%(asctime)s] ' + logfmt, datefmt='%Y%m%d %H:%M:%S') config = lambda x: logging.basicConfig(level=x,
format='[%(asctime)s] ' + logfmt, datefmt='%Y%m%d %H:%M:%S')
if self.options.get('debug'): if self.options.get('debug'):
config(logging.DEBUG) config(logging.DEBUG)
else: else:
@ -292,6 +291,5 @@ class ShadowSocksServer(object):
logging.info('shadowsocks %s' % version) logging.info('shadowsocks %s' % version)
if __name__ == '__main__': if __name__ == '__main__':
ShadowSocksServer().serve_forever() ShadowSocksServer().serve_forever()

37
shadowsocks/server.py
View file

@ -63,6 +63,7 @@ class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
class Socks5Server(SocketServer.StreamRequestHandler): class Socks5Server(SocketServer.StreamRequestHandler):
def handle_tcp(self, sock, remote): def handle_tcp(self, sock, remote):
try: try:
fdset = [sock, remote] fdset = [sock, remote]
@ -95,7 +96,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
def handle(self): def handle(self):
try: try:
self.encryptor = encrypt.Encryptor(self.server.key, self.server.method) self.encryptor = encrypt.Encryptor(
self.server.key, self.server.method)
sock = self.connection sock = self.connection
iv_len = self.encryptor.iv_len() iv_len = self.encryptor.iv_len()
if iv_len: if iv_len:
@ -125,6 +127,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
except socket.error, e: except socket.error, e:
logging.warn(e) logging.warn(e)
class ShadowSocksServer(object): class ShadowSocksServer(object):
def __init__(self): def __init__(self):
@ -133,17 +136,15 @@ class ShadowSocksServer(object):
def default_options(self): def default_options(self):
return { return {
"server":"127.0.0.1", "server": "127.0.0.1",
"server_port":8388, "server_port": 8388,
"local_port":1081, "local_port": 1081,
"password":"Keep Your Password", "password": "Keep Your Password",
"timeout":60, "timeout": 60,
"method":"aes-128-cfb", "method": "aes-128-cfb",
"IPv6": False "IPv6": False
} }
def serve_forever(self): def serve_forever(self):
self.set_logging() self.set_logging()
@ -160,19 +161,21 @@ class ShadowSocksServer(object):
if PORTPASSWORD: if PORTPASSWORD:
if PORT or KEY: if PORT or KEY:
logging.warn('warning: port_password should not be used with server_port and password. server_port and password will be ignored') logging.warn(
'warning: port_password should not be used with server_port and password. server_port and password will be ignored')
else: else:
PORTPASSWORD = {} PORTPASSWORD = {}
PORTPASSWORD[str(PORT)] = KEY PORTPASSWORD[str(PORT)] = KEY
encrypt.init_table(KEY, METHOD) encrypt.init_table(KEY, METHOD)
if self.options['IPv6']: if self.options['IPv6']:
ThreadingTCPServer.address_family = socket.AF_INET6 ThreadingTCPServer.address_family = socket.AF_INET6
for port, key in PORTPASSWORD.items(): for port, key in PORTPASSWORD.items():
server = ThreadingTCPServer((SERVER, int(port)), Socks5Server) server = ThreadingTCPServer((SERVER, int(port)), Socks5Server)
server.key, server.method, server.timeout = key, METHOD, int(TIMEOUT) server.key, server.method, server.timeout = key, METHOD, int(
logging.info("starting server at %s:%d" % tuple(server.server_address[:2])) TIMEOUT)
logging.info("starting server at %s:%d" %
tuple(server.server_address[:2]))
threading.Thread(target=server.serve_forever).start() threading.Thread(target=server.serve_forever).start()
def check_config(self): def check_config(self):
@ -180,7 +183,8 @@ class ShadowSocksServer(object):
def set_logging(self): def set_logging(self):
logfmt = '[%%(levelname)s] %s%%(message)s' % '%(name)s - ' logfmt = '[%%(levelname)s] %s%%(message)s' % '%(name)s - '
config = lambda x: logging.basicConfig(level=x, format='[%(asctime)s] ' + logfmt, datefmt='%Y%m%d %H:%M:%S') config = lambda x: logging.basicConfig(level=x,
format='[%(asctime)s] ' + logfmt, datefmt='%Y%m%d %H:%M:%S')
if self.options.get('debug'): if self.options.get('debug'):
config(logging.DEBUG) config(logging.DEBUG)
else: else:
@ -253,9 +257,6 @@ class ShadowSocksServer(object):
logging.info('shadowsocks %s' % version) logging.info('shadowsocks %s' % version)
if __name__ == '__main__': if __name__ == '__main__':
try: try:
ShadowSocksServer().serve_forever() ShadowSocksServer().serve_forever()