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

fix new() problem

Browse source
This commit is contained in:
clowwindy 2012-04-20 22:42:18 +08:00
parent 833bd3de41
commit 1c49b9c688
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
local.py
View file

@ -35,7 +35,7 @@ import time
import SocketServer import SocketServer
def get_table(key): def get_table(key):
m = hashlib.md5.new() m = hashlib.md5()
m.update(key) m.update(key)
s = m.digest() s = m.digest()
(a, b) = struct.unpack('<QQ', s) (a, b) = struct.unpack('<QQ', s)

8
server.py
View file

@ -31,7 +31,7 @@ import string
import hashlib import hashlib
def get_table(key): def get_table(key):
m = hashlib.md5.new() m = hashlib.md5()
m.update(key) m.update(key)
s = m.digest() s = m.digest()
(a, b) = struct.unpack('<QQ', s) (a, b) = struct.unpack('<QQ', s)
@ -76,7 +76,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
if addrtype == 1: if addrtype == 1:
addr = socket.inet_ntoa(self.decrypt(self.rfile.read(4))) addr = socket.inet_ntoa(self.decrypt(self.rfile.read(4)))
elif addrtype == 3: elif addrtype == 3:
addr = self.decrypt(self.rfile.read(ord(self.decrypt(sock.recv(1))))) addr = self.decrypt(
self.rfile.read(ord(self.decrypt(sock.recv(1)))))
else: else:
# not support # not support
return return
@ -87,7 +88,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
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()
reply += socket.inet_aton(local[0]) + struct.pack(">H", local[1]) reply += socket.inet_aton(local[0]) + struct.pack(">H",
local[1])
print 'Tcp connect to', addr, port[0] print 'Tcp connect to', addr, port[0]
else: else:
reply = "\x05\x07\x00\x01" # Command not supported reply = "\x05\x07\x00\x01" # Command not supported