Drop names so we can remove dup addresses

.mailmap

@@ -75,8 +75,7 @@ bwall <bwall@github>                   Brian Wallace <bwall@openbwall.com>
 bwall <bwall@github>                   (B)rian (Wall)ace <nightstrike9809@gmail.com>
 ceballosm <ceballosm@github>           Mario Ceballos <mc@metasploit.com>
 Chao-mu <Chao-Mu@github>               chao-mu <chao@confusion.(none)>
-Chao-mu <Chao-Mu@github>               chao-mu <chao.mu@minorcrash.com>
-Chao-mu <Chao-Mu@github>               Chao Mu <chao.mu@minorcrash.com>
+Chao-mu <Chao-Mu@github>               <chao.mu@minorcrash.com>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <chris.riley@c22.cc>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <reg@c22.cc>
 claudijd <claudijd@github>             Jonathan Claudius <claudijd@yahoo.com>
@@ -87,12 +86,9 @@ crcatala <crcatala@github>             Christian Catalan <ccatalan@rapid7.com>
 darkoperator <darkoperator@github>     Carlos Perez <carlos_perez@darkoperator.com>
 efraintorres <efraintorres@github>     efraintorres <etlownoise@gmail.com>
 efraintorres <efraintorres@github>     et <>
-espreto <espreto@github>               Roberto Soares Espreto <robertoespreto@gmail.com>
-espreto <espreto@github>               Roberto Soares Espreto <robertoespreto@gmail.com>
-espreto <espreto@github>               Roberto Soares <robertoespreto@gmail.com>
-espreto <espreto@github>               Roberto Soares <robertoespreto@gmail.com>
+espreto <espreto@github>               <robertoespreto@gmail.com>
 fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
-FireFart <FireFart@github>             Christian Mehlmauer <firefart@gmail.com>
+FireFart <FireFart@github>             <firefart@gmail.com>
 FireFart <FireFart@github>             <FireFart@users.noreply.github.com>
 g0tmi1k <g0tmi1k@github>               <g0tmi1k@users.noreply.github.com>
 g0tmi1k <g0tmi1k@github>               <have.you.g0tmi1k@gmail.com>
@@ -103,8 +99,7 @@ h0ng10 <h0ng10@github>                 Hans-Martin Münch <hansmartin.muench@goo
 hdm <hdm@github>                       HD Moore <hdm@digitaloffense.net>
 hdm <hdm@github>                       HD Moore <hd_moore@rapid7.com>
 hdm <hdm@github>                       HD Moore <x@hdm.io>
-jabra <jabra@github>                   Josh Abraham <jabra@spl0it.org>
-jabra <jabra@github>                   Joshua Abraham <jabra@spl0it.org>
+jabra <jabra@github>                   <jabra@spl0it.org>
 jcran <jcran@github>                   <jcran@0x0e.org>
 jcran <jcran@github>                   <jcran@pentestify.com>
 jcran <jcran@github>                   <jcran@pwnieexpress.com>

lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb

@@ -378,25 +378,38 @@ class Console::CommandDispatcher::Stdapi::Net
     index = nil
 
     # Parse the options
-    @@portfwd_opts.parse(args) { |opt, idx, val|
+    @@portfwd_opts.parse(args) do |opt, idx, val|
+      p opt, idx, val
       case opt
-        when '-h'
-          cmd_portfwd_help
-          return true
-        when '-l'
-          lport = val.to_i
-        when '-L'
+      when '-h'
+        cmd_portfwd_help
+        return true
+      when '-l'
+        lport = val.to_i
+      when '-L'
+        parts = val.split(":")
+        case parts.count
+        when 4
+          lhost, lport, rhost, rport = parts
+        when 3
+          lport, rhost, rport = parts
+        when 1
+          # Assume this is just a host.
           lhost = val
-        when '-p'
-          rport = val.to_i
-        when '-r'
-          rhost = val
-        when '-R'
-          reverse = true
-        when '-i'
-          index = val.to_i
+        else
+          print_error("-L expects [bind_address:]local_port:remote_host:remote_port")
+          return true
+        end
+      when '-p'
+        rport = val.to_i
+      when '-r'
+        rhost = val
+      when '-R'
+        reverse = true
+      when '-i'
+        index = val.to_i
       end
-    }
+    end
 
     # If we haven't extended the session, then do it now since we'll
     # need to track port forwards
@@ -575,6 +588,8 @@ class Console::CommandDispatcher::Stdapi::Net
   def cmd_portfwd_help
     print_line 'Usage: portfwd [-h] [add | delete | list | flush] [args]'
     print_line
+    print_line ''
+    print_line
     print @@portfwd_opts.usage
   end
 

tools/modules/module_targets.rb

@@ -48,19 +48,19 @@ opts.parse(ARGV) { |opt, idx, val|
   when "-x"
     puts "Filter: #{val}"
     filter = val
-    fil=1		
+    fil=1
   end
 }
 
 Indent = '    '
 
 # Initialize the simplified framework instance.
-$framework = Msf::Simple::Framework.create('DisableDatabase' => true)
+$framework = Msf::Simple::Framework.create('DisableDatabase' => true, module_types: [ 'exploit' ])
 
 tbl = Rex::Text::Table.new(
   'Header'  => 'Module Targets',
   'Indent'  => Indent.length,
-  'Columns' => [ 'Module name','Target' ]
+  'Columns' => [ 'Module name','Space' ]
 )
 
 all_modules = $framework.exploits
@@ -69,7 +69,8 @@ all_modules.each_module { |name, mod|
   x = mod.new
   x.targets.each do |targ|
     if fil==0 or targ.name=~/#{filter}/
-      tbl << [ x.fullname, targ.name ]
+      next unless x.payload_space(targ).to_i > 0
+      tbl << [ x.fullname, x.payload_space(targ) ]
     end
   end
 }