dnomd343
/
shadowsocksr
mirror of https://github.com/dnomd343/shadowsocksr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix 'server_ipv6' value type 

revert pymysql
akkariiin/dev
AkaneAkaza 7 years ago
parent
accc218e4e
commit
119defdf4b
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      server_pool.py
  2. 2
      setup_cymysql.sh
  3. 2
      shadowsocks/server.py

8
server_pool.py
View File

@ -119,12 +119,12 @@ class ServerPool(object):
a_config.update(user_config) a_config.update(user_config)
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] == "]":
a_config['server_ipv6'] = a_config['server_ipv6'][1:-1] a_config['server_ipv6'] = a_config['server_ipv6'][1:-1]
a_config['server'] = a_config['server_ipv6'] a_config['server'] = common.to_str(a_config['server_ipv6'])
a_config['server_port'] = port a_config['server_port'] = port
a_config['max_connect'] = 128 a_config['max_connect'] = 128
a_config['method'] = common.to_str(a_config['method']) a_config['method'] = common.to_str(a_config['method'])
try: try:
logging.info("starting server at [%s]:%d" % (common.to_str(a_config['server']), port)) logging.info("starting server at [%s]:%d" % (a_config['server'], port))
tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False, stat_counter=self.stat_counter) tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False, stat_counter=self.stat_counter)
tcp_server.add_to_loop(self.loop) tcp_server.add_to_loop(self.loop)
@ -134,7 +134,7 @@ class ServerPool(object):
udp_server.add_to_loop(self.loop) udp_server.add_to_loop(self.loop)
self.udp_ipv6_servers_pool.update({port: udp_server}) self.udp_ipv6_servers_pool.update({port: udp_server})
if common.to_str(a_config['server_ipv6']) == "::": if a_config['server_ipv6'] == "::":
ipv6_ok = True ipv6_ok = True
except Exception as e: except Exception as e:
logging.warn("IPV6 %s " % (e,)) logging.warn("IPV6 %s " % (e,))
@ -150,7 +150,7 @@ class ServerPool(object):
a_config['max_connect'] = 128 a_config['max_connect'] = 128
a_config['method'] = common.to_str(a_config['method']) a_config['method'] = common.to_str(a_config['method'])
try: try:
logging.info("starting server at %s:%d" % (common.to_str(a_config['server']), port)) logging.info("starting server at %s:%d" % (a_config['server'], port))
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)

2
setup_cymysql.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
rm -rf CyMySQL rm -rf CyMySQL
rm -rf cymysql rm -rf cymysql
git clone https://github.com/PyMySQL/CyMySQL.git git clone https://github.com/nakagami/CyMySQL.git
mv CyMySQL/cymysql ./ mv CyMySQL/cymysql ./
rm -rf CyMySQL rm -rf CyMySQL

2
shadowsocks/server.py
View File

@ -120,7 +120,7 @@ def main():
a_config['obfs_param'] = obfs_param a_config['obfs_param'] = obfs_param
a_config['out_bind'] = bind a_config['out_bind'] = bind
a_config['out_bindv6'] = bindv6 a_config['out_bindv6'] = bindv6
a_config['server'] = a_config['server_ipv6'] a_config['server'] = common.to_str(a_config['server_ipv6'])
logging.info("starting server at [%s]:%d" % logging.info("starting server at [%s]:%d" %
(a_config['server'], int(port))) (a_config['server'], int(port)))
tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False, stat_counter=stat_counter_dict)) tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False, stat_counter=stat_counter_dict))

Write Preview
Loading…
Cancel
Save