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

run with newest python version

Browse source
This commit is contained in:
破娃酱 2017-05-02 12:40:23 +08:00
parent 1e85d14a48
commit 03b1a53b9a
7 changed files with 24 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
logrun.sh
View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
cd `dirname $0` cd `dirname $0`
eval $(ps -ef | grep "[0-9] python server\\.py m" | awk '{print "kill "$2}') python_ver=$(ls /usr/lib|grep "^python"|tail -1)
eval $(ps -ef | grep "[0-9] ${python_ver} server\\.py m" | awk '{print "kill "$2}')
ulimit -n 512000 ulimit -n 512000
nohup python server.py m>> ssserver.log 2>&1 & nohup ${python_ver} server.py m>> ssserver.log 2>&1 &

5
run.sh
View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
cd `dirname $0` cd `dirname $0`
eval $(ps -ef | grep "[0-9] python server\\.py m" | awk '{print "kill "$2}') python_ver=$(ls /usr/lib|grep "^python"|tail -1)
eval $(ps -ef | grep "[0-9] ${python_ver} server\\.py m" | awk '{print "kill "$2}')
ulimit -n 512000 ulimit -n 512000
nohup python server.py m>> /dev/null 2>&1 & nohup ${python_ver} server.py m>> /dev/null 2>&1 &

8
shadowsocks/logrun.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
cd `dirname $0` cd `dirname $0`
eval $(ps -ef | grep "[0-9] python server\\.py a" | awk '{print "kill "$2}') python_ver=$(ls /usr/lib|grep "^python"|tail -1)
ulimit -n 4096 eval $(ps -ef | grep "[0-9] ${python_ver} server\\.py a" | awk '{print "kill "$2}')
nohup python server.py a >> ssserver.log 2>&1 & ulimit -n 512000
nohup ${python_ver} server.py a>> ssserver.log 2>&1 &

7
shadowsocks/run.sh
View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
cd `dirname $0` cd `dirname $0`
eval $(ps -ef | grep "[0-9] python server\\.py a" | awk '{print "kill "$2}') python_ver=$(ls /usr/lib|grep "^python"|tail -1)
ulimit -n 4096 eval $(ps -ef | grep "[0-9] ${python_ver} server\\.py a" | awk '{print "kill "$2}')
nohup python server.py a >> /dev/null 2>&1 & ulimit -n 512000
nohup ${python_ver} server.py a>> /dev/null 2>&1 &

4
shadowsocks/stop.sh
View file

@ -1,3 +1,5 @@
#!/bin/bash #!/bin/bash
eval $(ps -ef | grep "[0-9] python server\\.py a" | awk '{print "kill "$2}') python_ver=$(ls /usr/lib|grep "^python"|tail -1)
eval $(ps -ef | grep "[0-9] ${python_ver} server\\.py a" | awk '{print "kill "$2}')

50
shadowsocks/udprelay.py
View file

