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

refine

Browse source 
time diff set to 5 min
This commit is contained in:
BreakWa11 2015-10-30 10:22:04 +08:00
parent d9dc3ae0b5
commit c02fcbf746
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shadowsocks/obfsplugin/verify_simple.py
View file

@ -352,23 +352,24 @@ class obfs_auth_data(object):
self.startup_time = int(time.time() - 30) & 0xFFFFFFFF self.startup_time = int(time.time() - 30) & 0xFFFFFFFF
self.local_client_id = b'' self.local_client_id = b''
self.connection_id = 0 self.connection_id = 0
self.max_client = 16 # max active client count
self.max_buffer = max(self.max_client, 256) # max client id buffer size
def update(self, client_id, connection_id): def update(self, client_id, connection_id):
if client_id in self.client_id: if client_id in self.client_id:
self.client_id[client_id].update() self.client_id[client_id].update()
def insert(self, client_id, connection_id): def insert(self, client_id, connection_id):
max_client = 16
if client_id not in self.client_id or not self.client_id[client_id].enable: if client_id not in self.client_id or not self.client_id[client_id].enable:
active = 0 active = 0
for c_id in self.client_id: for c_id in self.client_id:
if self.client_id[c_id].is_active(): if self.client_id[c_id].is_active():
active += 1 active += 1
if active >= max_client: if active >= self.max_client:
logging.warn('auth_simple: max active clients exceeded') logging.warn('auth_simple: max active clients exceeded')
return False return False
if len(self.client_id) < max_client: if len(self.client_id) < self.max_client:
if client_id not in self.client_id: if client_id not in self.client_id:
self.client_id[client_id] = client_queue(connection_id) self.client_id[client_id] = client_queue(connection_id)
else: else:
@ -378,7 +379,7 @@ class obfs_auth_data(object):
random.shuffle(keys) random.shuffle(keys)
for c_id in keys: for c_id in keys:
if not self.client_id[c_id].is_active() and self.client_id[c_id].enable: if not self.client_id[c_id].is_active() and self.client_id[c_id].enable:
if len(self.client_id) >= 256: if len(self.client_id) >= self.max_buffer:
del self.client_id[c_id] del self.client_id[c_id]
else: else:
self.client_id[c_id].enable = False self.client_id[c_id].enable = False
@ -403,6 +404,7 @@ class auth_simple(verify_base):
self.has_recv_header = False self.has_recv_header = False
self.client_id = 0 self.client_id = 0
self.connection_id = 0 self.connection_id = 0
self.max_time_dif = 60 * 5 # time dif (second) setting
def init_data(self): def init_data(self):
return obfs_auth_data() return obfs_auth_data()
@ -524,7 +526,8 @@ class auth_simple(verify_base):
client_id = struct.unpack('<I', out_buf[4:8])[0] client_id = struct.unpack('<I', out_buf[4:8])[0]
connection_id = struct.unpack('<I', out_buf[8:12])[0] connection_id = struct.unpack('<I', out_buf[8:12])[0]
time_dif = common.int32((int(time.time()) & 0xffffffff) - utc_time) time_dif = common.int32((int(time.time()) & 0xffffffff) - utc_time)
if time_dif < 60 * -3 or time_dif > 60 * 3 or common.int32(utc_time - self.server_info.data.startup_time) < 0: if time_dif < -self.max_time_dif or time_dif > self.max_time_dif \
or common.int32(utc_time - self.server_info.data.startup_time) < 0:
self.raw_trans = True self.raw_trans = True
self.recv_buf = b'' self.recv_buf = b''
logging.info('auth_simple: wrong timestamp, time_dif %d, data %s' % (time_dif, binascii.hexlify(out_buf),)) logging.info('auth_simple: wrong timestamp, time_dif %d, data %s' % (time_dif, binascii.hexlify(out_buf),))