girl 9.2.0 → 9.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d155f995eb24eb7cc229250e742c6774227409957f11174c083d5ffbc0786327
-  data.tar.gz: d9209954dea7a1a83e1afcb5caeb2c11df7f6a979da98148b9c89d20ab362558
+  metadata.gz: 55f30955ae63478d965bc22318bb3d2afed05b761fc4175ba6f322d412dbcb4f
+  data.tar.gz: 3d8c72f7c8f88de9546f0add1d1a6eb8d5e3e070e79ce6929eb374a382892133
 SHA512:
-  metadata.gz: f173264881db0d06eaa9ed74b067344ce26b26e942c46e283ce9a7018f22f05948e3a34d54041a1bb2f263ff41046671f4873352c81e546adc1fefe15d372f20
-  data.tar.gz: 99b35c8abceafb34f19660f9721a737928ba9d652e171d5ebe7c309a032d9649e6dee86c80a2c63a5730e01ac05469a369fba202e2d8b718b13a5daa22feec47
+  metadata.gz: 578cfb6933967ef88ac218c62e97dfad035eac184a8676c404e93f93d2864e61f99888823d6edacdbd59615306b3a3bb9fced768cdac8fa30a7ab7236637333c
+  data.tar.gz: 5d4accd78932aa5385ba21e546002755973c92d0be9ee209af9fb75d9be9a526df1910bf68ecbf61ea9e4dd4bcee0727a421f414af04cb8513bf4c22cdb9d5c2

data/lib/girl/proxy.rb

@@ -22,6 +22,8 @@ module Girl
       redir_host = conf[:redir_host]
       redir_port = conf[:redir_port]
       memd_port = conf[:memd_port]
+      rsvd_host = conf[:rsvd_host]
+      rsvd_port = conf[:rsvd_port]
       tspd_host = conf[:tspd_host]
       tspd_port = conf[:tspd_port]
       proxyd_host = conf[:proxyd_host]
@@ -59,6 +61,8 @@ module Girl
       redir_host = redir_host ? redir_host.to_s : '0.0.0.0'
       redir_port = redir_port ? redir_port.to_i : 6666
       memd_port = memd_port ? memd_port.to_i : redir_port + 2
+      rsvd_host = rsvd_host ? rsvd_host.to_s : '0.0.0.0'
+      rsvd_port = rsvd_port ? rsvd_port.to_i : 53
       tspd_host = tspd_host ? tspd_host.to_s : '0.0.0.0'
       tspd_port = tspd_port ? tspd_port.to_i : 7777
       raise "missing proxyd host" unless proxyd_host
@@ -129,6 +133,8 @@ module Girl
         redir_host,
         redir_port,
         memd_port,
+        rsvd_host,
+        rsvd_port,
         tspd_host,
         tspd_port,
         proxyd_host,

data/lib/girl/proxy_worker.rb

@@ -6,6 +6,8 @@ module Girl
       redir_host,
       redir_port,
       memd_port,
+      rsvd_host,
+      rsvd_port,
       tspd_host,
       tspd_port,
       proxyd_host,
@@ -97,7 +99,7 @@ module Girl
       new_a_redir(redir_host, redir_port)
       new_a_infod(redir_port)
       new_a_memd(memd_port)
-      new_a_rsvd(tspd_host, tspd_port)
+      new_a_rsvd(rsvd_host, rsvd_port)
       new_a_tspd(tspd_host, tspd_port)
       new_a_proxy
       new_a_big
@@ -1440,18 +1442,21 @@ module Girl
       end
 
       if @remotes.any?{|r| domain.include?(r)}
-        check_expire_nears
-        near_id = rand((2 ** 64) - 2) + 1
-        @near_infos[near_id] = {
-          addrinfo: addrinfo,
-          created_at: Time.new,
-          domain: domain,
-          id: id,
-          type: type
-        }
-        puts "add h_query #{near_id} #{type} #{domain}" if @is_debug
-        msg = "#{@h_query}#{[near_id, type].pack('Q>C')}#{domain}"
-        add_proxy_wbuff(pack_a_chunk(msg))
+        if type == 1
+          check_expire_nears
+          near_id = rand((2 ** 64) - 2) + 1
+          @near_infos[near_id] = {
+            addrinfo: addrinfo,
+            created_at: Time.new,
+            domain: domain,
+            id: id,
+            type: type
+          }
+          puts "add h_query #{near_id} #{type} #{domain}" if @is_debug
+          msg = "#{@h_query}#{[near_id, type].pack('Q>C')}#{domain}"
+          add_proxy_wbuff(pack_a_chunk(msg))
+        end
+        
         return
       end
 

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '9.2.0'.freeze
+  VERSION = '9.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.2.2
 platform: ruby
 authors:
 - takafan
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: 妹子
 test_files: []