@ -311,41 +311,6 @@ class UDPRelay(object):
client.info('close_client pass %s' % client) client.info('close_client pass %s' % client)
pass pass
def _pre_parse_udp_header(self, data):
if data is None:
return
datatype = common.ord(data[0])
if datatype == 0x8:
if len(data) >= 8:
crc = binascii.crc32(data) & 0xffffffff
if crc != 0xffffffff:
logging.warn('uncorrect CRC32, maybe wrong password or '
'encryption method')
return None
cmd = common.ord(data[1])
request_id = struct.unpack('>H', data[2:4])[0]
data = data[4:-4]
return (cmd, request_id, data)
elif len(data) >= 6 and common.ord(data[1]) == 0x0:
crc = binascii.crc32(data) & 0xffffffff
if crc != 0xffffffff:
logging.warn('uncorrect CRC32, maybe wrong password or '
'encryption method')
return None
cmd = common.ord(data[1])
data = data[2:-4]
return (cmd, 0, data)
else:
logging.warn('header too short, maybe wrong password or '
'encryption method')
return None
return data
def _pack_rsp_data(self, cmd, request_id, data):
_rand_data = b"123456789abcdefghijklmnopqrstuvwxyz" * 2
reqid_str = struct.pack(">H", request_id)
return b''.join([CMD_VER_STR, common.chr(cmd), reqid_str, data, _rand_data[:random.randint(0, len(_rand_data))], reqid_str])
def _handel_protocol_error(self, client_address, ogn_data): def _handel_protocol_error(self, client_address, ogn_data):
#raise Exception('can not parse header') #raise Exception('can not parse header')
logging.warn("Protocol ERROR, UDP ogn data %s from %s:%d" % (binascii.hexlify(ogn_data), client_address[0], client_address[1])) logging.warn("Protocol ERROR, UDP ogn data %s from %s:%d" % (binascii.hexlify(ogn_data), client_address[0], client_address[1]))
@ -398,15 +363,9 @@ class UDPRelay(object):
#logging.info("UDP data %s" % (binascii.hexlify(data),)) #logging.info("UDP data %s" % (binascii.hexlify(data),))
if not self._is_local: if not self._is_local:
data = pre_parse_header(data) data = pre_parse_header(data)
data = self._pre_parse_udp_header(data)
if data is None: if data is None:
return return
if type(data) is tuple:
return
#return self._handle_tcp_over_udp(data, r_addr)
try: try:
header_result = parse_header(data) header_result = parse_header(data)
except: except:
@ -450,14 +409,12 @@ class UDPRelay(object):
if client_pair is None: if client_pair is None:
if self._forbidden_iplist: if self._forbidden_iplist:
if common.to_str(sa[0]) in self._forbidden_iplist: if common.to_str(sa[0]) in self._forbidden_iplist:
logging.debug('IP %s is in forbidden list, drop' % logging.debug('IP %s is in forbidden list, drop' % common.to_str(sa[0]))
common.to_str(sa[0]))
# drop # drop
return return
if self._forbidden_portset: if self._forbidden_portset:
if sa[1] in self._forbidden_portset: if sa[1] in self._forbidden_portset:
logging.debug('Port %d is in forbidden list, reject' % logging.debug('Port %d is in forbidden list, reject' % sa[1])
sa[1])
# drop # drop
return return
client = socket.socket(af, socktype, proto) client = socket.socket(af, socktype, proto)
@ -469,7 +426,6 @@ class UDPRelay(object):
is_dns = True is_dns = True
else: else:
pass pass
#logging.info("unknown data %s" % (binascii.hexlify(data),))
if sa[1] == 53 and is_dns: #DNS if sa[1] == 53 and is_dns: #DNS
logging.debug("DNS query %s from %s:%d" % (common.to_str(sa[0]), r_addr[0], r_addr[1])) logging.debug("DNS query %s from %s:%d" % (common.to_str(sa[0]), r_addr[0], r_addr[1]))
self._cache_dns_client[key] = (client, uid) self._cache_dns_client[key] = (client, uid)
@ -504,7 +460,6 @@ class UDPRelay(object):
if not data: if not data:
return return
try: 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)) client.sendto(data, (server_addr, server_port))
self.add_transfer_u(client_uid, len(data)) self.add_transfer_u(client_uid, len(data))
if client_pair is None: # new request if client_pair is None: # new request
@ -513,6 +468,7 @@ class UDPRelay(object):
(common.to_str(server_addr), server_port, addr, port, user_id)) (common.to_str(server_addr), server_port, addr, port, user_id))
except IOError as e: except IOError as e:
err = eventloop.errno_from_exception(e) err = eventloop.errno_from_exception(e)
logging.warning('IOError sendto %s:%d by user %d' % (server_addr, server_port, user_id))
if err in (errno.EINPROGRESS, errno.EAGAIN): if err in (errno.EINPROGRESS, errno.EAGAIN):
pass pass
else: else:

4
stop.sh
View file

@ -1,3 +1,5 @@
#!/bin/bash #!/bin/bash
eval $(ps -ef | grep "[0-9] python server\\.py m" | awk '{print "kill "$2}') python_ver=$(ls /usr/lib|grep "^python"|tail -1)
eval $(ps -ef | grep "[0-9] ${python_ver} server\\.py m" | awk '{print "kill "$2}')