use separate module names for x86 and x64 generators

Brent Cook · Brent Cook · commit debbc3114287 · 2017-08-15T08:02:01.000-04:00
diff --git a/lib/msf/core/payload/linux/reverse_tcp.rb b/lib/msf/core/payload/linux/reverse_tcp.rb
@@ -14,7 +14,7 @@ module Msf
 ###
 
 
-module Payload::Linux::ReverseTcp
+module Payload::Linux::ReverseTcp_x86
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Linux
diff --git a/lib/msf/core/payload/linux/x64/reverse_tcp.rb b/lib/msf/core/payload/linux/x64/reverse_tcp.rb
@@ -13,8 +13,7 @@ module Msf
 #
 ###
 
-
-module Payload::Linux::ReverseTcp
+module Payload::Linux::ReverseTcp_x64
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Linux
diff --git a/modules/payloads/stagers/linux/x64/reverse_tcp.rb b/modules/payloads/stagers/linux/x64/reverse_tcp.rb
@@ -11,7 +11,7 @@ module MetasploitModule
   CachedSize = 127
 
   include Msf::Payload::Stager
-  include Msf::Payload::Linux::ReverseTcp
+  include Msf::Payload::Linux::ReverseTcp_x64
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/stagers/linux/x86/reverse_tcp.rb b/modules/payloads/stagers/linux/x86/reverse_tcp.rb
@@ -11,7 +11,7 @@ module MetasploitModule
   CachedSize = 127
 
   include Msf::Payload::Stager
-  include Msf::Payload::Linux::ReverseTcp
+  include Msf::Payload::Linux::ReverseTcp_x86
 
   def initialize(info = {})
     super(merge_info(info,
diff --git a/modules/payloads/stagers/linux/x86/reverse_tcp_uuid.rb b/modules/payloads/stagers/linux/x86/reverse_tcp_uuid.rb
@@ -11,7 +11,7 @@ module MetasploitModule
   CachedSize = 127
 
   include Msf::Payload::Stager
-  include Msf::Payload::Linux::ReverseTcp
+  include Msf::Payload::Linux::ReverseTcp_x86
 
   def self.handler_type_alias
     'reverse_tcp_uuid'

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ module Msf`
`13`	`13`	`#`
`14`	`14`	`###`
`15`	`15`
`16`		`-`
`17`		`-module Payload::Linux::ReverseTcp`
	`16`	`+module Payload::Linux::ReverseTcp_x64`
`18`	`17`
`19`	`18`	`include Msf::Payload::TransportConfig`
`20`	`19`	`include Msf::Payload::Linux`