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

lint code

Browse source
This commit is contained in:
clowwindy 2012-06-06 15:43:50 +08:00
parent 5ccebd480c
commit e875df752f
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
local.py
View file

@ -64,13 +64,13 @@ class Socks5Server(SocketServer.StreamRequestHandler):
remote.close() remote.close()
def encrypt(self, data): def encrypt(self, data):
return data.translate(encrypt_table) return data.translate(encrypt_table)
def decrypt(self, data): def decrypt(self, data):
return data.translate(decrypt_table) return data.translate(decrypt_table)
def send_encrpyt(self, sock, data): def send_encrpyt(self, sock, data):
sock.send(self.encrypt(data)) sock.send(self.encrypt(data))
def handle(self): def handle(self):
try: try:
@ -81,8 +81,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
data = self.rfile.read(4) data = self.rfile.read(4)
mode = ord(data[1]) mode = ord(data[1])
if mode != 1: if mode != 1:
print 'mode != 1' print 'mode != 1'
return return
addrtype = ord(data[3]) addrtype = ord(data[3])
addr_to_send = data[3] addr_to_send = data[3]
if addrtype == 1: if addrtype == 1:
@ -94,9 +94,9 @@ class Socks5Server(SocketServer.StreamRequestHandler):
addr = self.rfile.read(ord(addr_len)) addr = self.rfile.read(ord(addr_len))
addr_to_send += addr_len + addr addr_to_send += addr_len + addr
else: else:
print 'not support' print 'not support'
# not support # not support
return return
addr_port = self.rfile.read(2) addr_port = self.rfile.read(2)
addr_to_send += addr_port addr_to_send += addr_port
port = struct.unpack('>H', addr_port) port = struct.unpack('>H', addr_port)

8
server.py
View file

@ -62,13 +62,13 @@ class Socks5Server(SocketServer.StreamRequestHandler):
remote.close() remote.close()
def encrypt(self, data): def encrypt(self, data):
return data.translate(encrypt_table) return data.translate(encrypt_table)
def decrypt(self, data): def decrypt(self, data):
return data.translate(decrypt_table) return data.translate(decrypt_table)
def send_encrpyt(self, sock, data): def send_encrpyt(self, sock, data):
sock.send(self.encrypt(data)) sock.send(self.encrypt(data))
def handle(self): def handle(self):
try: try:
@ -86,10 +86,10 @@ class Socks5Server(SocketServer.StreamRequestHandler):
return return
port = struct.unpack('>H', self.decrypt(self.rfile.read(2))) port = struct.unpack('>H', self.decrypt(self.rfile.read(2)))
try: try:
print 'Tcp connecting to', addr, port[0]
remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM) remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
remote.connect((addr, port[0])) remote.connect((addr, port[0]))
local = remote.getsockname() local = remote.getsockname()
print 'Tcp connect to', addr, port[0]
except socket.error: except socket.error:
# Connection refused # Connection refused
return return