girl 0.59.0 → 0.60.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of girl might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/girl/proxy.rb +25 -21
- data/lib/girl/proxy_worker.rb +10 -3
- data/lib/girl/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4f5473377a1e0275092894704fca9bf4d98943c681db16782a31eebc36e3e575
|
4
|
+
data.tar.gz: 4c25f5d149b4bef01e415e30078de5c4cad73f0164ae13dca0392532dc8cdf56
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 91238105dde93647d076e35bdb56f3dd9203c0dbb939f66776c543b88bc4aff0055200f769f372cd7582f5ff569ea7892140bbf9603c39111093656903d85a44
|
7
|
+
data.tar.gz: aa6cb3db51eeca8f7a965e21fdf03e25d05fcdafd97165f18632c0ed0b5e8c2f5068689fc62efee0f0703f97f1678e7937813651306267b4eff475df5813406e
|
data/lib/girl/proxy.rb
CHANGED
@@ -163,35 +163,39 @@ module Girl
|
|
163
163
|
puts "im #{ im }"
|
164
164
|
puts "worker count #{ worker_count }"
|
165
165
|
|
166
|
-
|
167
|
-
|
166
|
+
if RUBY_PLATFORM.include?( 'linux' )
|
167
|
+
$0 = title
|
168
|
+
workers = []
|
168
169
|
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
170
|
+
worker_count.times do | i |
|
171
|
+
workers << fork do
|
172
|
+
$0 = 'girl proxy worker'
|
173
|
+
worker = Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im )
|
173
174
|
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
175
|
+
Signal.trap( :TERM ) do
|
176
|
+
puts "w#{ i } exit"
|
177
|
+
worker.quit!
|
178
|
+
end
|
178
179
|
|
179
|
-
|
180
|
+
worker.looping
|
181
|
+
end
|
180
182
|
end
|
181
|
-
end
|
182
183
|
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
184
|
+
Signal.trap( :TERM ) do
|
185
|
+
puts 'trap TERM'
|
186
|
+
workers.each do | pid |
|
187
|
+
begin
|
188
|
+
Process.kill( :TERM, pid )
|
189
|
+
rescue Errno::ESRCH => e
|
190
|
+
puts e.class
|
191
|
+
end
|
190
192
|
end
|
191
193
|
end
|
192
|
-
end
|
193
194
|
|
194
|
-
|
195
|
+
Process.waitall
|
196
|
+
else
|
197
|
+
Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im ).looping
|
198
|
+
end
|
195
199
|
end
|
196
200
|
|
197
201
|
end
|
data/lib/girl/proxy_worker.rb
CHANGED
@@ -292,8 +292,12 @@ module Girl
|
|
292
292
|
def new_a_proxy( proxy_port )
|
293
293
|
proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
|
294
294
|
proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
|
295
|
-
|
296
|
-
|
295
|
+
|
296
|
+
if RUBY_PLATFORM.include?( 'linux' )
|
297
|
+
proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
|
298
|
+
proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
|
299
|
+
end
|
300
|
+
|
297
301
|
proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
|
298
302
|
proxy.listen( 511 )
|
299
303
|
puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
|
@@ -343,7 +347,10 @@ module Girl
|
|
343
347
|
src_info = @src_infos[ src ]
|
344
348
|
destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], destination_ip )
|
345
349
|
dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
|
346
|
-
|
350
|
+
|
351
|
+
if RUBY_PLATFORM.include?( 'linux' )
|
352
|
+
dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
|
353
|
+
end
|
347
354
|
|
348
355
|
begin
|
349
356
|
dst.connect_nonblock( destination_addr )
|
data/lib/girl/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: girl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.60.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- takafan
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-05-
|
11
|
+
date: 2020-05-27 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: while internet is evil, here's a girl.
|
14
14
|
email:
|