girl 0.59.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d1dc1c5bd84f3097cc7caf34ec42b12444cda7a795873b4e9f5abf5acf9ffb
-  data.tar.gz: 2f88c2a10647c9627c2db91e53e0a8c24f913895804a1eb5b98bc7d0aab64984
+  metadata.gz: 4f5473377a1e0275092894704fca9bf4d98943c681db16782a31eebc36e3e575
+  data.tar.gz: 4c25f5d149b4bef01e415e30078de5c4cad73f0164ae13dca0392532dc8cdf56
 SHA512:
-  metadata.gz: 12176d611114de7626eacff28dd5ee325c0c6f001fda5e2b539f907cd6e9b34bba8f444be58813c8182a923ad2c23adfa182e3766a76080f60654230ed260aab
-  data.tar.gz: 1c186b874ee823fb08c1663c1cba41b6afca9075cadcd85ef95a5ece06b38a06d65e719c9380dd541617f365286eec0c79601465c094198e289cb41d954965f9
+  metadata.gz: 91238105dde93647d076e35bdb56f3dd9203c0dbb939f66776c543b88bc4aff0055200f769f372cd7582f5ff569ea7892140bbf9603c39111093656903d85a44
+  data.tar.gz: aa6cb3db51eeca8f7a965e21fdf03e25d05fcdafd97165f18632c0ed0b5e8c2f5068689fc62efee0f0703f97f1678e7937813651306267b4eff475df5813406e

data/lib/girl/proxy.rb

@@ -163,35 +163,39 @@ module Girl
       puts "im #{ im }"
       puts "worker count #{ worker_count }"
 
-      $0 = title
-      workers = []
+      if RUBY_PLATFORM.include?( 'linux' )
+        $0 = title
+        workers = []
 
-      worker_count.times do | i |
-        workers << fork do
-          $0 = 'girl proxy worker'
-          worker = Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im )
+        worker_count.times do | i |
+          workers << fork do
+            $0 = 'girl proxy worker'
+            worker = Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im )
 
-          Signal.trap( :TERM ) do
-            puts "w#{ i } exit"
-            worker.quit!
-          end
+            Signal.trap( :TERM ) do
+              puts "w#{ i } exit"
+              worker.quit!
+            end
 
-          worker.looping
+            worker.looping
+          end
         end
-      end
 
-      Signal.trap( :TERM ) do
-        puts 'trap TERM'
-        workers.each do | pid |
-          begin
-            Process.kill( :TERM, pid )
-          rescue Errno::ESRCH => e
-            puts e.class
+        Signal.trap( :TERM ) do
+          puts 'trap TERM'
+          workers.each do | pid |
+            begin
+              Process.kill( :TERM, pid )
+            rescue Errno::ESRCH => e
+              puts e.class
+            end
           end
         end
-      end
 
-      Process.waitall
+        Process.waitall
+      else
+        Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im ).looping
+      end
     end
 
   end

data/lib/girl/proxy_worker.rb

@@ -292,8 +292,12 @@ module Girl
     def new_a_proxy( proxy_port )
       proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      if RUBY_PLATFORM.include?( 'linux' )
+        proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      end
+
       proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
       proxy.listen( 511 )
       puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
@@ -343,7 +347,10 @@ module Girl
       src_info = @src_infos[ src ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], destination_ip )
       dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      if RUBY_PLATFORM.include?( 'linux' )
+        dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      end
 
       begin
         dst.connect_nonblock( destination_addr )

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.59.0'.freeze
+  VERSION = '0.60.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: