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

Refactor.

Browse source
This commit is contained in:
ayanamist 2013-02-28 11:43:13 +08:00
parent a35cf6b84f
commit 041583de8d
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server.py
View file

@ -78,22 +78,22 @@ class ConnHandler(PairedStream):
def on_addrtype(self, addrtype): def on_addrtype(self, addrtype):
addrtype = ord(crypto.decrypt(addrtype)) addrtype = ord(crypto.decrypt(addrtype))
if addrtype == 1: if addrtype == 1:
self.read_bytes(4, self.on_addr1) self.read_bytes(4, self.on_ipaddr)
elif addrtype == 3: elif addrtype == 3:
self.read_bytes(1, self.on_addr3_length) self.read_bytes(1, self.on_hostname_length)
else: else:
logging.warn("addr_type %d not support" % addrtype) logging.warn("addr_type %d not support" % addrtype)
self.close() self.close()
def on_addr1(self, addr): def on_ipaddr(self, addr):
self.remote_addr = socket.inet_ntoa(crypto.decrypt(addr)) self.remote_addr = socket.inet_ntoa(crypto.decrypt(addr))
self.read_bytes(2, self.on_port) self.read_bytes(2, self.on_port)
def on_addr3_length(self, length): def on_hostname_length(self, length):
length = ord(crypto.decrypt(length)) length = ord(crypto.decrypt(length))
self.read_bytes(length, self.on_addr3) self.read_bytes(length, self.on_hostname)
def on_addr3(self, addr): def on_hostname(self, addr):
self.remote_addr = crypto.decrypt(addr) self.remote_addr = crypto.decrypt(addr)
self.read_bytes(2, self.on_port) self.read_bytes(2, self.on_port)
@ -136,7 +136,7 @@ if __name__ == "__main__":
with open(options.config_path, "rb") as f: with open(options.config_path, "rb") as f:
config = json.load(f) config = json.load(f)
server_port = options.server_port if options.server_port else config["server_port"] server_port = int(options.server_port) if options.server_port else config["server_port"]
server_password = options.server_password if options.server_password else config['password'] server_password = options.server_password if options.server_password else config['password']
if getattr(options, "ipv6"): if getattr(options, "ipv6"):