girl 0.74.0 → 0.75.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094ccee84b18d04b1061a8c29663acabd184ac524437b2347b34a30cb14a5880'
-  data.tar.gz: 37ef3aa95152d92cf36609eb32bb6658780fea3927ea1b30e062029e7ef1de10
+  metadata.gz: ac2f8ddb303a57e5c898754c88710847686e84b3ef406c053ef926424da78e2b
+  data.tar.gz: 4506688a3176c9effe1804e3d247379a79d96906e4c8417d6f0660ecaa082141
 SHA512:
-  metadata.gz: '095868fe1a0d43435db1f8c461f09abd28114cac5f99494a02c5062ede1c476589b623c453e852ca2674727ff9e371c17d5ddc1cce46a408a085ef71c75fcaeb'
-  data.tar.gz: 7a1190902d3f2ef39965f2154d91ab15cabe63adae1613a3ad745a14cd2f46b3c70a3f06174dbda5929af6dd57970a9ca5085c521fd00dcefeaf9009a6fbad16
+  metadata.gz: 34559a0ab1375eb9b07bab0fbea3d762e94ac7282ed8868e3ab672aa816f87f6edc3273b1204c565c189201bd2a49e993477a6da525b472e95c18b804526323e
+  data.tar.gz: d7580c92099e6974287fbc8384010d3b5ed34966832ff9c1a0bda42cdeac923768fa431b84c83dee8926c3b4bc8f2b0761bdb9a4a14212870a2dde3abb89f338

data/lib/girl/proxy_worker.rb

@@ -601,6 +601,23 @@ module Girl
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( tun, data, to_addr )
+      begin
+        tun.sendmsg( data, 0, to_addr )
+      rescue IO::WaitWritable, Errno::EINTR
+        return false
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+        puts "#{ Time.new } #{ e.class }, close tun"
+        close_tun( tun )
+        return false
+      end
+
+      true
+    end
+
     ##
     # close src
     #
@@ -837,13 +854,7 @@ module Girl
       while @tun_info[ :ctlmsgs ].any?
         to_addr, data = @tun_info[ :ctlmsgs ].first
 
-        begin
-          tun.sendmsg( data, 0, to_addr )
-        rescue IO::WaitWritable, Errno::EINTR
-          return
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-          puts "#{ Time.new } #{ e.class }, close tun"
-          close_tun( tun )
+        unless send_data( tun, data, to_addr )
           return
         end
 
@@ -859,13 +870,7 @@ module Girl
           data = src_ext[ :wmems ][ pack_id ]
 
           if data
-            begin
-              tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
-            rescue IO::WaitWritable, Errno::EINTR
-              return
-            rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-              puts "#{ Time.new } #{ e.class }, close tun"
-              close_tun( tun )
+            unless send_data( tun, data, @tun_info[ :tund_addr ] )
               return
             end
           end
@@ -931,13 +936,7 @@ module Girl
 
         data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
 
-        begin
-          tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
-          return
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-          puts "#{ Time.new } #{ e.class }, close tun"
-          close_tun( tun )
+        unless send_data( tun, data, @tun_info[ :tund_addr ] )
           return
         end
 

data/lib/girl/proxyd_worker.rb

@@ -415,6 +415,23 @@ module Girl
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( tund, data, to_addr )
+      begin
+        tund.sendmsg( data, 0, to_addr )
+      rescue IO::WaitWritable, Errno::EINTR
+        return false
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+        puts "#{ Time.new } #{ e.class }, close tund"
+        close_tund( tund )
+        return false
+      end
+
+      true
+    end
+
     ##
     # close dst
     #
@@ -603,9 +620,7 @@ module Girl
       while tund_info[ :ctlmsgs ].any?
         data = tund_info[ :ctlmsgs ].first
 
-        begin
-          tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
+        unless send_data( tund, data, tund_info[ :tun_addr ] )
           return
         end
 
@@ -621,9 +636,7 @@ module Girl
           data = dst_ext[ :wmems ][ pack_id ]
 
           if data
-            begin
-              tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
-            rescue IO::WaitWritable, Errno::EINTR
+            unless send_data( tund, data, tund_info[ :tun_addr ] )
               return
             end
           end
@@ -689,9 +702,7 @@ module Girl
 
         data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
 
-        begin
-          tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
+        unless send_data( tund, data, tund_info[ :tun_addr ] )
           return
         end
 

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.74.0'.freeze
+  VERSION = '0.75.0'.freeze
 end

metadata

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