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

encrypt speed test

Browse source
This commit is contained in:
breakwa11 2015-06-26 11:33:59 +08:00
parent ad588af75f
commit 543a5903a1
3 changed files with 52 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server_pool.py
View file

@ -134,7 +134,6 @@ class ServerPool(object):
try: try:
logging.info("starting server at %s:%d" % (a_config['server'], port)) logging.info("starting server at %s:%d" % (a_config['server'], port))
if not ipv6_ok:
tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False) tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False)
tcp_server.add_to_loop(self.loop) tcp_server.add_to_loop(self.loop)
self.tcp_servers_pool.update({port: tcp_server}) self.tcp_servers_pool.update({port: tcp_server})
@ -144,6 +143,7 @@ class ServerPool(object):
self.udp_servers_pool.update({port: udp_server}) self.udp_servers_pool.update({port: udp_server})
except Exception, e: except Exception, e:
if not ipv6_ok:
logging.warn("IPV4 %s " % (e,)) logging.warn("IPV4 %s " % (e,))
return True return True

33
shadowsocks/encrypt_test.py Normal file
View file

@ -0,0 +1,33 @@
from __future__ import absolute_import, division, print_function, \
with_statement
import sys
import os
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
from crypto import rc4_md5
from crypto import openssl
from crypto import sodium
from crypto import table
def main():
print("\n""rc4_md5")
rc4_md5.test()
print("\n""aes-256-cfb")
openssl.test_aes_256_cfb()
print("\n""aes-128-cfb")
openssl.test_aes_128_cfb()
print("\n""rc4")
openssl.test_rc4()
print("\n""salsa20")
sodium.test_salsa20()
print("\n""chacha20")
sodium.test_chacha20()
print("\n""table")
table.test_encryption()
if __name__ == '__main__':
main()

3
shadowsocks/server.py
View file

@ -54,6 +54,7 @@ def main():
for port, password in config['port_password'].items(): for port, password in config['port_password'].items():
a_config = config.copy() a_config = config.copy()
ipv6_ok = False ipv6_ok = False
logging.info("server start with password [%s] method [%s]" % (password, a_config['method']))
if 'server_ipv6' in a_config: if 'server_ipv6' in a_config:
try: try:
if len(a_config['server_ipv6']) > 2 and a_config['server_ipv6'][0] == "[" and a_config['server_ipv6'][-1] == "]": if len(a_config['server_ipv6']) > 2 and a_config['server_ipv6'][0] == "[" and a_config['server_ipv6'][-1] == "]":
@ -70,7 +71,6 @@ def main():
except Exception as e: except Exception as e:
shell.print_exception(e) shell.print_exception(e)
if not ipv6_ok:
try: try:
a_config = config.copy() a_config = config.copy()
a_config['server_port'] = int(port) a_config['server_port'] = int(port)
@ -80,6 +80,7 @@ def main():
tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False)) tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False))
udp_servers.append(udprelay.UDPRelay(a_config, dns_resolver, False)) udp_servers.append(udprelay.UDPRelay(a_config, dns_resolver, False))
except Exception as e: except Exception as e:
if not ipv6_ok:
shell.print_exception(e) shell.print_exception(e)
def run_server(): def run_server():