mirror of
https://github.com/rapid7/metasploit-framework
synced 2024-11-05 14:57:30 +01:00
hip hip
git-svn-id: file:///home/svn/incoming/trunk@2561 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
parent
d09b892b59
commit
40b1ed945c
@ -21,13 +21,13 @@ class Module
|
||||
set_defaults
|
||||
|
||||
# Transform some of the fields to arrays as necessary
|
||||
self.author = Transformer.transform(module_info['Author'], Array,
|
||||
self.author = Rex::Transformer.transform(module_info['Author'], Array,
|
||||
[ Author ], 'Author')
|
||||
self.arch = Transformer.transform(module_info['Arch'], Array,
|
||||
self.arch = Rex::Transformer.transform(module_info['Arch'], Array,
|
||||
[ String ], 'Arch')
|
||||
self.platform = Transformer.transform(module_info['Platform'], Array,
|
||||
self.platform = Rex::Transformer.transform(module_info['Platform'], Array,
|
||||
[ String ], 'Platform')
|
||||
self.refs = Transformer.transform(module_info['Ref'], Array,
|
||||
self.refs = Rex::Transformer.transform(module_info['Ref'], Array,
|
||||
[ SiteReference, Reference ], 'Ref')
|
||||
|
||||
# Create and initialize the option container for this module
|
||||
|
@ -155,6 +155,8 @@ class ModuleManager < ModuleSet
|
||||
|
||||
# Adds a path to be searched for new modules
|
||||
def add_module_path(path)
|
||||
path.sub!(/#{File::SEPARATOR}$/, '')
|
||||
|
||||
module_paths << path
|
||||
|
||||
load_modules(path)
|
||||
|
11
lib/rex.rb
11
lib/rex.rb
@ -1,10 +1,21 @@
|
||||
module Rex
|
||||
end
|
||||
|
||||
# Generic classes
|
||||
require 'Rex/Constants'
|
||||
require 'Rex/ReadWriteLock'
|
||||
require 'Rex/Transformer'
|
||||
|
||||
# Logging
|
||||
require 'Rex/Logging/LogDispatcher'
|
||||
|
||||
# IO
|
||||
require 'Rex/IO/Stream'
|
||||
require 'Rex/IO/StreamServer'
|
||||
|
||||
# Sockets
|
||||
require 'Rex/Socket'
|
||||
require 'Rex/Socket/Parameters'
|
||||
require 'Rex/Socket/Tcp'
|
||||
require 'Rex/Socket/Comm/Local'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user