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

respond ok to add and remove commands

Browse source
This commit is contained in:
clowwindy 2015-08-06 19:44:59 +08:00
parent 77f9979b2e
commit c8b3f71e1b
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shadowsocks/manager.py
View file

@ -114,14 +114,17 @@ class Manager(object):
command, config = parsed
a_config = self._config.copy()
if config:
# let the command override the configuration file
a_config.update(config)
if 'server_port' not in a_config:
logging.error('can not find server_port in config')
else:
if command == 'add':
self.add_port(a_config)
self._send_control_data(b'ok')
elif command == 'remove':
self.remove_port(a_config)
self._send_control_data(b'ok')
elif command == 'ping':
self._send_control_data(b'pong')
else:
@ -152,6 +155,7 @@ class Manager(object):
def send_data(data_dict):
if data_dict:
# use compact JSON format (without space)
data = common.to_bytes(json.dumps(data_dict,
separators=(',', ':')))
self._send_control_data(b'stat: ' + data)
@ -159,6 +163,7 @@ class Manager(object):
for k, v in self._statistics.items():
r[k] = v
i += 1
# split the data into segments that fit in UDP packets
if i >= STAT_SEND_LIMIT:
send_data(r)
r.clear()
@ -229,9 +234,14 @@ def test():
cli.send(b'add: {"server_port":7001, "password":"1234"}')
time.sleep(1)
assert 7001 in manager._relays
data, addr = cli.recvfrom(1506)
assert b'ok' in data
cli.send(b'remove: {"server_port":8381}')
time.sleep(1)
assert 8381 not in manager._relays
data, addr = cli.recvfrom(1506)
assert b'ok' in data
logging.info('add and remove test passed')
# test statistics for TCP