bonzai

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

lib/msf/core/framework.rb

@@ -22,12 +22,16 @@ class Framework
 		return modules.encoders
 	end
 
+	def exploits
+		return modules.exploits
+	end
+
 	def nops
 		return modules.nops
 	end
 
-	def exploits
-		return modules.exploits
+	def payloads
+		return modules.payloads
 	end
 
 	def recon

lib/msf/core/module_manager.rb

@@ -101,16 +101,16 @@ class ModuleManager < Array
 		return modules_by_type[MODULE_ENCODER]
 	end
 
-	# Returns the set of loaded nop module classes
-	def nops
-		return modules_by_type[MODULE_NOPS]
-	end
-
 	# Returns the set of loaded exploit module classes
 	def exploits
 		return modules_by_type[MODULE_EXPLOIT]
 	end
 
+	# Returns the set of loaded nop module classes
+	def nops
+		return modules_by_type[MODULE_NOPS]
+	end
+
 	# Returns the set of loaded payload module classes
 	def payloads
 		return modules_by_type[MODULE_PAYLOAD]