Speed up dead session cleanup by skipping shutdown/cleanup

Author: HD Moore

lib/msf/base/sessions/meterpreter.rb

@@ -252,10 +252,10 @@ def reset_ui
   #
   # Terminates the session
   #
-  def kill
+  def kill(dirty=false)
     begin
-      cleanup_meterpreter
-      self.sock.close
+      cleanup_meterpreter(dirty)
+      self.sock.close if self.sock
     rescue ::Exception
     end
     framework.sessions.deregister(self)

lib/msf/base/sessions/meterpreter_options.rb

@@ -75,7 +75,8 @@ def on_session(session)
       end
     end
 
-    session.kill if not valid
+    # Terminate the session without cleanup if it did not validate
+    session.kill(true) if not valid
 
     }
 

lib/rex/post/meterpreter/client.rb

@@ -84,12 +84,19 @@ def initialize(sock,opts={})
   #
   # Cleans up the meterpreter instance, terminating the dispatcher thread.
   #
-  def cleanup_meterpreter
-    ext.aliases.each_value do | extension |
-      extension.cleanup if extension.respond_to?( 'cleanup' )
+  def cleanup_meterpreter(dirty)
+    if not dirty
+      ext.aliases.each_value do | extension |
+        extension.cleanup if extension.respond_to?( 'cleanup' )
+      end
     end
+
     dispatcher_thread.kill if dispatcher_thread
-    core.shutdown rescue nil
+
+    if not dirty
+      core.shutdown rescue nil
+    end
+
     shutdown_passive_dispatcher
   end