yea, stuff

git-svn-id: file:///home/svn/incoming/trunk@2701 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/payload.rb

@@ -54,8 +54,6 @@ class Payload < Msf::Module
 	# first stage is returned.
 	def size
 		return (generate() || '').length
-		# HEY skape, why should generate every return nil, and not an
-		# empty string?
 	end
 
 	# Returns the raw payload that has not had variable substitution occur.

lib/msf/core/payload/stager.rb

@@ -16,22 +16,22 @@ module Msf::Payload::Stager
 
 	# Return the stager payload's raw payload
 	def payload
-		return module_info['StagerPayload']['Payload']	
+		return module_info['Stager']['Payload']	
 	end
 
 	# Return the stager payload's offsets
 	def offsets
-		return module_info['StagerPayload']['Offsets']
+		return module_info['Stager']['Offsets']
 	end
 
 	# Returns the raw stage payload
 	def stage_payload
-		return module_info['StagePayload']['Payload']
+		return module_info['Stage']['Payload']
 	end
 
 	# Returns variable offsets within the stage payload
 	def stage_offsets
-		return module_info['StagePayload']['Offsets']
+		return module_info['Stage']['Offsets']
 	end
 
 	# Aliases

lib/msf/core/payload_set.rb

@@ -93,7 +93,7 @@ class PayloadSet < ModuleSet
 				p = build_payload(handler, stager_mod, stage_mod)
 
 				# Associate the name as a combination of the stager and stage
-				combined = stager_name + '_' + stage_name
+				combined = stage_name + '/' + stager_conn
 
 				self[combined] = p
 			

modules/payloads/stagers/windows/reverse_tcp.rb

@@ -13,14 +13,13 @@ module ReverseTcp
 	def initialize(info = {})
 		super(merge_info(info,
 			'Name'          => 'Windows IA32 Stager: Reverse TCP',
-			'Alias'         => 'win32_reverse_stg',
 			'Version'       => '$Revision$',
 			'Description'   => 'Connect back to the attacker and download another stage',
 			'Author'        => 'hdm',
 			'Platform'      => 'win',
 			'Arch'          => ARCH_IA32,
-			'Connection'    => 'ReverseTcp',
-			'StagerPayload' =>
+			'Connection'    => 'reverse_tcp',
+			'Stager'        =>
 				{
 					'Offsets' =>
 						{

modules/payloads/stages/windows/shell.rb

@@ -12,13 +12,13 @@ module Shell
 	def initialize(info = {})
 		super(merge_info(info,
 			'Name'          => 'Stage: Shell',
-			'Alias'         => 'shell',
+			'Alias'         => 'win32/shell',
 			'Version'       => '$Revision$',
 			'Description'   => 'Spawn a command shell',
 			'Author'        => 'hdm',
 			'Platform'      => 'win',
 			'Arch'          => ARCH_IA32,
-			'StagePayload'  =>
+			'Stage'         =>
 				{
 					'Offsets' =>
 						{