shadowsocks 0.9 → 0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/shadowsocks/parser/base.rb +2 -12
- data/lib/shadowsocks/parser/local.rb +18 -0
- data/lib/shadowsocks/parser/server.rb +19 -0
- data/lib/shadowsocks/server.rb +1 -1
- data/lib/shadowsocks/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c05c7982253d7dca12efaf7d099f833cb023ecb7
|
4
|
+
data.tar.gz: 88c4af0e02523a3a84c3c7abdb87eff37b8797c6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c6863718700fd2284d59bc189b24b83d2c7658f4fe6cb81bc2e69b4b7a4c44f0f6f27a84a148c43b41364db93164379bd9200409d17928349e05637b7276e08d
|
7
|
+
data.tar.gz: 41ead82ef4f94379f39ac1a362e04d5dca166e684295224ad498a8fae859254fd6864578f8a9c412563098d80f69ea94126f1754e4eddc22e3e848b59bf185ab
|
@@ -35,21 +35,11 @@ module Shadowsocks
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def remote_addr
|
38
|
-
|
39
|
-
when :domain
|
40
|
-
data[2, addr_len + 3]
|
41
|
-
when :ip
|
42
|
-
inet_ntoa data[1..4]
|
43
|
-
end
|
38
|
+
raise 'Called abstract method: remote_addr'
|
44
39
|
end
|
45
40
|
|
46
41
|
def remote_port
|
47
|
-
|
48
|
-
when :domain
|
49
|
-
data[5 + addr_len, 2].unpack('s>')[0]
|
50
|
-
when :ip
|
51
|
-
data[5, 2].unpack('s>')[0]
|
52
|
-
end
|
42
|
+
raise 'Called abstract method: remote_port'
|
53
43
|
end
|
54
44
|
|
55
45
|
def header_length
|
@@ -10,6 +10,24 @@ module Shadowsocks
|
|
10
10
|
data[4].unpack('c')[0]
|
11
11
|
end
|
12
12
|
end
|
13
|
+
|
14
|
+
def remote_addr
|
15
|
+
case mode
|
16
|
+
when :domain
|
17
|
+
data[2, addr_len + 3]
|
18
|
+
when :ip
|
19
|
+
inet_ntoa data[1..4]
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
def remote_port
|
24
|
+
case mode
|
25
|
+
when :domain
|
26
|
+
data[5 + addr_len, 2].unpack('s>')[0]
|
27
|
+
when :ip
|
28
|
+
data[5, 2].unpack('s>')[0]
|
29
|
+
end
|
30
|
+
end
|
13
31
|
end
|
14
32
|
end
|
15
33
|
end
|
@@ -10,6 +10,25 @@ module Shadowsocks
|
|
10
10
|
data[1].unpack('c')[0]
|
11
11
|
end
|
12
12
|
end
|
13
|
+
|
14
|
+
def remote_addr
|
15
|
+
case mode
|
16
|
+
when :domain
|
17
|
+
data[2, addr_len]
|
18
|
+
when :ip
|
19
|
+
inet_ntoa data[1..4]
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
def remote_port
|
24
|
+
case mode
|
25
|
+
when :domain
|
26
|
+
data[2 + addr_len, 2].unpack('s>')[0]
|
27
|
+
when :ip
|
28
|
+
data[5, 2].unpack('s>')[0]
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
13
32
|
end
|
14
33
|
end
|
15
34
|
end
|
data/lib/shadowsocks/server.rb
CHANGED
@@ -2,7 +2,7 @@ module Shadowsocks
|
|
2
2
|
module Server
|
3
3
|
class RequestConnector < ::Shadowsocks::Tunnel
|
4
4
|
def post_init
|
5
|
-
p "connecting #{server.remote_addr} via #{server.config.server}"
|
5
|
+
p "connecting #{server.remote_addr}:#{server.remote_port} via #{server.config.server}"
|
6
6
|
|
7
7
|
server.cached_pieces.each { |piece| send_data piece }
|
8
8
|
server.cached_pieces = nil
|
data/lib/shadowsocks/version.rb
CHANGED