From 70c8373a0fca2cac05df4b2d8bf7e21b63aa9d57 Mon Sep 17 00:00:00 2001 From: Falseen Date: Fri, 17 Feb 2017 21:08:50 +0800 Subject: [PATCH] changed "add socks5 header to data" to "add ss header to data" and changed "remove socks5 header" to "remove ss header" --- shadowsocks/common.py | 2 +- shadowsocks/udprelay.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shadowsocks/common.py b/shadowsocks/common.py index a39112e..e2a0e31 100644 --- a/shadowsocks/common.py +++ b/shadowsocks/common.py @@ -160,7 +160,7 @@ def pack_addr(address): return b'\x03' + chr(len(address)) + address -# add socks5 request header +# add ss header def add_header(address, port, data): header = b'' header = pack_addr(address) + struct.pack('>H', port) + data diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py index 169fc0b..7f405af 100644 --- a/shadowsocks/udprelay.py +++ b/shadowsocks/udprelay.py @@ -158,7 +158,7 @@ class UDPRelay(object): self._stat_callback(self._listen_port, len(data)) if self._is_local: if self.is_tunnel: - # add socks5 header to data + # add ss header to data tunnel_remote = self.tunnel_remote tunnel_remote_port = self.tunnel_remote_port data = common.add_header(tunnel_remote, @@ -282,7 +282,7 @@ class UDPRelay(object): return addrtype, dest_addr, dest_port, header_length = header_result if self.is_tunnel: - # remove socks5 header + # remove ss header response = data[7:] else: response = b'\x00\x00\x00' + data