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

refine user transfer

Browse source
This commit is contained in:
破娃酱 2017-01-13 21:52:17 +08:00
parent d4b7483ef0
commit 4048abaeff
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shadowsocks/tcprelay.py
View file

@ -1108,7 +1108,8 @@ class TCPRelay(object):
else: else:
if user not in self.server_user_transfer_ul: if user not in self.server_user_transfer_ul:
self.server_user_transfer_ul[user] = 0 self.server_user_transfer_ul[user] = 0
self.server_user_transfer_ul[user] += transfer self.server_user_transfer_ul[user] += transfer + self.server_transfer_ul
self.server_transfer_ul = 0
def add_transfer_d(self, user, transfer): def add_transfer_d(self, user, transfer):
if user is None: if user is None:
@ -1116,7 +1117,8 @@ class TCPRelay(object):
else: else:
if user not in self.server_user_transfer_dl: if user not in self.server_user_transfer_dl:
self.server_user_transfer_dl[user] = 0 self.server_user_transfer_dl[user] = 0
self.server_user_transfer_dl[user] += transfer self.server_user_transfer_dl[user] += transfer + self.server_transfer_dl
self.server_transfer_dl = 0
def update_stat(self, port, stat_dict, val): def update_stat(self, port, stat_dict, val):
newval = stat_dict.get(0, 0) + val newval = stat_dict.get(0, 0) + val

6
shadowsocks/udprelay.py
View file

@ -1008,7 +1008,8 @@ class UDPRelay(object):
else: else:
if user not in self.server_user_transfer_ul: if user not in self.server_user_transfer_ul:
self.server_user_transfer_ul[user] = 0 self.server_user_transfer_ul[user] = 0
self.server_user_transfer_ul[user] += transfer self.server_user_transfer_ul[user] += transfer + self.server_transfer_ul
self.server_transfer_ul = 0
def add_transfer_d(self, user, transfer): def add_transfer_d(self, user, transfer):
if user is None: if user is None:
@ -1016,7 +1017,8 @@ class UDPRelay(object):
else: else:
if user not in self.server_user_transfer_dl: if user not in self.server_user_transfer_dl:
self.server_user_transfer_dl[user] = 0 self.server_user_transfer_dl[user] = 0
self.server_user_transfer_dl[user] += transfer self.server_user_transfer_dl[user] += transfer + self.server_transfer_dl
self.server_transfer_dl = 0
def _close_client_pair(self, client_pair): def _close_client_pair(self, client_pair):
client, uid = client_pair client, uid = client_pair