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

improve rand

Browse source
This commit is contained in:
破娃酱 2017-03-26 00:00:01 +08:00
parent 76fd4296a5
commit 922cf462d6
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
shadowsocks/obfsplugin/auth.py
View file

@ -26,6 +26,7 @@ import base64
import time import time
import datetime import datetime
import random import random
import math
import struct import struct
import zlib import zlib
import hmac import hmac
@ -1185,16 +1186,24 @@ class auth_aes128_sha1(auth_base):
max_client = 64 max_client = 64
self.server_info.data.set_max_client(max_client) self.server_info.data.set_max_client(max_client)
def trapezoid_random_float(self, d):
if d == 0:
return random.random()
s = random.random()
a = 1 - d
return (math.sqrt(a * a + 4 * d * s) - a) / (2 * d)
def trapezoid_random_int(self, max_val, d):
v = self.trapezoid_random_float(d)
return int(v * max_val)
def rnd_data_len(self, buf_size, full_buf_size): def rnd_data_len(self, buf_size, full_buf_size):
if buf_size > 1300 or self.last_rnd_len > 1300 or full_buf_size >= self.server_info.buffer_size: rev_len = self.server_info.tcp_mss - buf_size - 9
if rev_len <= 0 or self.last_rnd_len >= self.server_info.buffer_size or full_buf_size >= self.server_info.buffer_size:
return 0 return 0
if buf_size > 1100: if buf_size > 900:
return common.ord(os.urandom(1)[0]) % 128 return struct.unpack('>H', os.urandom(2))[0] % rev_len
#self.pack_id return self.trapezoid_random_int(rev_len, -0.3)
if buf_size > 400:
return struct.unpack('>H', os.urandom(2))[0] % 256
else:
return struct.unpack('>H', os.urandom(2))[0] % 1024
def rnd_data(self, buf_size, full_buf_size): def rnd_data(self, buf_size, full_buf_size):
data_len = self.rnd_data_len(buf_size, full_buf_size) data_len = self.rnd_data_len(buf_size, full_buf_size)