Move ReverseTcpComm to a new directory

Reverse::Comm

lib/msf/core/handler/reverse/comm.rb

@@ -3,13 +3,14 @@ require 'rex/socket'
 
 module Msf
 module Handler
+module Reverse
 
 ###
 #
-# This module implements the reverse Rex::Socket::Comm handlng.
+# Implements the reverse Rex::Socket::Comm handlng.
 #
 ###
-module ReverseTcpComm
+module Comm
 
   def initialize(info = {})
     super
@@ -17,7 +18,7 @@ module ReverseTcpComm
     register_advanced_options(
       [
         OptString.new('ReverseListenerComm', [ false, 'The specific communication channel to use for this listener']),
-      ], Msf::Handler::ReverseTcpComm)
+      ], Msf::Handler::Reverse::Comm)
   end
 
   def select_comm
@@ -41,3 +42,4 @@ end
 
 end
 end
+end

lib/msf/core/handler/reverse_tcp.rb

@@ -20,7 +20,7 @@ module Handler
 module ReverseTcp
 
   include Msf::Handler
-  include Msf::Handler::ReverseTcpComm
+  include Msf::Handler::Reverse::Comm
 
   #
   # Returns the string representation of the handler type, in this case
@@ -76,10 +76,7 @@ module ReverseTcp
 
     ex = false
 
-    # Identify the comm to use from
-    # Msf::Handler::ReverseTcpComm.select_comm
     comm = select_comm
-
     local_port = bind_port
     addrs = bind_address
 

lib/msf/core/handler/reverse_tcp_double.rb

@@ -15,6 +15,7 @@ module Handler
 module ReverseTcpDouble
 
   include Msf::Handler
+  include Msf::Handler::Reverse::Comm
 
   #
   # Returns the string representation of the handler type, in this case
@@ -65,7 +66,7 @@ module ReverseTcpDouble
     self.listener_sock = Rex::Socket::TcpServer.create(
       # 'LocalHost' => datastore['LHOST'],
       'LocalPort' => datastore['LPORT'].to_i,
-      'Comm'      => comm,
+      'Comm'      => select_comm,
       'Context'   =>
         {
           'Msf'        => framework,

lib/msf/core/handler/reverse_tcp_double_ssl.rb

@@ -15,6 +15,7 @@ module Handler
 module ReverseTcpDoubleSSL
 
   include Msf::Handler
+  include Msf::Handler::Reverse::Comm
 
   #
   # Returns the string representation of the handler type, in this case
@@ -68,8 +69,6 @@ module ReverseTcpDoubleSSL
 
     ex = false
 
-    # Identify the comm to use from
-    # Msf::Handler::ReverseTcpComm.select_comm
     comm = select_comm
     local_port = bind_port
     addrs = bind_address

lib/msf/core/handler/reverse_tcp_ssl.rb

@@ -61,10 +61,7 @@ module ReverseTcpSsl
 
     ex = false
 
-    # Identify the comm to use from
-    # Msf::Handler::ReverseTcpComm.select_comm
     comm = select_comm
-
     local_port = bind_port
     addrs = bind_address