diff --git a/db_transfer.py b/db_transfer.py index 4bb7ba6..0f3a7c9 100644 --- a/db_transfer.py +++ b/db_transfer.py @@ -88,6 +88,7 @@ class TransferBase(object): new_servers = {} allow_users = {} mu_servers = {} + config = shell.get_config(False) for row in rows: try: allow = switchrule.isTurnOn(row) and row['enable'] == 1 and row['u'] + row['d'] < row['transfer_enable'] @@ -152,7 +153,6 @@ class TransferBase(object): else: self.new_server(port, passwd, cfg) else: - config = shell.get_config(False) if ServerPool.get_instance().server_is_run(port) > 0: if config['additional_ports_only'] or not allow: logging.info('db stop server at port [%s]' % (port,)) diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py index fa9f404..f117781 100644 --- a/shadowsocks/udprelay.py +++ b/shadowsocks/udprelay.py @@ -506,11 +506,11 @@ class UDPRelay(object): try: #logging.info('UDP handle_server sendto %s:%d %d bytes' % (common.to_str(server_addr), server_port, len(data))) client.sendto(data, (server_addr, server_port)) + self.add_transfer_u(client_uid, len(data)) if client_pair is None: # new request addr, port = client.getsockname()[:2] common.connect_log('UDP data to %s:%d from %s:%d by UID %d' % (common.to_str(server_addr), server_port, addr, port, user_id)) - self.add_transfer_u(client_uid, len(data)) except IOError as e: err = eventloop.errno_from_exception(e) if err in (errno.EINPROGRESS, errno.EAGAIN):